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/hlsl: Introduce hlsl_ir_stateblock_constant.

Browse Source
This commit is contained in:
Francisco Casas
2024-03-18 15:31:04 -03:00
committed by Alexandre Julliard
parent ee0d439a1b
commit 80320f6129
Notes: Alexandre Julliard 2024-04-11 17:02:42 -05:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Zebediah Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/739
4 changed files with 79 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1294,6 +1294,7 @@ static unsigned int evaluate_static_expression_as_uint(struct hlsl_ctx *ctx, str
case HLSL_IR_RESOURCE_STORE:
case HLSL_IR_STORE:
case HLSL_IR_SWITCH:
case HLSL_IR_STATEBLOCK_CONSTANT:
hlsl_error(ctx, &node->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX,
"Expected literal expression.");
}
@@ -7365,15 +7366,13 @@ primary_expr:
{
if (ctx->in_state_block)
{
struct hlsl_ir_load *load;
struct hlsl_ir_var *var;
struct hlsl_ir_node *constant;
if (!(var = hlsl_new_synthetic_var(ctx, "state_block_expr",
hlsl_get_scalar_type(ctx, HLSL_TYPE_INT), &@1)))
if (!(constant = hlsl_new_stateblock_constant(ctx, $1, &@1)))
YYABORT;
if (!(load = hlsl_new_var_load(ctx, var, &@1)))
YYABORT;
if (!($$ = make_block(ctx, &load->node)))
vkd3d_free($1);
if (!($$ = make_block(ctx, constant)))
YYABORT;
}
else