Module: wine Branch: master Commit: 8e70ce0872ae7f1e1978d1e08b3bf82f50d4f21e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e70ce0872ae7f1e1978d1e08...
Author: Zebediah Figura z.figura12@gmail.com Date: Wed Jan 23 23:30:49 2019 -0600
wined3d: Remove stateblock handling from wined3d_device_set_shader_resource_view().
It cannot be called while recording a stateblock.
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 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b5460c9..4fa935f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2286,15 +2286,14 @@ static void wined3d_device_set_shader_resource_view(struct wined3d_device *devic return; }
- prev = device->update_state->shader_resource_view[type][idx]; + prev = device->state.shader_resource_view[type][idx]; if (view == prev) return;
if (view) wined3d_shader_resource_view_incref(view); - device->update_state->shader_resource_view[type][idx] = view; - if (!device->recording) - wined3d_cs_emit_set_shader_resource_view(device->cs, type, idx, view); + device->state.shader_resource_view[type][idx] = view; + wined3d_cs_emit_set_shader_resource_view(device->cs, type, idx, view); if (prev) wined3d_shader_resource_view_decref(prev); }