Zebediah Figura : wined3d: Remove stateblock handling from wined3d_device_set_constant_buffer().

Alexandre Julliard julliard at winehq.org
Thu Jan 24 14:42:53 CST 2019


Module: wine
Branch: master
Commit: 6bb73652de78577161b98a3e1f92da7799455b22
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=6bb73652de78577161b98a3e1f92da7799455b22

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Wed Jan 23 23:30:53 2019 -0600

wined3d: Remove stateblock handling from wined3d_device_set_constant_buffer().

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at 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 c799a57..4f61eba 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -2247,15 +2247,14 @@ void CDECL wined3d_device_set_constant_buffer(struct wined3d_device *device,
         return;
     }
 
-    prev = device->update_state->cb[type][idx];
+    prev = device->state.cb[type][idx];
     if (buffer == prev)
         return;
 
     if (buffer)
         wined3d_buffer_incref(buffer);
-    device->update_state->cb[type][idx] = buffer;
-    if (!device->recording)
-        wined3d_cs_emit_set_constant_buffer(device->cs, type, idx, buffer);
+    device->state.cb[type][idx] = buffer;
+    wined3d_cs_emit_set_constant_buffer(device->cs, type, idx, buffer);
     if (prev)
         wined3d_buffer_decref(prev);
 }




More information about the wine-cvs mailing list