wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Implement DGE instruction.

Browse Source 
Signed-off-by: Conor McCarthy <cmccarthy@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Conor McCarthy 2021-08-04 12:56:08 +10:00 committed by Alexandre Julliard
parent f21510a9fc
commit df60cffef1
5 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/vkd3d-shader/dxbc.c
View File

@ -312,6 +312,7 @@ enum vkd3d_sm4_opcode
VKD3D_SM5_OP_SYNC = 0xbe,
VKD3D_SM5_OP_DADD = 0xbf,
VKD3D_SM5_OP_DEQ = 0xc3,
VKD3D_SM5_OP_DGE = 0xc4,
VKD3D_SM5_OP_DMOV = 0xc7,
VKD3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc,
VKD3D_SM5_OP_EVAL_CENTROID = 0xcd,
@ -1254,6 +1255,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_DEQ, VKD3DSIH_DEQ, "u", "dd"},
{VKD3D_SM5_OP_DGE, VKD3DSIH_DGE, "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"},

2
libs/vkd3d-shader/spirv.c
View File

@ -7355,6 +7355,7 @@ static void vkd3d_dxbc_compiler_emit_comparison_instruction(struct vkd3d_dxbc_co
{
case VKD3DSIH_DEQ:
case VKD3DSIH_EQ: op = SpvOpFOrdEqual; break;
case VKD3DSIH_DGE:
case VKD3DSIH_GE: op = SpvOpFOrdGreaterThanEqual; break;
case VKD3DSIH_IEQ: op = SpvOpIEqual; break;
case VKD3DSIH_IGE: op = SpvOpSGreaterThanEqual; break;
@ -9571,6 +9572,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler,
vkd3d_dxbc_compiler_emit_udiv(compiler, instruction);
break;
case VKD3DSIH_DEQ:
case VKD3DSIH_DGE:
case VKD3DSIH_EQ:
case VKD3DSIH_GE:
case VKD3DSIH_IEQ:

1
libs/vkd3d-shader/trace.c
View File

@ -105,6 +105,7 @@ static const char * const shader_opcode_names[] =
/* VKD3DSIH_DEFB */ "defb",
/* VKD3DSIH_DEFI */ "defi",
/* VKD3DSIH_DEQ */ "deq",
/* VKD3DSIH_DGE */ "dge",
/* VKD3DSIH_DIV */ "div",
/* VKD3DSIH_DMOV */ "dmov",
/* VKD3DSIH_DP2 */ "dp2",

1
libs/vkd3d-shader/vkd3d_shader_private.h
View File

@ -194,6 +194,7 @@ enum vkd3d_shader_opcode
VKD3DSIH_DEFB,
VKD3DSIH_DEFI,
VKD3DSIH_DEQ,
VKD3DSIH_DGE,
VKD3DSIH_DIV,
VKD3DSIH_DMOV,
VKD3DSIH_DP2,

6
tests/d3d12.c
View File

@ -9944,9 +9944,9 @@ static void test_shader_instructions(void)
{&ps_deq, {.d = {{1.0, 0.0}}}, {{0x00000000}}, true},
{&ps_dne, {.d = {{0.0, 0.0}}}, {{0x00000000}}, true, true},
{&ps_dne, {.d = {{1.0, 0.0}}}, {{0xffffffff}}, true, true},
{&ps_dge, {.d = {{0.0, 1.0}}}, {{0x00000000}}, true, true},
{&ps_dge, {.d = {{1.0, 1.0}}}, {{0xffffffff}}, true, true},
{&ps_dge, {.d = {{1.5, 1.0}}}, {{0xffffffff}}, true, true},
{&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_dtou, {.d = {{ -NAN}}}, {{ 0, 0 }}, true, true},