=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Add support for store_{raw, structured} on thread group shared memory.

[Alexandre Julliard]

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

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Thu Mar  2 00:55:28 2017 +0100

wined3d: Add support for store_{raw, structured} on thread group shared memory.

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/glsl_shader.c | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 51deae0..61865c1 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -5278,30 +5278,44 @@ static void shader_glsl_store_uav(const struct wined3d_shader_instruction *ins)
             image_coord_param.param_str, image_data_param.param_str);
 }
 
-static void shader_glsl_store_buffer(const struct wined3d_shader_instruction *ins)
+static void shader_glsl_store_raw_structured(const struct wined3d_shader_instruction *ins)
 {
     const char *prefix = shader_glsl_get_prefix(ins->ctx->reg_maps->shader_version.type);
     const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps;
     struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data;
     struct wined3d_string_buffer *buffer = ins->ctx->buffer;
     struct glsl_src_param structure_idx, offset, data;
+    unsigned int i, resource_idx, stride, src_idx = 0;
     struct wined3d_string_buffer *address;
-    unsigned int i, uav_idx, src_idx = 0;
     DWORD write_mask;
+    BOOL is_tgsm;
 
-    uav_idx = ins->dst[0].reg.idx[0].offset;
-    if (uav_idx >= ARRAY_SIZE(reg_maps->uav_resource_info))
+    resource_idx = ins->dst[0].reg.idx[0].offset;
+    is_tgsm = ins->dst[0].reg.type == WINED3DSPR_GROUPSHAREDMEM;
+    if (is_tgsm)
     {
-        ERR("Invalid UAV index %u.\n", uav_idx);
-        return;
+        if (resource_idx >= reg_maps->tgsm_count)
+        {
+            ERR("Invalid TGSM index %u.\n", resource_idx);
+            return;
+        }
+        stride = reg_maps->tgsm[resource_idx].stride;
+    }
+    else
+    {
+        if (resource_idx >= ARRAY_SIZE(reg_maps->uav_resource_info))
+        {
+            ERR("Invalid UAV index %u.\n", resource_idx);
+            return;
+        }
+        stride = reg_maps->uav_resource_info[resource_idx].stride;
     }
 
     address = string_buffer_get(priv->string_buffers);
     if (ins->handler_idx == WINED3DSIH_STORE_STRUCTURED)
     {
         shader_glsl_add_src_param(ins, &ins->src[src_idx++], WINED3DSP_WRITEMASK_0, &structure_idx);
-        shader_addline(address, "%s * %u + ", structure_idx.param_str,
-                reg_maps->uav_resource_info[uav_idx].stride);
+        shader_addline(address, "%s * %u + ", structure_idx.param_str, stride);
     }
     shader_glsl_add_src_param(ins, &ins->src[src_idx++], WINED3DSP_WRITEMASK_0, &offset);
     shader_addline(address, "%s / 4", offset.param_str);
@@ -5313,8 +5327,12 @@ static void shader_glsl_store_buffer(const struct wined3d_shader_instruction *in
 
         shader_glsl_add_src_param(ins, &ins->src[src_idx], write_mask, &data);
 
-        shader_addline(buffer, "imageStore(%s_image%u, %s + %u, uvec4(%s, 0, 0, 0));\n",
-                prefix, uav_idx, address->buffer, i, data.param_str);
+        if (is_tgsm)
+            shader_addline(buffer, "%s_g%u[%s + %u] = %s;\n",
+                    prefix, resource_idx, address->buffer, i, data.param_str);
+        else
+            shader_addline(buffer, "imageStore(%s_image%u, %s + %u, uvec4(%s, 0, 0, 0));\n",
+                    prefix, resource_idx, address->buffer, i, data.param_str);
     }
 
     string_buffer_release(priv->string_buffers, address);
@@ -9653,8 +9671,8 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_SINCOS                           */ shader_glsl_sincos,
     /* WINED3DSIH_SLT                              */ shader_glsl_compare,
     /* WINED3DSIH_SQRT                             */ shader_glsl_map2gl,
-    /* WINED3DSIH_STORE_RAW                        */ shader_glsl_store_buffer,
-    /* WINED3DSIH_STORE_STRUCTURED                 */ shader_glsl_store_buffer,
+    /* WINED3DSIH_STORE_RAW                        */ shader_glsl_store_raw_structured,
+    /* WINED3DSIH_STORE_STRUCTURED                 */ shader_glsl_store_raw_structured,
     /* WINED3DSIH_STORE_UAV_TYPED                  */ shader_glsl_store_uav,
     /* WINED3DSIH_SUB                              */ shader_glsl_binop,
     /* WINED3DSIH_SWAPC                            */ NULL,