wined3d: Recognize SM4 sample_c opcode.

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

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 9c1960096cba17bec2450619e58e723c4ce10043..54bd1a97554e72f762b67d372d8626992443ce0b 100644 (file)
--- 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 fa82196106678c0ba5c9f70f0d96f62f7b67903e..0f2327fd5e7d41dbefa8016741988b3679ee6ed8 100644 (file)
--- 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 2ae63930c2ec25f0163b005f7c92298a6d1afe4c..e81fc4e5f64f7d90044dabf107a80d2b0b6344fd 100644 (file)
--- 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 ce1067feb1900c5031730ff00afddb66bca98a1e..2de7fc460fbd89dcbe3dba3ed5fee9089a072c07 100644 (file)
--- 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 965b012eb5f3ec60d640f540bf42fd2de3998489..84a6dc11b7a8b6e876afcd2864b702ca6eabc6d8 100644 (file)
--- 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,