wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Normalise descriptor register indices to shader model 5.1.

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-07-08 17:17:50 +02:00
committed by Alexandre Julliard
parent cd233fe018
commit 1acb3de9bd
2 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -766,6 +766,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const
{
struct vkd3d_string_buffer *buffer = &compiler->buffer;
unsigned int offset = reg->idx[0].offset;
bool is_descriptor = false;
static const char * const rastout_reg_names[] = {"oPos", "oFog", "oPts"};
static const char * const misctype_reg_names[] = {"vPos", "vFace"};
@@ -847,6 +848,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const
case VKD3DSPR_SAMPLER:
shader_addline(buffer, "s");
is_descriptor = true;
break;
case VKD3DSPR_MISCTYPE:
@@ -871,6 +873,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const
case VKD3DSPR_CONSTBUFFER:
shader_addline(buffer, "cb");
is_descriptor = true;
break;
case VKD3DSPR_IMMCONSTBUFFER:
@@ -891,10 +894,12 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const
case VKD3DSPR_RESOURCE:
shader_addline(buffer, "t");
is_descriptor = true;
break;
case VKD3DSPR_UAV:
shader_addline(buffer, "u");
is_descriptor = true;
break;
case VKD3DSPR_OUTPOINTID:
@@ -1057,11 +1062,11 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const
vkd3d_string_buffer_printf(buffer, "%u%s", offset, compiler->colours.reset);
}
/* For CBs in sm < 5.1 we move the buffer offset from idx[1] to idx[2]
* to normalise it with 5.1.
* Here we should ignore it if it's a CB in sm < 5.1. */
/* For descriptors in sm < 5.1 we move the reg->idx values up one slot
* to normalise with 5.1.
* Here we should ignore it if it's a descriptor in sm < 5.1. */
if (reg->idx[1].offset != ~0u &&
(reg->type != VKD3DSPR_CONSTBUFFER || shader_ver_ge(&compiler->shader_version, 5, 1)))
(!is_descriptor || shader_ver_ge(&compiler->shader_version, 5, 1)))
shader_print_subscript(compiler, reg->idx[1].offset, reg->idx[1].rel_addr);
if (reg->idx[2].offset != ~0u)