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: Skip uniform copy logic for global variables.

Browse Source
This commit is contained in:
Zebediah Figura 2024-04-23 21:38:06 +02:00 committed by Alexandre Julliard
parent 68483d070f
commit c2eb563e50
Notes: Alexandre Julliard 2024-05-08 22:49:51 +02:00 
Approved-by: Francisco Casas (@fcasas)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/802
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,7 +169,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; struct hlsl_ir_var *var;
memset(fx, 0, sizeof(*fx)); memset(fx, 0, sizeof(*fx));
@ -197,9 +197,15 @@ static void fx_write_context_init(struct hlsl_ctx *ctx, const struct fx_write_co
fx->child_effect = fx->ops->are_child_effects_supported && ctx->child_effect; fx->child_effect = fx->ops->are_child_effects_supported && ctx->child_effect;
fx->include_empty_buffers = version == 4 && ctx->include_empty_buffers; fx->include_empty_buffers = version == 4 && ctx->include_empty_buffers;
hlsl_block_init(&block); LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry)
hlsl_prepend_global_uniform_copy(fx->ctx, &block); {
hlsl_block_cleanup(&block); if (var->storage_modifiers & HLSL_STORAGE_UNIFORM)
{
list_add_tail(&ctx->extern_vars, &var->extern_entry);
var->is_uniform = 1;
}
}
hlsl_calculate_buffer_offsets(fx->ctx); hlsl_calculate_buffer_offsets(fx->ctx);
} }

1
libs/vkd3d-shader/hlsl.h
View File

@ -1400,7 +1400,6 @@ unsigned int hlsl_type_get_sm4_offset(const struct hlsl_type *type, unsigned int
bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2); bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2);
void hlsl_calculate_buffer_offsets(struct hlsl_ctx *ctx); void hlsl_calculate_buffer_offsets(struct hlsl_ctx *ctx);
void hlsl_prepend_global_uniform_copy(struct hlsl_ctx *ctx, struct hlsl_block *block);
const struct hlsl_type *hlsl_get_multiarray_element_type(const struct hlsl_type *type); const struct hlsl_type *hlsl_get_multiarray_element_type(const struct hlsl_type *type);
unsigned int hlsl_get_multiarray_size(const struct hlsl_type *type); unsigned int hlsl_get_multiarray_size(const struct hlsl_type *type);

17
libs/vkd3d-shader/hlsl_codegen.c
View File

@ -5314,17 +5314,6 @@ static void remove_unreachable_code(struct hlsl_ctx *ctx, struct hlsl_block *bod
} }
} }
void hlsl_prepend_global_uniform_copy(struct hlsl_ctx *ctx, struct hlsl_block *body)
{
struct hlsl_ir_var *var;
LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry)
{
if (var->storage_modifiers & HLSL_STORAGE_UNIFORM)
prepend_uniform_copy(ctx, body, var);
}
}
int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func,
enum vkd3d_shader_target_type target_type, struct vkd3d_shader_code *out) enum vkd3d_shader_target_type target_type, struct vkd3d_shader_code *out)
{ {
@ -5353,7 +5342,11 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry
lower_ir(ctx, lower_matrix_swizzles, body); lower_ir(ctx, lower_matrix_swizzles, body);
lower_ir(ctx, lower_index_loads, body); lower_ir(ctx, lower_index_loads, body);
hlsl_prepend_global_uniform_copy(ctx, body); LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry)
{
if (var->storage_modifiers & HLSL_STORAGE_UNIFORM)
prepend_uniform_copy(ctx, body, var);
}
for (i = 0; i < entry_func->parameters.count; ++i) for (i = 0; i < entry_func->parameters.count; ++i)
{ {