Module: wine Branch: master Commit: d94ae444d29eb9175740e9a72913a6aa2ad16f04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d94ae444d29eb9175740e9a72...
Author: Zebediah Figura z.figura12@gmail.com Date: Thu Jan 24 23:06:07 2019 -0600
wined3d: Remove stateblock handling from wined3d_device_set_geometry_shader().
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wined3d/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4f61eba..dddc4e6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2830,15 +2830,15 @@ struct wined3d_sampler * CDECL wined3d_device_get_ds_sampler(const struct wined3
void CDECL wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader) { - struct wined3d_shader *prev = device->update_state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; + struct wined3d_shader *prev = device->state.shader[WINED3D_SHADER_TYPE_GEOMETRY];
TRACE("device %p, shader %p.\n", device, shader);
- if (device->recording || shader == prev) + if (shader == prev) return; if (shader) wined3d_shader_incref(shader); - device->update_state->shader[WINED3D_SHADER_TYPE_GEOMETRY] = shader; + device->state.shader[WINED3D_SHADER_TYPE_GEOMETRY] = shader; wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_GEOMETRY, shader); if (prev) wined3d_shader_decref(prev);