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

libs/vkd3d-shader: Add support for vThreadGroupID register.

Browse Source
This commit is contained in:
Józef Kucia 2017-07-18 17:32:26 +02:00
parent 79e61d95df
commit 2420fdb3af
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1438,6 +1438,9 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf
case VKD3DSPR_LOCALTHREADINDEX: case VKD3DSPR_LOCALTHREADINDEX:
snprintf(buffer, buffer_size, "vThreadIDInGroupFlattened"); snprintf(buffer, buffer_size, "vThreadIDInGroupFlattened");
break; break;
case VKD3DSPR_THREADGROUPID:
snprintf(buffer, buffer_size, "vThreadGroupID");
break;
default: default:
FIXME("Unhandled register %#x.\n", reg->type); FIXME("Unhandled register %#x.\n", reg->type);
snprintf(buffer, buffer_size, "unrecognized_%#x", reg->type); snprintf(buffer, buffer_size, "unrecognized_%#x", reg->type);
@ -1576,6 +1579,7 @@ static uint32_t vkd3d_dxbc_compiler_get_register_id(struct vkd3d_dxbc_compiler *
case VKD3DSPR_THREADID: case VKD3DSPR_THREADID:
case VKD3DSPR_LOCALTHREADID: case VKD3DSPR_LOCALTHREADID:
case VKD3DSPR_LOCALTHREADINDEX: case VKD3DSPR_LOCALTHREADINDEX:
case VKD3DSPR_THREADGROUPID:
vkd3d_dxbc_compiler_get_register_info(compiler, reg, &register_info); vkd3d_dxbc_compiler_get_register_info(compiler, reg, &register_info);
return register_info.id; return register_info.id;
case VKD3DSPR_IMMCONST: case VKD3DSPR_IMMCONST:
@ -1883,6 +1887,9 @@ static void vkd3d_dxbc_compiler_emit_store_dst(struct vkd3d_dxbc_compiler *compi
* "The variable decorated with LocalInvocationId must be declared as a * "The variable decorated with LocalInvocationId must be declared as a
* three-component vector of 32-bit integers." * three-component vector of 32-bit integers."
* *
* "The variable decorated with WorkgroupId must be declared as a
* three-component vector of 32-bit integers."
*
* "The variable decorated with FragCoord must be declared as a * "The variable decorated with FragCoord must be declared as a
* four-component vector of 32-bit floating-point values." * four-component vector of 32-bit floating-point values."
* *
@ -1906,6 +1913,7 @@ vkd3d_spirv_builtins[] =
{VKD3D_SIV_NONE, VKD3DSPR_THREADID, VKD3D_TYPE_INT, 3, SpvBuiltInGlobalInvocationId}, {VKD3D_SIV_NONE, VKD3DSPR_THREADID, VKD3D_TYPE_INT, 3, SpvBuiltInGlobalInvocationId},
{VKD3D_SIV_NONE, VKD3DSPR_LOCALTHREADID, VKD3D_TYPE_INT, 3, SpvBuiltInLocalInvocationId}, {VKD3D_SIV_NONE, VKD3DSPR_LOCALTHREADID, VKD3D_TYPE_INT, 3, SpvBuiltInLocalInvocationId},
{VKD3D_SIV_NONE, VKD3DSPR_LOCALTHREADINDEX, VKD3D_TYPE_INT, 1, SpvBuiltInLocalInvocationIndex}, {VKD3D_SIV_NONE, VKD3DSPR_LOCALTHREADINDEX, VKD3D_TYPE_INT, 1, SpvBuiltInLocalInvocationIndex},
{VKD3D_SIV_NONE, VKD3DSPR_THREADGROUPID, VKD3D_TYPE_INT, 3, SpvBuiltInWorkgroupId},
{VKD3D_SIV_POSITION, ~0u, VKD3D_TYPE_FLOAT, 4, SpvBuiltInPosition}, {VKD3D_SIV_POSITION, ~0u, VKD3D_TYPE_FLOAT, 4, SpvBuiltInPosition},
{VKD3D_SIV_VERTEX_ID, ~0u, VKD3D_TYPE_INT, 1, SpvBuiltInVertexIndex}, {VKD3D_SIV_VERTEX_ID, ~0u, VKD3D_TYPE_INT, 1, SpvBuiltInVertexIndex},