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/d3dbc: Pass hlsl_block instead of function declaration.

Browse Source
This commit is contained in:
Francisco Casas 2024-03-26 18:46:04 -03:00 committed by Alexandre Julliard
parent 74c998a2a4
commit e370ce5bf2
Notes: Alexandre Julliard 2024-04-25 00:12:42 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Zebediah Figura (@zfigura)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/794
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/vkd3d-shader/d3dbc.c
View File

@ -2614,12 +2614,12 @@ static void write_sm1_swizzle(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer
write_sm1_instruction(ctx, buffer, &sm1_instr); write_sm1_instruction(ctx, buffer, &sm1_instr);
} }
static void write_sm1_instructions(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, static void write_sm1_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer,
const struct hlsl_ir_function_decl *entry_func) const struct hlsl_block *block)
{ {
const struct hlsl_ir_node *instr; const struct hlsl_ir_node *instr;
LIST_FOR_EACH_ENTRY(instr, &entry_func->body.instrs, struct hlsl_ir_node, entry) LIST_FOR_EACH_ENTRY(instr, &block->instrs, struct hlsl_ir_node, entry)
{ {
if (instr->data_type) if (instr->data_type)
{ {
@ -2680,7 +2680,7 @@ int hlsl_sm1_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun
write_sm1_constant_defs(ctx, &buffer); write_sm1_constant_defs(ctx, &buffer);
write_sm1_semantic_dcls(ctx, &buffer); write_sm1_semantic_dcls(ctx, &buffer);
write_sm1_sampler_dcls(ctx, &buffer); write_sm1_sampler_dcls(ctx, &buffer);
write_sm1_instructions(ctx, &buffer, entry_func); write_sm1_block(ctx, &buffer, &entry_func->body);
put_u32(&buffer, D3DSIO_END); put_u32(&buffer, D3DSIO_END);