[PATCH vkd3d 3/4] vkd3d-shader: Implement DLT instruction.

Conor McCarthy cmccarthy at codeweavers.com
Tue Aug 3 21:56:09 CDT 2021


Signed-off-by: Conor McCarthy <cmccarthy at codeweavers.com>
---
 libs/vkd3d-shader/dxbc.c                 | 2 ++
 libs/vkd3d-shader/spirv.c                | 2 ++
 libs/vkd3d-shader/trace.c                | 1 +
 libs/vkd3d-shader/vkd3d_shader_private.h | 1 +
 tests/d3d12.c                            | 4 ++--
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index afeebb23..f557f83e 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -313,6 +313,7 @@ enum vkd3d_sm4_opcode
     VKD3D_SM5_OP_DADD                             = 0xbf,
     VKD3D_SM5_OP_DEQ                              = 0xc3,
     VKD3D_SM5_OP_DGE                              = 0xc4,
+    VKD3D_SM5_OP_DLT                              = 0xc5,
     VKD3D_SM5_OP_DMOV                             = 0xc7,
     VKD3D_SM5_OP_EVAL_SAMPLE_INDEX                = 0xcc,
     VKD3D_SM5_OP_EVAL_CENTROID                    = 0xcd,
@@ -1256,6 +1257,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] =
     {VKD3D_SM5_OP_DADD,                             VKD3DSIH_DADD,                             "d",    "dd"},
     {VKD3D_SM5_OP_DEQ,                              VKD3DSIH_DEQ,                              "u",    "dd"},
     {VKD3D_SM5_OP_DGE,                              VKD3DSIH_DGE,                              "u",    "dd"},
+    {VKD3D_SM5_OP_DLT,                              VKD3DSIH_DLT,                              "u",    "dd"},
     {VKD3D_SM5_OP_DMOV,                             VKD3DSIH_DMOV,                             "d",    "d"},
     {VKD3D_SM5_OP_EVAL_SAMPLE_INDEX,                VKD3DSIH_EVAL_SAMPLE_INDEX,                "f",    "fi"},
     {VKD3D_SM5_OP_EVAL_CENTROID,                    VKD3DSIH_EVAL_CENTROID,                    "f",    "f"},
diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index eb63e820..bb9e2bf5 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -7361,6 +7361,7 @@ static void vkd3d_dxbc_compiler_emit_comparison_instruction(struct vkd3d_dxbc_co
         case VKD3DSIH_IGE: op = SpvOpSGreaterThanEqual; break;
         case VKD3DSIH_ILT: op = SpvOpSLessThan; break;
         case VKD3DSIH_INE: op = SpvOpINotEqual; break;
+        case VKD3DSIH_DLT:
         case VKD3DSIH_LT:  op = SpvOpFOrdLessThan; break;
         case VKD3DSIH_NE:  op = SpvOpFUnordNotEqual; break;
         case VKD3DSIH_UGE: op = SpvOpUGreaterThanEqual; break;
@@ -9573,6 +9574,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler,
             break;
         case VKD3DSIH_DEQ:
         case VKD3DSIH_DGE:
+        case VKD3DSIH_DLT:
         case VKD3DSIH_EQ:
         case VKD3DSIH_GE:
         case VKD3DSIH_IEQ:
diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c
index ee4ebb10..b35748bc 100644
--- a/libs/vkd3d-shader/trace.c
+++ b/libs/vkd3d-shader/trace.c
@@ -107,6 +107,7 @@ static const char * const shader_opcode_names[] =
     /* VKD3DSIH_DEQ                              */ "deq",
     /* VKD3DSIH_DGE                              */ "dge",
     /* VKD3DSIH_DIV                              */ "div",
+    /* VKD3DSIH_DLT                              */ "dlt",
     /* VKD3DSIH_DMOV                             */ "dmov",
     /* VKD3DSIH_DP2                              */ "dp2",
     /* VKD3DSIH_DP2ADD                           */ "dp2add",
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index 14d2d745..2ce70dbf 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -196,6 +196,7 @@ enum vkd3d_shader_opcode
     VKD3DSIH_DEQ,
     VKD3DSIH_DGE,
     VKD3DSIH_DIV,
+    VKD3DSIH_DLT,
     VKD3DSIH_DMOV,
     VKD3DSIH_DP2,
     VKD3DSIH_DP2ADD,
diff --git a/tests/d3d12.c b/tests/d3d12.c
index 515364c5..1419225d 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -9940,8 +9940,8 @@ static void test_shader_instructions(void)
         {&ps_dge, {.d = {{0.0, 1.0}}}, {{0x00000000}}, true},
         {&ps_dge, {.d = {{1.0, 1.0}}}, {{0xffffffff}}, true},
         {&ps_dge, {.d = {{1.5, 1.0}}}, {{0xffffffff}}, true},
-        {&ps_dlt, {.d = {{0.0, 1.0}}}, {{0xffffffff}}, true, true},
-        {&ps_dlt, {.d = {{1.0, 1.0}}}, {{0x00000000}}, true, true},
+        {&ps_dlt, {.d = {{0.0, 1.0}}}, {{0xffffffff}}, true},
+        {&ps_dlt, {.d = {{1.0, 1.0}}}, {{0x00000000}}, true},
         {&ps_dtou, {.d = {{     -NAN}}}, {{ 0,  0 }}, true, true},
         {&ps_dtou, {.d = {{      NAN}}}, {{ 0,  0 }}, true, true},
         {&ps_dtou, {.d = {{-INFINITY}}}, {{ 0, ~0u}}, true, true},
-- 
2.32.0




More information about the wine-devel mailing list