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: Handle the "_centroid" modifier suffix in semantic names.

Browse Source
This commit is contained in:
Shaun Ren
2025-09-08 12:07:57 -04:00
committed by Henri Verbeet
parent 5e4ee62cad
commit 44582a930c
Notes: Henri Verbeet 2025-10-06 19:48:17 +02:00 
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1721
3 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libs/vkd3d-shader/hlsl.h
View File

@@ -248,6 +248,7 @@ struct hlsl_semantic
const char *name; const char *name;
uint32_t index; uint32_t index;
uint32_t stream_index; uint32_t stream_index;
uint32_t modifiers;
/* Name exactly as it appears in the sources. */ /* Name exactly as it appears in the sources. */
const char *raw_name; const char *raw_name;

28
libs/vkd3d-shader/hlsl.y
View File

@@ -1082,7 +1082,7 @@ static bool gen_struct_fields(struct hlsl_ctx *ctx, struct parse_fields *fields,
field->loc = v->loc; field->loc = v->loc;
field->name = v->name; field->name = v->name;
field->semantic = v->semantic; field->semantic = v->semantic;
field->storage_modifiers = modifiers; field->storage_modifiers = modifiers | v->semantic.modifiers;
if (v->initializer.args_count) if (v->initializer.args_count)
{ {
hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Illegal initializer on a struct field."); hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Illegal initializer on a struct field.");
@@ -1211,16 +1211,17 @@ static void initialize_var_components(struct hlsl_ctx *ctx, struct hlsl_block *i
static bool add_func_parameter(struct hlsl_ctx *ctx, struct hlsl_func_parameters *parameters, static bool add_func_parameter(struct hlsl_ctx *ctx, struct hlsl_func_parameters *parameters,
struct parse_parameter *param, const struct vkd3d_shader_location *loc) struct parse_parameter *param, const struct vkd3d_shader_location *loc)
{ {
uint32_t modifiers = param->modifiers | param->semantic.modifiers;
struct hlsl_ir_var *var; struct hlsl_ir_var *var;
if (param->type->class == HLSL_CLASS_MATRIX) if (param->type->class == HLSL_CLASS_MATRIX)
VKD3D_ASSERT(param->type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK); VKD3D_ASSERT(param->type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK);
if ((param->modifiers & HLSL_STORAGE_OUT) && (param->modifiers & HLSL_STORAGE_UNIFORM)) if ((modifiers & HLSL_STORAGE_OUT) && (modifiers & HLSL_STORAGE_UNIFORM))
hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER,
"Parameter '%s' is declared as both \"out\" and \"uniform\".", param->name); "Parameter '%s' is declared as both \"out\" and \"uniform\".", param->name);
if ((param->modifiers & HLSL_STORAGE_OUT) && !(param->modifiers & HLSL_STORAGE_IN) if ((modifiers & HLSL_STORAGE_OUT) && !(modifiers & HLSL_STORAGE_IN)
&& (param->type->modifiers & HLSL_MODIFIER_CONST)) && (param->type->modifiers & HLSL_MODIFIER_CONST))
hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER,
"Parameter '%s' is declared as both \"out\" and \"const\".", param->name); "Parameter '%s' is declared as both \"out\" and \"const\".", param->name);
@@ -1234,14 +1235,14 @@ static bool add_func_parameter(struct hlsl_ctx *ctx, struct hlsl_func_parameters
hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_MISSING_INITIALIZER, hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_MISSING_INITIALIZER,
"Missing default value for parameter '%s'.", param->name); "Missing default value for parameter '%s'.", param->name);
if (param->initializer.args_count && (param->modifiers & HLSL_STORAGE_OUT)) if (param->initializer.args_count && (modifiers & HLSL_STORAGE_OUT))
hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER,
"Output parameter '%s' has a default value.", param->name); "Output parameter '%s' has a default value.", param->name);
if (hlsl_get_stream_output_type(param->type)) if (hlsl_get_stream_output_type(param->type))
check_invalid_stream_output_object(ctx, param->type, param->name, loc); check_invalid_stream_output_object(ctx, param->type, param->name, loc);
if (!(var = hlsl_new_var(ctx, param->name, param->type, loc, &param->semantic, param->modifiers, if (!(var = hlsl_new_var(ctx, param->name, param->type, loc, &param->semantic, modifiers,
&param->reg_reservation))) &param->reg_reservation)))
return false; return false;
var->is_param = 1; var->is_param = 1;
@@ -2408,10 +2409,10 @@ static void check_invalid_object_fields(struct hlsl_ctx *ctx, const struct hlsl_
static void declare_var(struct hlsl_ctx *ctx, struct parse_variable_def *v) static void declare_var(struct hlsl_ctx *ctx, struct parse_variable_def *v)
{ {
uint32_t modifiers = v->modifiers | v->semantic.modifiers;
struct hlsl_type *basic_type = v->basic_type; struct hlsl_type *basic_type = v->basic_type;
struct hlsl_ir_function_decl *func; struct hlsl_ir_function_decl *func;
struct hlsl_semantic new_semantic; struct hlsl_semantic new_semantic;
uint32_t modifiers = v->modifiers;
bool unbounded_res_array = false; bool unbounded_res_array = false;
bool constant_buffer = false; bool constant_buffer = false;
struct hlsl_ir_var *var; struct hlsl_ir_var *var;
@@ -7847,15 +7848,28 @@ colon_attributes:
semantic: semantic:
':' any_identifier ':' any_identifier
{ {
static const char *centroid_suffix = "_centroid";
uint32_t modifiers = 0;
size_t len;
char *p; char *p;
if (!($$.raw_name = hlsl_strdup(ctx, $2))) if (!($$.raw_name = hlsl_strdup(ctx, $2)))
YYABORT; YYABORT;
for (p = $2 + strlen($2); p > $2 && isdigit(p[-1]); --p) len = strlen($2);
if (ascii_strncasecmp($2, "sv_", 3)
&& len > strlen(centroid_suffix)
&& !ascii_strcasecmp($2 + (len - strlen(centroid_suffix)), centroid_suffix))
{
modifiers = HLSL_STORAGE_CENTROID;
len -= strlen(centroid_suffix);
}
for (p = $2 + len; p > $2 && isdigit(p[-1]); --p)
; ;
$$.name = $2; $$.name = $2;
$$.index = atoi(p); $$.index = atoi(p);
$$.modifiers = modifiers;
$$.reported_missing = false; $$.reported_missing = false;
$$.reported_duplicated_output_next_index = 0; $$.reported_duplicated_output_next_index = 0;
$$.reported_duplicated_input_incompatible_next_index = 0; $$.reported_duplicated_input_incompatible_next_index = 0;

22
tests/hlsl/eval-attrib.shader_test
View File

@@ -215,11 +215,11 @@ float4 main(float4 pos : SV_Position, float2 attr : ATTR_centRoid,
[test] [test]
clear rtv 0 1.0 1.0 1.0 1.0 clear rtv 0 1.0 1.0 1.0 1.0
if(sm<6) draw triangle list 3 if(sm<6) todo(msl | glsl) draw triangle list 3
if(sm<6) todo probe (0, 0) f32(0.25, 0.25, 0.25, 0.25) if(sm<6) todo(llvmpipe) probe (0, 0) f32(0.25, 0.25, 0.25, 0.25)
if(sm<6) probe (638, 0) f32(0.0, 0.0, 0.0, 0.0) if(sm<6) probe (638, 0) f32(0.0, 0.0, 0.0, 0.0)
if(sm<6) todo probe (0, 478) f32(0.25, 0.25, 0.25, 0.25) if(sm<6) probe (0, 478) f32(0.25, 0.25, 0.25, 0.25)
if(sm<6) probe (639, 479) f32(0.0, 0.0, 0.0, 0.0) if(sm<6) todo(llvmpipe) probe (639, 479) f32(0.0, 0.0, 0.0, 0.0)
% The "_centroid" semantic modifier can be specified together with the "centroid" prefix attribute. % The "_centroid" semantic modifier can be specified together with the "centroid" prefix attribute.
@@ -285,11 +285,11 @@ float4 main(ps_in data) : SV_Target
[test] [test]
clear rtv 0 1.0 1.0 1.0 1.0 clear rtv 0 1.0 1.0 1.0 1.0
if(sm<6) draw triangle list 3 if(sm<6) todo(msl | glsl) draw triangle list 3
if(sm<6) todo probe (0, 0) f32(0.25, 0.25, 0.25, 0.25) if(sm<6) todo(llvmpipe) probe (0, 0) f32(0.25, 0.25, 0.25, 0.25)
if(sm<6) probe (638, 0) f32(0.0, 0.0, 0.0, 0.0) if(sm<6) probe (638, 0) f32(0.0, 0.0, 0.0, 0.0)
if(sm<6) todo probe (0, 478) f32(0.25, 0.25, 0.25, 0.25) if(sm<6) probe (0, 478) f32(0.25, 0.25, 0.25, 0.25)
if(sm<6) probe (639, 479) f32(0.0, 0.0, 0.0, 0.0) if(sm<6) todo(llvmpipe) probe (639, 479) f32(0.0, 0.0, 0.0, 0.0)
[pixel shader] [pixel shader]
static const float2 positions[4] = static const float2 positions[4] =
@@ -329,9 +329,9 @@ float4 main(float4 pos : SV_Position, float2 attr : ATTR, float2 attr2 : ATTR_ce
[test] [test]
clear rtv 0 1.0 1.0 1.0 1.0 clear rtv 0 1.0 1.0 1.0 1.0
% This test causes the GPU to hang with MVK. % This test causes the GPU to hang with MVK.
if(sm<6 & !mvk) draw triangle list 3 if(sm<6 & !mvk) todo(msl | glsl) draw triangle list 3
if(sm<6 & !mvk) probe (0, 0) f32(1.0, 1.75, 0.25, 0.25) if(sm<6 & !mvk) todo probe (0, 0) f32(1.0, 1.75, 0.25, 0.25)
if(sm<6 & !mvk) probe (638, 0) f32(1.0, 2.0, 0.0, 0.0) if(sm<6 & !mvk) todo probe (638, 0) f32(1.0, 2.0, 0.0, 0.0)
% Sample interpolation. % Sample interpolation.