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/tpf: Do not write non-numeric struct fields into the RDEF.

Browse Source
This commit is contained in:
Zebediah Figura
2024-01-13 18:50:46 -06:00
committed by Alexandre Julliard
parent 8ef5ee54c9
commit 622fcda9ee
Notes: Alexandre Julliard 2024-03-27 23:06:24 +01: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/626
1 changed files with 12 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3002,18 +3002,16 @@ static D3D_SHADER_VARIABLE_CLASS sm4_class(const struct hlsl_type *type)
return D3D_SVC_MATRIX_COLUMNS; return D3D_SVC_MATRIX_COLUMNS;
else else
return D3D_SVC_MATRIX_ROWS; return D3D_SVC_MATRIX_ROWS;
case HLSL_CLASS_OBJECT:
return D3D_SVC_OBJECT;
case HLSL_CLASS_SCALAR: case HLSL_CLASS_SCALAR:
return D3D_SVC_SCALAR; return D3D_SVC_SCALAR;
case HLSL_CLASS_STRUCT: case HLSL_CLASS_STRUCT:
return D3D_SVC_STRUCT; return D3D_SVC_STRUCT;
case HLSL_CLASS_VECTOR: case HLSL_CLASS_VECTOR:
return D3D_SVC_VECTOR; return D3D_SVC_VECTOR;
default: case HLSL_CLASS_OBJECT:
ERR("Invalid class %#x.\n", type->class); break;
vkd3d_unreachable();
} }
vkd3d_unreachable();
} }
static D3D_SHADER_VARIABLE_TYPE sm4_base_type(const struct hlsl_type *type) static D3D_SHADER_VARIABLE_TYPE sm4_base_type(const struct hlsl_type *type)
@ -3029,68 +3027,10 @@ static D3D_SHADER_VARIABLE_TYPE sm4_base_type(const struct hlsl_type *type)
return D3D_SVT_FLOAT; return D3D_SVT_FLOAT;
case HLSL_TYPE_INT: case HLSL_TYPE_INT:
return D3D_SVT_INT; return D3D_SVT_INT;
case HLSL_TYPE_PIXELSHADER:
return D3D_SVT_PIXELSHADER;
case HLSL_TYPE_SAMPLER:
switch (type->sampler_dim)
{
case HLSL_SAMPLER_DIM_1D:
return D3D_SVT_SAMPLER1D;
case HLSL_SAMPLER_DIM_2D:
return D3D_SVT_SAMPLER2D;
case HLSL_SAMPLER_DIM_3D:
return D3D_SVT_SAMPLER3D;
case HLSL_SAMPLER_DIM_CUBE:
return D3D_SVT_SAMPLERCUBE;
case HLSL_SAMPLER_DIM_GENERIC:
return D3D_SVT_SAMPLER;
default:
vkd3d_unreachable();
}
break;
case HLSL_TYPE_STRING:
return D3D_SVT_STRING;
case HLSL_TYPE_TEXTURE:
switch (type->sampler_dim)
{
case HLSL_SAMPLER_DIM_1D:
return D3D_SVT_TEXTURE1D;
case HLSL_SAMPLER_DIM_2D:
return D3D_SVT_TEXTURE2D;
case HLSL_SAMPLER_DIM_2DMS:
return D3D_SVT_TEXTURE2DMS;
case HLSL_SAMPLER_DIM_3D:
return D3D_SVT_TEXTURE3D;
case HLSL_SAMPLER_DIM_CUBE:
return D3D_SVT_TEXTURECUBE;
case HLSL_SAMPLER_DIM_GENERIC:
return D3D_SVT_TEXTURE;
default:
vkd3d_unreachable();
}
break;
case HLSL_TYPE_UINT: case HLSL_TYPE_UINT:
return D3D_SVT_UINT; return D3D_SVT_UINT;
case HLSL_TYPE_VERTEXSHADER:
return D3D_SVT_VERTEXSHADER;
case HLSL_TYPE_VOID: case HLSL_TYPE_VOID:
return D3D_SVT_VOID; return D3D_SVT_VOID;
case HLSL_TYPE_UAV:
switch (type->sampler_dim)
{
case HLSL_SAMPLER_DIM_1D:
return D3D_SVT_RWTEXTURE1D;
case HLSL_SAMPLER_DIM_2D:
return D3D_SVT_RWTEXTURE2D;
case HLSL_SAMPLER_DIM_3D:
return D3D_SVT_RWTEXTURE3D;
case HLSL_SAMPLER_DIM_1DARRAY:
return D3D_SVT_RWTEXTURE1DARRAY;
case HLSL_SAMPLER_DIM_2DARRAY:
return D3D_SVT_RWTEXTURE2DARRAY;
default:
vkd3d_unreachable();
}
default: default:
vkd3d_unreachable(); vkd3d_unreachable();
} }
@ -3116,22 +3056,28 @@ static void write_sm4_type(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b
if (array_type->class == HLSL_CLASS_STRUCT) if (array_type->class == HLSL_CLASS_STRUCT)
{ {
field_count = array_type->e.record.field_count;
for (i = 0; i < field_count; ++i) for (i = 0; i < array_type->e.record.field_count; ++i)
{ {
struct hlsl_struct_field *field = &array_type->e.record.fields[i]; struct hlsl_struct_field *field = &array_type->e.record.fields[i];
if (!field->type->reg_size[HLSL_REGSET_NUMERIC])
continue;
field->name_bytecode_offset = put_string(buffer, field->name); field->name_bytecode_offset = put_string(buffer, field->name);
write_sm4_type(ctx, buffer, field->type); write_sm4_type(ctx, buffer, field->type);
++field_count;
} }
fields_offset = bytecode_align(buffer); fields_offset = bytecode_align(buffer);
for (i = 0; i < field_count; ++i) for (i = 0; i < array_type->e.record.field_count; ++i)
{ {
struct hlsl_struct_field *field = &array_type->e.record.fields[i]; struct hlsl_struct_field *field = &array_type->e.record.fields[i];
if (!field->type->reg_size[HLSL_REGSET_NUMERIC])
continue;
put_u32(buffer, field->name_bytecode_offset); put_u32(buffer, field->name_bytecode_offset);
put_u32(buffer, field->type->bytecode_offset); put_u32(buffer, field->type->bytecode_offset);
put_u32(buffer, field->reg_offset[HLSL_REGSET_NUMERIC]); put_u32(buffer, field->reg_offset[HLSL_REGSET_NUMERIC]);