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: Validate groupshared variables.

Browse Source
This commit is contained in:
Shaun Ren
2025-11-17 22:04:52 -05:00
committed by Henri Verbeet
parent d2d50efaea
commit b31dc058b9
Notes: Henri Verbeet 2025-12-08 17:48:57 +01:00 
Approved-by: Francisco Casas (@fcasas)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1836
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2410,6 +2410,21 @@ static void check_invalid_object_fields(struct hlsl_ctx *ctx, const struct hlsl_
"Target profile doesn't support objects as struct members in uniform variables.");
}
static void validate_groupshared_var(struct hlsl_ctx *ctx, const struct hlsl_ir_var *var)
{
if (type_has_object_components(var->data_type))
{
struct vkd3d_string_buffer *string;
if ((string = hlsl_type_to_string(ctx, var->data_type)))
{
hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE,
"Groupshared type %s is not numeric.", string->buffer);
hlsl_release_string_buffer(ctx, string);
}
}
}
static void declare_var(struct hlsl_ctx *ctx, struct parse_variable_def *v)
{
uint32_t modifiers = v->modifiers | v->semantic.modifiers;
@@ -2564,11 +2579,18 @@ static void declare_var(struct hlsl_ctx *ctx, struct parse_variable_def *v)
hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER,
"Variable '%s' is declared as both \"uniform\" and \"static\".", var->name);
if ((modifiers & HLSL_STORAGE_GROUPSHARED) && ctx->profile->type != VKD3D_SHADER_TYPE_COMPUTE)
if ((modifiers & HLSL_STORAGE_GROUPSHARED))
{
modifiers &= ~HLSL_STORAGE_GROUPSHARED;
hlsl_warning(ctx, &var->loc, VKD3D_SHADER_WARNING_HLSL_IGNORED_MODIFIER,
"Ignoring the 'groupshared' modifier in a non-compute shader.");
/* d3dcompiler/fxc always validates global groupshared variables,
* regardless of whether the groupshared modifier is ignored. */
validate_groupshared_var(ctx, var);
if (ctx->profile->type != VKD3D_SHADER_TYPE_COMPUTE)
{
modifiers &= ~HLSL_STORAGE_GROUPSHARED;
hlsl_warning(ctx, &var->loc, VKD3D_SHADER_WARNING_HLSL_IGNORED_MODIFIER,
"Ignoring the 'groupshared' modifier in a non-compute shader.");
}
}
/* Mark it as uniform. We need to do this here since synthetic

4
tests/hlsl/tgsm.shader_test
View File

@@ -49,7 +49,7 @@ void main(uint local_idx : SV_GroupIndex)
shader model >= 4.0
% The type of a groupshared variable must not contain objects.
[compute shader fail(sm<6) todo]
[compute shader fail(sm<6)]
struct data
{
Texture2D tex;
@@ -65,7 +65,7 @@ void main(uint local_idx : SV_GroupIndex)
% Even though the 'groupshared' attribute is ignored in non-compute shaders,
% native still checks whether the type of the variable contains objects or not.
[pixel shader fail(sm<6) todo]
[pixel shader fail(sm<6) todo(sm>=5.1 & sm<6)]
groupshared Texture2D m[4];
float4 main() : SV_Target