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: Make sysval_semantic_from_hlsl() independent of HLSL IR.

Browse Source
This commit is contained in:
Francisco Casas
2024-10-04 14:01:08 -03:00
committed by Henri Verbeet
parent 7cc8151b81
commit a243862b8c
Notes: Henri Verbeet 2024-10-16 21:46:52 +02:00 
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1152
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5217,7 +5217,8 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var
enum vkd3d_shader_sysval_semantic semantic;
bool has_idx;
if (!sysval_semantic_from_hlsl(&semantic, &version, ctx->semantic_compat_mapping, &var->semantic, output))
if (!sm4_sysval_semantic_from_semantic_name(&semantic, &version,
ctx->semantic_compat_mapping, var->semantic.name, output))
{
hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC,
"Invalid semantic '%s'.", var->semantic.name);
@@ -6299,8 +6300,8 @@ static void generate_vsir_signature_entry(struct hlsl_ctx *ctx,
struct vkd3d_string_buffer *string;
bool has_idx, ret;
ret = sysval_semantic_from_hlsl(&sysval, &program->shader_version,
ctx->semantic_compat_mapping, &var->semantic, output);
ret = sm4_sysval_semantic_from_semantic_name(&sysval, &program->shader_version,
ctx->semantic_compat_mapping, var->semantic.name, output);
VKD3D_ASSERT(ret);
if (sysval == ~0u)
return;