Józef Kucia : wined3d: Handle structured resource declarations.

[Alexandre Julliard]

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

Author: Józef Kucia 
Date:   Fri Feb 24 12:27:38 2017 +0100

wined3d: Handle structured resource declarations.

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

---

dlls/wined3d/glsl_shader.c |  2 +-
 dlls/wined3d/shader.c      | 13 +++++++++++++
 dlls/wined3d/shader_sm4.c  |  2 ++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index eefc248..28a3b3b 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -9364,7 +9364,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_DCL_OUTPUT_SIV                   */ shader_glsl_nop,
     /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY              */ shader_glsl_nop,
     /* WINED3DSIH_DCL_RESOURCE_RAW                 */ shader_glsl_nop,
-    /* WINED3DSIH_DCL_RESOURCE_STRUCTURED          */ NULL,
+    /* WINED3DSIH_DCL_RESOURCE_STRUCTURED          */ shader_glsl_nop,
     /* WINED3DSIH_DCL_SAMPLER                      */ shader_glsl_nop,
     /* WINED3DSIH_DCL_STREAM                       */ NULL,
     /* WINED3DSIH_DCL_TEMPS                        */ shader_glsl_nop,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 37c4352..14cb243 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -1025,6 +1025,19 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st
             reg_maps->resource_info[reg_idx].data_type = WINED3D_DATA_UINT;
             reg_maps->resource_info[reg_idx].flags = WINED3D_VIEW_BUFFER_RAW;
         }
+        else if (ins.handler_idx == WINED3DSIH_DCL_RESOURCE_STRUCTURED)
+        {
+            unsigned int reg_idx = ins.declaration.structured_resource.reg.reg.idx[0].offset;
+            if (reg_idx >= ARRAY_SIZE(reg_maps->resource_info))
+            {
+                ERR("Invalid resource index %u.\n", reg_idx);
+                break;
+            }
+            reg_maps->resource_info[reg_idx].type = WINED3D_SHADER_RESOURCE_BUFFER;
+            reg_maps->resource_info[reg_idx].data_type = WINED3D_DATA_UINT;
+            reg_maps->resource_info[reg_idx].flags = 0;
+            reg_maps->resource_info[reg_idx].stride = ins.declaration.structured_resource.byte_stride / 4;
+        }
         else if (ins.handler_idx == WINED3DSIH_DCL_SAMPLER)
         {
             if (ins.flags & WINED3DSI_SAMPLER_COMPARISON_MODE)
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 877b27d..26aacc7 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -780,6 +780,8 @@ static void shader_sm5_read_dcl_resource_structured(struct wined3d_shader_instru
 {
     shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_RESOURCE, &ins->declaration.structured_resource.reg);
     ins->declaration.structured_resource.byte_stride = *tokens;
+    if (ins->declaration.structured_resource.byte_stride % 4)
+        FIXME("Byte stride %u is not multiple of 4.\n", ins->declaration.structured_resource.byte_stride);
 }

static void shader_sm5_read_dcl_resource_raw(struct wined3d_shader_instruction *ins,