Conor McCarthy : vkd3d-shader: Implement DMIN instruction.
Alexandre Julliard
julliard at winehq.org
Mon Aug 9 16:04:39 CDT 2021
Module: vkd3d
Branch: master
Commit: 74a9a0b1671e216360c11ebc0cfe7cb1f4ddf28f
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=74a9a0b1671e216360c11ebc0cfe7cb1f4ddf28f
Author: Conor McCarthy <cmccarthy at codeweavers.com>
Date: Tue Aug 10 01:12:29 2021 +1000
vkd3d-shader: Implement DMIN instruction.
Signed-off-by: Conor McCarthy <cmccarthy at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/vkd3d-shader/dxbc.c | 1 +
libs/vkd3d-shader/sm4.h | 1 +
libs/vkd3d-shader/spirv.c | 2 ++
libs/vkd3d-shader/trace.c | 1 +
libs/vkd3d-shader/vkd3d_shader_private.h | 1 +
tests/d3d12.c | 2 +-
6 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index 584ece9..f9be52d 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -799,6 +799,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] =
shader_sm5_read_sync},
{VKD3D_SM5_OP_DADD, VKD3DSIH_DADD, "d", "dd"},
{VKD3D_SM5_OP_DMAX, VKD3DSIH_DMAX, "d", "dd"},
+ {VKD3D_SM5_OP_DMIN, VKD3DSIH_DMIN, "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"},
diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h
index e4d2146..c9a389e 100644
--- a/libs/vkd3d-shader/sm4.h
+++ b/libs/vkd3d-shader/sm4.h
@@ -319,6 +319,7 @@ enum vkd3d_sm4_opcode
VKD3D_SM5_OP_SYNC = 0xbe,
VKD3D_SM5_OP_DADD = 0xbf,
VKD3D_SM5_OP_DMAX = 0xc0,
+ VKD3D_SM5_OP_DMIN = 0xc1,
VKD3D_SM5_OP_DEQ = 0xc3,
VKD3D_SM5_OP_DGE = 0xc4,
VKD3D_SM5_OP_DLT = 0xc5,
diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index a94a38a..1b0051e 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -6844,6 +6844,7 @@ static enum GLSLstd450 vkd3d_dxbc_compiler_map_ext_glsl_instruction(
glsl_insts[] =
{
{VKD3DSIH_DMAX, GLSLstd450NMax},
+ {VKD3DSIH_DMIN, GLSLstd450NMin},
{VKD3DSIH_EXP, GLSLstd450Exp2},
{VKD3DSIH_FIRSTBIT_HI, GLSLstd450FindUMsb},
{VKD3DSIH_FIRSTBIT_LO, GLSLstd450FindILsb},
@@ -9534,6 +9535,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler,
vkd3d_dxbc_compiler_emit_alu_instruction(compiler, instruction);
break;
case VKD3DSIH_DMAX:
+ case VKD3DSIH_DMIN:
case VKD3DSIH_EXP:
case VKD3DSIH_FIRSTBIT_HI:
case VKD3DSIH_FIRSTBIT_LO:
diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c
index 0da29a8..b0a2298 100644
--- a/libs/vkd3d-shader/trace.c
+++ b/libs/vkd3d-shader/trace.c
@@ -109,6 +109,7 @@ static const char * const shader_opcode_names[] =
/* VKD3DSIH_DIV */ "div",
/* VKD3DSIH_DLT */ "dlt",
/* VKD3DSIH_DMAX */ "dmax",
+ /* VKD3DSIH_DMIN */ "dmin",
/* VKD3DSIH_DMOV */ "dmov",
/* VKD3DSIH_DNE */ "dne",
/* VKD3DSIH_DP2 */ "dp2",
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index 96e8fb3..f3aadfc 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -198,6 +198,7 @@ enum vkd3d_shader_opcode
VKD3DSIH_DIV,
VKD3DSIH_DLT,
VKD3DSIH_DMAX,
+ VKD3DSIH_DMIN,
VKD3DSIH_DMOV,
VKD3DSIH_DNE,
VKD3DSIH_DP2,
diff --git a/tests/d3d12.c b/tests/d3d12.c
index b2a338d..12dab50 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -9935,7 +9935,7 @@ static void test_shader_instructions(void)
{&ps_dmov, {.d = {{2.5 + 1.0e-9, -3.5 - 1.0e-9}}}, {.d = {3.5 + 1.0e-9, -2.5 - 1.0e-9}}, true},
{&ps_dadd, {.d = {{2.5, 0.0}}}, {.d = {2.5 + 1.0000002433080226, 2.5 + 2.000000481493771}}, true},
- {&ps_dmin_dmax, {.d = {{-1.0, 1.0}}}, {.d = {-1.0, 1.0}}, true, true},
+ {&ps_dmin_dmax, {.d = {{-1.0, 1.0}}}, {.d = {-1.0, 1.0}}, true},
{&ps_dmovc, {.d = {{0.5, 0.0}}}, {.d = {4.5, 4.5}}, true, true},
{&ps_dmovc, {.d = {{1.5, 0.0}}}, {.d = {1.5, 0.0}}, true, true},
{&ps_dmodifier, {.d = {{1.5, 0.0}}}, {.d = {1.5f, 2.5f}}, true},
More information about the wine-cvs
mailing list