wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Implement DLT 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:09 +10:00 committed by Alexandre Julliard
parent df60cffef1
commit 4ea3da3067
5 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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"},

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

@ -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:

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

@ -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",

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

@ -196,6 +196,7 @@ enum vkd3d_shader_opcode
VKD3DSIH_DEQ,
VKD3DSIH_DGE,
VKD3DSIH_DIV,
VKD3DSIH_DLT,
VKD3DSIH_DMOV,
VKD3DSIH_DP2,
VKD3DSIH_DP2ADD,

4
tests/d3d12.c
View File

@ -9947,8 +9947,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},