wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-12-15 08:03:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Make HLSL_TYPE_SAMPLER into a separate class.

Browse Source
This commit is contained in:
Zebediah Figura
2024-02-05 20:13:17 -06:00
committed by Alexandre Julliard
parent f57db442b0
commit 220362cbad
Notes: Alexandre Julliard 2024-04-19 22:26:17 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/781
7 changed files with 120 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libs/vkd3d-shader/tpf.c
View File

@@ -3008,6 +3008,7 @@ static D3D_SHADER_VARIABLE_CLASS sm4_class(const struct hlsl_type *type)
case HLSL_CLASS_ARRAY:
case HLSL_CLASS_STRUCT:
case HLSL_CLASS_OBJECT:
case HLSL_CLASS_SAMPLER:
case HLSL_CLASS_STRING:
case HLSL_CLASS_VOID:
break;
@@ -3109,20 +3110,28 @@ static void write_sm4_type(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b
static D3D_SHADER_INPUT_TYPE sm4_resource_type(const struct hlsl_type *type)
{
if (type->class == HLSL_CLASS_ARRAY)
return sm4_resource_type(type->e.array.type);
switch (type->base_type)
switch (type->class)
{
case HLSL_TYPE_SAMPLER:
case HLSL_CLASS_ARRAY:
return sm4_resource_type(type->e.array.type);
case HLSL_CLASS_SAMPLER:
return D3D_SIT_SAMPLER;
case HLSL_TYPE_TEXTURE:
return D3D_SIT_TEXTURE;
case HLSL_TYPE_UAV:
return D3D_SIT_UAV_RWTYPED;
case HLSL_CLASS_OBJECT:
switch (type->base_type)
{
case HLSL_TYPE_TEXTURE:
return D3D_SIT_TEXTURE;
case HLSL_TYPE_UAV:
return D3D_SIT_UAV_RWTYPED;
default:
break;
}
default:
vkd3d_unreachable();
break;
}
vkd3d_unreachable();
}
static D3D_RESOURCE_RETURN_TYPE sm4_resource_format(const struct hlsl_type *type)