Józef Kucia : wined3d: Handle declarations for raw buffer shader resources.

[Alexandre Julliard]

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

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Wed Feb 15 14:27:35 2017 +0100

wined3d: Handle declarations for raw buffer shader resources.

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

---

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

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 994c199..7f467e8 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -9235,7 +9235,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT   */ NULL,
     /* WINED3DSIH_DCL_OUTPUT_SIV                   */ shader_glsl_nop,
     /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY              */ shader_glsl_nop,
-    /* WINED3DSIH_DCL_RESOURCE_RAW                 */ NULL,
+    /* WINED3DSIH_DCL_RESOURCE_RAW                 */ shader_glsl_nop,
     /* WINED3DSIH_DCL_RESOURCE_STRUCTURED          */ NULL,
     /* WINED3DSIH_DCL_SAMPLER                      */ shader_glsl_nop,
     /* WINED3DSIH_DCL_STREAM                       */ NULL,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 82fa011..2ce0ed0 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -1024,6 +1024,18 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st
                 FIXME("Invalid instruction %#x for shader type %#x.\n",
                         ins.handler_idx, shader_version.type);
         }
+        else if (ins.handler_idx == WINED3DSIH_DCL_RESOURCE_RAW)
+        {
+            unsigned int reg_idx = ins.declaration.dst.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 = WINED3D_VIEW_BUFFER_RAW;
+        }
         else if (ins.handler_idx == WINED3DSIH_DCL_SAMPLER)
         {
             if (ins.flags & WINED3DSI_SAMPLER_COMPARISON_MODE)