Zebediah Figura : vkd3d-shader/hlsl: Allocate anonymous constants after uniforms.
Module: vkd3d Branch: master Commit: 8a2b357855a87f220bd6dd702d09b8b20aa3102f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8a2b357855a87f220bd6dd702d09b8... Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 7 17:45:35 2022 -0600 vkd3d-shader/hlsl: Allocate anonymous constants after uniforms. --- libs/vkd3d-shader/hlsl_codegen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index b980ed56..e265a36e 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -3359,8 +3359,6 @@ static void allocate_const_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functi struct register_allocator allocator = {0}; struct hlsl_ir_var *var; - allocate_const_registers_recurse(ctx, &entry_func->body, &allocator); - LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { if (var->is_uniform && var->last_read) @@ -3377,6 +3375,8 @@ static void allocate_const_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functi } } + allocate_const_registers_recurse(ctx, &entry_func->body, &allocator); + vkd3d_free(allocator.allocations); }
participants (1)
-
Alexandre Julliard