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: Introduce a separate register type for combined samplers.

Browse Source
This commit is contained in:
Zebediah Figura 2023-03-07 16:45:18 -06:00 committed by Alexandre Julliard
parent 3af629cf8c
commit 2bcd6ea893
Notes: Alexandre Julliard 2023-10-09 23:10:55 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/394
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/vkd3d-shader/d3d_asm.c
View File

@ -637,7 +637,7 @@ static void shader_dump_decl_usage(struct vkd3d_d3d_asm_compiler *compiler,
{ {
struct vkd3d_string_buffer *buffer = &compiler->buffer; struct vkd3d_string_buffer *buffer = &compiler->buffer;
if (semantic->resource.reg.reg.type == VKD3DSPR_SAMPLER) if (semantic->resource.reg.reg.type == VKD3DSPR_COMBINED_SAMPLER)
{ {
switch (semantic->resource_type) switch (semantic->resource_type)
{ {
@ -924,6 +924,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const
shader_addline(buffer, "aL"); shader_addline(buffer, "aL");
break; break;
case VKD3DSPR_COMBINED_SAMPLER:
case VKD3DSPR_SAMPLER: case VKD3DSPR_SAMPLER:
shader_addline(buffer, "s"); shader_addline(buffer, "s");
is_descriptor = true; is_descriptor = true;

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

@ -488,7 +488,7 @@ enum vkd3d_shader_register_type
VKD3DSPR_CONSTINT = 7, VKD3DSPR_CONSTINT = 7,
VKD3DSPR_COLOROUT = 8, VKD3DSPR_COLOROUT = 8,
VKD3DSPR_DEPTHOUT = 9, VKD3DSPR_DEPTHOUT = 9,
VKD3DSPR_SAMPLER = 10, VKD3DSPR_COMBINED_SAMPLER = 10,
VKD3DSPR_CONST2 = 11, VKD3DSPR_CONST2 = 11,
VKD3DSPR_CONST3 = 12, VKD3DSPR_CONST3 = 12,
VKD3DSPR_CONST4 = 13, VKD3DSPR_CONST4 = 13,
@ -504,6 +504,7 @@ enum vkd3d_shader_register_type
VKD3DSPR_IMMCONSTBUFFER, VKD3DSPR_IMMCONSTBUFFER,
VKD3DSPR_PRIMID, VKD3DSPR_PRIMID,
VKD3DSPR_NULL, VKD3DSPR_NULL,
VKD3DSPR_SAMPLER,
VKD3DSPR_RESOURCE, VKD3DSPR_RESOURCE,
VKD3DSPR_UAV, VKD3DSPR_UAV,
VKD3DSPR_OUTPOINTID, VKD3DSPR_OUTPOINTID,