wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Avoid implicit enum pointer casts in allocate_semantic_register.

Browse Source
This commit is contained in:
Jacek Caban 2023-11-24 14:03:25 +01:00 committed by Alexandre Julliard
parent 1edbc05745
commit 85f21f197c
Notes: Alexandre Julliard 2023-11-28 00:12:39 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/493
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/vkd3d-shader/hlsl_codegen.c
View File

@ -4089,7 +4089,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var
[VKD3D_SHADER_TYPE_COMPUTE] = "Compute", [VKD3D_SHADER_TYPE_COMPUTE] = "Compute",
}; };
unsigned int type; enum vkd3d_shader_register_type type;
uint32_t reg; uint32_t reg;
bool builtin; bool builtin;
@ -4097,6 +4097,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var
if (ctx->profile->major_version < 4) if (ctx->profile->major_version < 4)
{ {
D3DSHADER_PARAM_REGISTER_TYPE sm1_type;
D3DDECLUSAGE usage; D3DDECLUSAGE usage;
uint32_t usage_idx; uint32_t usage_idx;
@ -4104,7 +4105,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var
if (ctx->profile->major_version == 1 && output && ctx->profile->type == VKD3D_SHADER_TYPE_PIXEL) if (ctx->profile->major_version == 1 && output && ctx->profile->type == VKD3D_SHADER_TYPE_PIXEL)
return; return;
builtin = hlsl_sm1_register_from_semantic(ctx, &var->semantic, output, &type, &reg); builtin = hlsl_sm1_register_from_semantic(ctx, &var->semantic, output, &sm1_type, &reg);
if (!builtin && !hlsl_sm1_usage_from_semantic(&var->semantic, &usage, &usage_idx)) if (!builtin && !hlsl_sm1_usage_from_semantic(&var->semantic, &usage, &usage_idx))
{ {
hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC,
@ -4114,6 +4115,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var
if ((!output && !var->last_read) || (output && !var->first_write)) if ((!output && !var->last_read) || (output && !var->first_write))
return; return;
type = (enum vkd3d_shader_register_type)sm1_type;
} }
else else
{ {