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/fx: Use variable pointer in write_group().

Browse Source 
The helper will need to access group annotations later, and these are
available for variables.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov
2024-01-25 18:18:40 +01:00
committed by Alexandre Julliard
parent c249461e97
commit d5f562d994
Notes: Alexandre Julliard 2024-02-19 22:59:31 +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/636
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -227,10 +227,10 @@ static void write_techniques(struct hlsl_scope *scope, struct fx_write_context *
set_status(fx, fx->structured.status); set_status(fx, fx->structured.status);
} }
static void write_group(struct hlsl_scope *scope, const char *name, struct fx_write_context *fx) static void write_group(struct hlsl_ir_var *var, struct fx_write_context *fx)
{ {
struct vkd3d_bytecode_buffer *buffer = &fx->structured; struct vkd3d_bytecode_buffer *buffer = &fx->structured;
uint32_t name_offset = write_string(name, fx); uint32_t name_offset = write_string(var ? var->name : NULL, fx);
uint32_t count_offset, count; uint32_t count_offset, count;
put_u32(buffer, name_offset); put_u32(buffer, name_offset);
@@ -238,14 +238,15 @@ static void write_group(struct hlsl_scope *scope, const char *name, struct fx_wr
put_u32(buffer, 0); /* Annotation count */ put_u32(buffer, 0); /* Annotation count */
count = fx->technique_count; count = fx->technique_count;
write_techniques(scope, fx); write_techniques(var ? var->scope : fx->ctx->globals, fx);
set_u32(buffer, count_offset, fx->technique_count - count); set_u32(buffer, count_offset, fx->technique_count - count);
++fx->group_count; ++fx->group_count;
} }
static void write_groups(struct hlsl_scope *scope, struct fx_write_context *fx) static void write_groups(struct fx_write_context *fx)
{ {
struct hlsl_scope *scope = fx->ctx->globals;
bool needs_default_group = false; bool needs_default_group = false;
struct hlsl_ir_var *var; struct hlsl_ir_var *var;
@@ -259,13 +260,13 @@ static void write_groups(struct hlsl_scope *scope, struct fx_write_context *fx)
} }
if (needs_default_group) if (needs_default_group)
write_group(scope, NULL, fx); write_group(NULL, fx);
LIST_FOR_EACH_ENTRY(var, &scope->vars, struct hlsl_ir_var, scope_entry) LIST_FOR_EACH_ENTRY(var, &scope->vars, struct hlsl_ir_var, scope_entry)
{ {
const struct hlsl_type *type = var->data_type; const struct hlsl_type *type = var->data_type;
if (type->base_type == HLSL_TYPE_EFFECT_GROUP) if (type->base_type == HLSL_TYPE_EFFECT_GROUP)
write_group(var->scope, var->name, fx); write_group(var, fx);
} }
} }
@@ -444,7 +445,7 @@ static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out)
/* TODO: objects */ /* TODO: objects */
/* TODO: interface variables */ /* TODO: interface variables */
write_groups(ctx->globals, &fx); write_groups(&fx);
put_u32(&buffer, 0xfeff2001); /* Version. */ put_u32(&buffer, 0xfeff2001); /* Version. */
put_u32(&buffer, 0); /* Buffer count. */ put_u32(&buffer, 0); /* Buffer count. */