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/fx: Populate global variables list during context initialization.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov 2024-03-13 23:39:27 +01:00 committed by Alexandre Julliard
parent ea686e8f5a
commit ed06e0bbef
Notes: Alexandre Julliard 2024-03-18 23:25:13 +01: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/717
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/vkd3d-shader/fx.c
View File

@ -159,6 +159,7 @@ static void fx_write_context_init(struct hlsl_ctx *ctx, const struct fx_write_co
struct fx_write_context *fx) struct fx_write_context *fx)
{ {
unsigned int version = ctx->profile->major_version; unsigned int version = ctx->profile->major_version;
struct hlsl_block block;
memset(fx, 0, sizeof(*fx)); memset(fx, 0, sizeof(*fx));
@ -184,6 +185,11 @@ static void fx_write_context_init(struct hlsl_ctx *ctx, const struct fx_write_co
list_init(&fx->types); list_init(&fx->types);
fx->child_effect = fx->ops->are_child_effects_supported && ctx->child_effect; fx->child_effect = fx->ops->are_child_effects_supported && ctx->child_effect;
hlsl_block_init(&block);
hlsl_prepend_global_uniform_copy(fx->ctx, &block);
hlsl_block_cleanup(&block);
hlsl_calculate_buffer_offsets(fx->ctx);
} }
static int fx_write_context_cleanup(struct fx_write_context *fx) static int fx_write_context_cleanup(struct fx_write_context *fx)
@ -836,12 +842,6 @@ static void write_fx_4_buffer(struct hlsl_buffer *b, struct fx_write_context *fx
static void write_buffers(struct fx_write_context *fx) static void write_buffers(struct fx_write_context *fx)
{ {
struct hlsl_buffer *buffer; struct hlsl_buffer *buffer;
struct hlsl_block block;
hlsl_block_init(&block);
hlsl_prepend_global_uniform_copy(fx->ctx, &block);
hlsl_block_cleanup(&block);
hlsl_calculate_buffer_offsets(fx->ctx);
LIST_FOR_EACH_ENTRY(buffer, &fx->ctx->buffers, struct hlsl_buffer, entry) LIST_FOR_EACH_ENTRY(buffer, &fx->ctx->buffers, struct hlsl_buffer, entry)
{ {