wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Return a vkd3d_string_buffer from hlsl_modifiers_to_string().

Browse Source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura
2021-02-27 18:03:10 -06:00
committed by Alexandre Julliard
parent 48a1db2976
commit 35105d4e29
3 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -291,12 +291,12 @@ static bool declare_variable(struct hlsl_ctx *ctx, struct hlsl_ir_var *decl, boo
if (invalid)
{
char *string;
struct vkd3d_string_buffer *string;
if ((string = hlsl_modifiers_to_string(invalid)))
if ((string = hlsl_modifiers_to_string(&ctx->string_buffers, invalid)))
hlsl_error(ctx, decl->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER,
"Modifiers '%s' are not allowed on local variables.", string);
vkd3d_free(string);
"Modifiers '%s' are not allowed on local variables.", string->buffer);
vkd3d_string_buffer_release(&ctx->string_buffers, string);
}
if (decl->semantic)
@@ -332,12 +332,12 @@ static DWORD add_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, DWORD mod, con
{
if (modifiers & mod)
{
char *string;
struct vkd3d_string_buffer *string;
if ((string = hlsl_modifiers_to_string(mod)))
if ((string = hlsl_modifiers_to_string(&ctx->string_buffers, mod)))
hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER,
"Modifier '%s' was already specified.", string);
vkd3d_free(string);
"Modifier '%s' was already specified.", string->buffer);
vkd3d_string_buffer_release(&ctx->string_buffers, string);
return modifiers;
}
if ((mod & HLSL_MODIFIERS_MAJORITY_MASK) && (modifiers & HLSL_MODIFIERS_MAJORITY_MASK))