Henri Verbeet : wined3d: Send material updates through the command stream.
Alexandre Julliard
julliard at winehq.org
Wed Oct 9 14:22:14 CDT 2013
Module: wine
Branch: master
Commit: 1f22246b84a6fa7a88a612be41a5c9edc05460a0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f22246b84a6fa7a88a612be41a5c9edc05460a0
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Oct 9 10:39:37 2013 +0200
wined3d: Send material updates through the command stream.
---
dlls/wined3d/cs.c | 27 +++++++++++++++++++++++++++
dlls/wined3d/device.c | 9 ++-------
dlls/wined3d/wined3d_private.h | 1 +
3 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index b6542bc..0da79fc 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -46,6 +46,7 @@ enum wined3d_cs_op
WINED3D_CS_OP_SET_SAMPLER_STATE,
WINED3D_CS_OP_SET_TRANSFORM,
WINED3D_CS_OP_SET_CLIP_PLANE,
+ WINED3D_CS_OP_SET_MATERIAL,
};
struct wined3d_cs_present
@@ -185,6 +186,12 @@ struct wined3d_cs_set_clip_plane
const struct wined3d_vec4 *plane;
};
+struct wined3d_cs_set_material
+{
+ enum wined3d_cs_op opcode;
+ const struct wined3d_material *material;
+};
+
static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data)
{
const struct wined3d_cs_present *op = data;
@@ -719,6 +726,25 @@ void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const
cs->ops->submit(cs);
}
+static void wined3d_cs_exec_set_material(struct wined3d_cs *cs, const void *data)
+{
+ const struct wined3d_cs_set_material *op = data;
+
+ cs->state.material = *op->material;
+ device_invalidate_state(cs->device, STATE_MATERIAL);
+}
+
+void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material)
+{
+ struct wined3d_cs_set_material *op;
+
+ op = cs->ops->require_space(cs, sizeof(*op));
+ op->opcode = WINED3D_CS_OP_SET_MATERIAL;
+ op->material = material;
+
+ cs->ops->submit(cs);
+}
+
static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) =
{
/* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present,
@@ -741,6 +767,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void
/* WINED3D_CS_OP_SET_SAMPLER_STATE */ wined3d_cs_exec_set_sampler_state,
/* WINED3D_CS_OP_SET_TRANSFORM */ wined3d_cs_exec_set_transform,
/* WINED3D_CS_OP_SET_CLIP_PLANE */ wined3d_cs_exec_set_clip_plane,
+ /* WINED3D_CS_OP_SET_MATERIAL */ wined3d_cs_exec_set_material,
};
static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 1f2642b..20e7927 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1785,15 +1785,10 @@ void CDECL wined3d_device_set_material(struct wined3d_device *device, const stru
device->update_state->material = *material;
- /* Handle recording of state blocks */
if (device->recording)
- {
device->recording->changed.material = TRUE;
- TRACE("Recording... not performing anything.\n");
- return;
- }
-
- device_invalidate_state(device, STATE_MATERIAL);
+ else
+ wined3d_cs_emit_set_material(device->cs, material);
}
void CDECL wined3d_device_get_material(const struct wined3d_device *device, struct wined3d_material *material)
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 6dc5c7f..e9569ff 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2491,6 +2491,7 @@ void wined3d_cs_emit_set_depth_stencil(struct wined3d_cs *cs, struct wined3d_sur
void wined3d_cs_emit_set_geometry_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) DECLSPEC_HIDDEN;
void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer,
enum wined3d_format_id format_id) DECLSPEC_HIDDEN;
+void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material) DECLSPEC_HIDDEN;
void wined3d_cs_emit_set_pixel_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) DECLSPEC_HIDDEN;
void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs,
enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN;
More information about the wine-cvs
mailing list