[PATCH 13/18] wined3d: Recognize SM5 atomic_cmp_store opcode.

Józef Kucia jkucia at codeweavers.com
Mon Dec 5 05:04:36 CST 2016


Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
 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 16d5f17..603fb12 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5203,6 +5203,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
     /* WINED3DSIH_ADD                              */ shader_hw_map2gl,
     /* WINED3DSIH_AND                              */ NULL,
     /* WINED3DSIH_ATOMIC_AND                       */ NULL,
+    /* WINED3DSIH_ATOMIC_CMP_STORE                 */ NULL,
     /* WINED3DSIH_ATOMIC_IADD                      */ NULL,
     /* WINED3DSIH_ATOMIC_OR                        */ NULL,
     /* WINED3DSIH_ATOMIC_XOR                       */ NULL,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index c052e15..f1678f4 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -8866,6 +8866,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_ADD                              */ shader_glsl_binop,
     /* WINED3DSIH_AND                              */ shader_glsl_binop,
     /* WINED3DSIH_ATOMIC_AND                       */ NULL,
+    /* WINED3DSIH_ATOMIC_CMP_STORE                 */ NULL,
     /* WINED3DSIH_ATOMIC_IADD                      */ shader_glsl_atomic,
     /* WINED3DSIH_ATOMIC_OR                        */ NULL,
     /* WINED3DSIH_ATOMIC_XOR                       */ NULL,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 4aa9c74..9844eee 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -44,6 +44,7 @@ static const char * const shader_opcode_names[] =
     /* WINED3DSIH_ADD                              */ "add",
     /* WINED3DSIH_AND                              */ "and",
     /* WINED3DSIH_ATOMIC_AND                       */ "atomic_and",
+    /* WINED3DSIH_ATOMIC_CMP_STORE                 */ "atomic_cmp_store",
     /* WINED3DSIH_ATOMIC_IADD                      */ "atomic_iadd",
     /* WINED3DSIH_ATOMIC_OR                        */ "atomic_or",
     /* WINED3DSIH_ATOMIC_XOR                       */ "atomic_xor",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index edb4ae5..c51d7a9 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -254,6 +254,7 @@ enum wined3d_sm4_opcode
     WINED3D_SM5_OP_ATOMIC_AND                       = 0xa9,
     WINED3D_SM5_OP_ATOMIC_OR                        = 0xaa,
     WINED3D_SM5_OP_ATOMIC_XOR                       = 0xab,
+    WINED3D_SM5_OP_ATOMIC_CMP_STORE                 = 0xac,
     WINED3D_SM5_OP_ATOMIC_IADD                      = 0xad,
     WINED3D_SM5_OP_IMM_ATOMIC_ALLOC                 = 0xb2,
     WINED3D_SM5_OP_IMM_ATOMIC_CONSUME               = 0xb3,
@@ -907,6 +908,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
     {WINED3D_SM5_OP_ATOMIC_AND,                       WINED3DSIH_ATOMIC_AND,                       "U",    "iu"},
     {WINED3D_SM5_OP_ATOMIC_OR,                        WINED3DSIH_ATOMIC_OR,                        "U",    "iu"},
     {WINED3D_SM5_OP_ATOMIC_XOR,                       WINED3DSIH_ATOMIC_XOR,                       "U",    "iu"},
+    {WINED3D_SM5_OP_ATOMIC_CMP_STORE,                 WINED3DSIH_ATOMIC_CMP_STORE,                 "U",    "iuu"},
     {WINED3D_SM5_OP_ATOMIC_IADD,                      WINED3DSIH_ATOMIC_IADD,                      "U",    "ii"},
     {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC,                 WINED3DSIH_IMM_ATOMIC_ALLOC,                 "u",    "U"},
     {WINED3D_SM5_OP_IMM_ATOMIC_CONSUME,               WINED3DSIH_IMM_ATOMIC_CONSUME,               "u",    "U"},
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 4c23777..7960ad3 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -570,6 +570,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
     WINED3DSIH_ADD,
     WINED3DSIH_AND,
     WINED3DSIH_ATOMIC_AND,
+    WINED3DSIH_ATOMIC_CMP_STORE,
     WINED3DSIH_ATOMIC_IADD,
     WINED3DSIH_ATOMIC_OR,
     WINED3DSIH_ATOMIC_XOR,
-- 
2.7.3




More information about the wine-patches mailing list