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

[Alexandre Julliard]

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

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Wed Feb  3 11:49:08 2016 +0100

wined3d: Recognize SM4 sample_c opcode.

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/arb_program_shader.c | 1 +
 dlls/wined3d/glsl_shader.c        | 1 +
 dlls/wined3d/shader.c             | 1 +
 dlls/wined3d/shader_sm4.c         | 2 ++
 dlls/wined3d/wined3d_private.h    | 1 +
 5 files changed, 6 insertions(+)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 9c19600..54bd1a9 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5316,6 +5316,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
     /* WINED3DSIH_RSQ                           */ shader_hw_scalar_op,
     /* WINED3DSIH_SAMPLE                        */ NULL,
     /* WINED3DSIH_SAMPLE_B                      */ NULL,
+    /* WINED3DSIH_SAMPLE_C                      */ NULL,
     /* WINED3DSIH_SAMPLE_C_LZ                   */ NULL,
     /* WINED3DSIH_SAMPLE_GRAD                   */ NULL,
     /* WINED3DSIH_SAMPLE_LOD                    */ NULL,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index fa82196..0f2327f 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -8104,6 +8104,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_RSQ                           */ shader_glsl_scalar_op,
     /* WINED3DSIH_SAMPLE                        */ shader_glsl_sample,
     /* WINED3DSIH_SAMPLE_B                      */ NULL,
+    /* WINED3DSIH_SAMPLE_C                      */ NULL,
     /* WINED3DSIH_SAMPLE_C_LZ                   */ NULL,
     /* WINED3DSIH_SAMPLE_GRAD                   */ NULL,
     /* WINED3DSIH_SAMPLE_LOD                    */ shader_glsl_sample_lod,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 2ae6393..e81fc4e 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -144,6 +144,7 @@ static const char * const shader_opcode_names[] =
     /* WINED3DSIH_RSQ                           */ "rsq",
     /* WINED3DSIH_SAMPLE                        */ "sample",
     /* WINED3DSIH_SAMPLE_B                      */ "sample_b",
+    /* WINED3DSIH_SAMPLE_C                      */ "sample_c",
     /* WINED3DSIH_SAMPLE_C_LZ                   */ "sample_c_lz",
     /* WINED3DSIH_SAMPLE_GRAD                   */ "sample_d",
     /* WINED3DSIH_SAMPLE_LOD                    */ "sample_l",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index ce1067f..2de7fc4 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -147,6 +147,7 @@ enum wined3d_sm4_opcode
     WINED3D_SM4_OP_ROUND_Z              = 0x43,
     WINED3D_SM4_OP_RSQ                  = 0x44,
     WINED3D_SM4_OP_SAMPLE               = 0x45,
+    WINED3D_SM4_OP_SAMPLE_C             = 0x46,
     WINED3D_SM4_OP_SAMPLE_C_LZ          = 0x47,
     WINED3D_SM4_OP_SAMPLE_LOD           = 0x48,
     WINED3D_SM4_OP_SAMPLE_GRAD          = 0x49,
@@ -358,6 +359,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
     {WINED3D_SM4_OP_ROUND_Z,                WINED3DSIH_ROUND_Z,                       "F",    "F"},
     {WINED3D_SM4_OP_RSQ,                    WINED3DSIH_RSQ,                           "F",    "F"},
     {WINED3D_SM4_OP_SAMPLE,                 WINED3DSIH_SAMPLE,                        "U",    "FRS"},
+    {WINED3D_SM4_OP_SAMPLE_C,               WINED3DSIH_SAMPLE_C,                      "F",    "FRSF"},
     {WINED3D_SM4_OP_SAMPLE_C_LZ,            WINED3DSIH_SAMPLE_C_LZ,                   "F",    "FRSF"},
     {WINED3D_SM4_OP_SAMPLE_LOD,             WINED3DSIH_SAMPLE_LOD,                    "U",    "FRSF"},
     {WINED3D_SM4_OP_SAMPLE_GRAD,            WINED3DSIH_SAMPLE_GRAD,                   "U",    "FRSFF"},
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 965b012..84a6dc1 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -594,6 +594,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
     WINED3DSIH_RSQ,
     WINED3DSIH_SAMPLE,
     WINED3DSIH_SAMPLE_B,
+    WINED3DSIH_SAMPLE_C,
     WINED3DSIH_SAMPLE_C_LZ,
     WINED3DSIH_SAMPLE_GRAD,
     WINED3DSIH_SAMPLE_LOD,