=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Recognize SM4 icb register.

[Alexandre Julliard]

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

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Fri Jan 29 09:44:44 2016 +0100

wined3d: Recognize SM4 icb register.

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     |  7 +++++++
 dlls/wined3d/shader.c          |  4 ++++
 dlls/wined3d/shader_sm4.c      | 23 ++++++++++++-----------
 dlls/wined3d/wined3d_private.h |  1 +
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 5e983f9..5e9daaf 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -2406,6 +2406,13 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register *
                 sprintf(register_name, "%s_cb%u[%u]", prefix, reg->idx[0].offset, reg->idx[1].offset);
             break;
 
+        case WINED3DSPR_IMMCONSTBUFFER:
+            if (reg->idx[0].rel_addr)
+                sprintf(register_name, "%s_icb[%s + %u]", prefix, rel_param0.param_str, reg->idx[0].offset);
+            else
+                sprintf(register_name, "%s_icb[%u]", prefix, reg->idx[0].offset);
+            break;
+
         case WINED3DSPR_PRIMID:
             sprintf(register_name, "uint(gl_PrimitiveIDIn)");
             break;
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 4c42d2f..09b1fe9 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -1459,6 +1459,10 @@ static void shader_dump_register(const struct wined3d_shader_register *reg,
             TRACE("cb");
             break;
 
+        case WINED3DSPR_IMMCONSTBUFFER:
+            TRACE("icb");
+            break;
+
         case WINED3DSPR_PRIMID:
             TRACE("primID");
             break;
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 11de59c..64e1abb 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -155,16 +155,17 @@ enum wined3d_sm4_opcode
 
 enum wined3d_sm4_register_type
 {
-    WINED3D_SM4_RT_TEMP         = 0x0,
-    WINED3D_SM4_RT_INPUT        = 0x1,
-    WINED3D_SM4_RT_OUTPUT       = 0x2,
-    WINED3D_SM4_RT_IMMCONST     = 0x4,
-    WINED3D_SM4_RT_SAMPLER      = 0x6,
-    WINED3D_SM4_RT_RESOURCE     = 0x7,
-    WINED3D_SM4_RT_CONSTBUFFER  = 0x8,
-    WINED3D_SM4_RT_PRIMID       = 0xb,
-    WINED3D_SM4_RT_DEPTHOUT     = 0xc,
-    WINED3D_SM4_RT_NULL         = 0xd,
+    WINED3D_SM4_RT_TEMP           = 0x0,
+    WINED3D_SM4_RT_INPUT          = 0x1,
+    WINED3D_SM4_RT_OUTPUT         = 0x2,
+    WINED3D_SM4_RT_IMMCONST       = 0x4,
+    WINED3D_SM4_RT_SAMPLER        = 0x6,
+    WINED3D_SM4_RT_RESOURCE       = 0x7,
+    WINED3D_SM4_RT_CONSTBUFFER    = 0x8,
+    WINED3D_SM4_RT_IMMCONSTBUFFER = 0x9,
+    WINED3D_SM4_RT_PRIMID         = 0xb,
+    WINED3D_SM4_RT_DEPTHOUT       = 0xc,
+    WINED3D_SM4_RT_NULL           = 0xd,
 };
 
 enum wined3d_sm4_output_primitive_type
@@ -350,7 +351,7 @@ static const enum wined3d_shader_register_type register_type_table[] =
     /* WINED3D_SM4_RT_SAMPLER */        WINED3DSPR_SAMPLER,
     /* WINED3D_SM4_RT_RESOURCE */       WINED3DSPR_RESOURCE,
     /* WINED3D_SM4_RT_CONSTBUFFER */    WINED3DSPR_CONSTBUFFER,
-    /* UNKNOWN */                       0,
+    /* WINED3D_SM4_RT_IMMCONSTBUFFER */ WINED3DSPR_IMMCONSTBUFFER,
     /* UNKNOWN */                       0,
     /* WINED3D_SM4_RT_PRIMID */         WINED3DSPR_PRIMID,
     /* WINED3D_SM4_RT_DEPTHOUT */       WINED3DSPR_DEPTHOUT,
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 0287088..4bd019f 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -359,6 +359,7 @@ enum wined3d_shader_register_type
     WINED3DSPR_PREDICATE = 19,
     WINED3DSPR_IMMCONST,
     WINED3DSPR_CONSTBUFFER,
+    WINED3DSPR_IMMCONSTBUFFER,
     WINED3DSPR_PRIMID,
     WINED3DSPR_NULL,
     WINED3DSPR_RESOURCE,