Józef Kucia : wined3d: Acquire graphics pipeline UAV resources for draws.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 401fb6e34891b4cb7becfe8cc3708a36944d690f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=401fb6e34891b4cb7becfe8cc3...

Author: Józef Kucia 
Date:   Wed Feb  1 11:26:23 2017 +0100

wined3d: Acquire graphics pipeline UAV resources for draws.

Signed-off-by: Józef Kucia 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/wined3d/cs.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c
index de8ad66..d2c334f 100644
--- a/dlls/wined3d/cs.c
+++ b/dlls/wined3d/cs.c
@@ -486,6 +486,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data)
 {
     struct wined3d_state *state = &cs->device->state;
     const struct wined3d_cs_draw *op = data;
+    struct wined3d_shader *shader;
     unsigned int i;

if (!cs->device->adapter->gl_info.supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]
@@ -518,12 +519,27 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data)
     if (state->fb->depth_stencil)
         wined3d_resource_release(state->fb->depth_stencil->resource);
     release_shader_resources(state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE));
+    if ((shader = state->shader[WINED3D_SHADER_TYPE_PIXEL]))
+    {
+        struct wined3d_unordered_access_view *view;
+        for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i)
+        {
+            if (!shader->reg_maps.uav_resource_info[i].type)
+                continue;
+
+            if (!(view = state->unordered_access_view[i]))
+                continue;
+
+            wined3d_resource_release(view->resource);
+        }
+    }
 }

void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned int start_idx,
         unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed)
 {
     const struct wined3d_state *state = &cs->device->state;
+    struct wined3d_shader *shader;
     struct wined3d_cs_draw *op;
     unsigned int i;

@@ -556,6 +572,20 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned i
     if (state->fb->depth_stencil)
         wined3d_resource_acquire(state->fb->depth_stencil->resource);
     acquire_shader_resources(state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE));
+    if ((shader = state->shader[WINED3D_SHADER_TYPE_PIXEL]))
+    {
+        struct wined3d_unordered_access_view *view;
+        for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i)
+        {
+            if (!shader->reg_maps.uav_resource_info[i].type)
+                continue;
+
+            if (!(view = state->unordered_access_view[i]))
+                continue;
+
+            wined3d_resource_acquire(view->resource);
+        }
+    }

cs->ops->submit(cs);
 }