April 2024 - Wine-commits - list.winehq.org

Francisco Casas : vkd3d-shader/d3dbc: Pass hlsl_block instead of function declaration.
by Alexandre Julliard 24 Apr '24

24 Apr '24

Module: vkd3d Branch: master Commit: e370ce5bf2f5b60f0174cfca04e7bee4ced1fa36 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e370ce5bf2f5b60f0174cfca04e7b… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Mar 26 18:46:04 2024 -0300 vkd3d-shader/d3dbc: Pass hlsl_block instead of function declaration. --- libs/vkd3d-shader/d3dbc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 55d9ecf7..38181fa4 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2614,12 +2614,12 @@ static void write_sm1_swizzle(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer write_sm1_instruction(ctx, buffer, &sm1_instr); } -static void write_sm1_instructions(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, - const struct hlsl_ir_function_decl *entry_func) +static void write_sm1_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, + const struct hlsl_block *block) { 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) { @@ -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_semantic_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);

1 0

Francisco Casas : vkd3d-shader/ir: Lower IFC instructions to IF instructions.
by Alexandre Julliard 24 Apr '24

24 Apr '24

Module: vkd3d Branch: master Commit: d2427ea1bd956eba23cc7570d99da4a23310b832 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d2427ea1bd956eba23cc7570d99da… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Apr 2 01:24:03 2024 -0300 vkd3d-shader/ir: Lower IFC instructions to IF instructions. --- libs/vkd3d-shader/ir.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 59b74c06..f313eb65 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -82,6 +82,106 @@ static bool vsir_instruction_init_with_params(struct vsir_program *program, return true; } +static bool get_opcode_from_rel_op(enum vkd3d_shader_rel_op rel_op, enum vkd3d_data_type data_type, + enum vkd3d_shader_opcode *opcode, bool *requires_swap) +{ + switch (rel_op) + { + case VKD3D_SHADER_REL_OP_LT: + case VKD3D_SHADER_REL_OP_GT: + *requires_swap = (rel_op == VKD3D_SHADER_REL_OP_GT); + if (data_type == VKD3D_DATA_FLOAT) + { + *opcode = VKD3DSIH_LTO; + return true; + } + break; + + case VKD3D_SHADER_REL_OP_GE: + case VKD3D_SHADER_REL_OP_LE: + *requires_swap = (rel_op == VKD3D_SHADER_REL_OP_LE); + if (data_type == VKD3D_DATA_FLOAT) + { + *opcode = VKD3DSIH_GEO; + return true; + } + break; + + case VKD3D_SHADER_REL_OP_EQ: + *requires_swap = false; + if (data_type == VKD3D_DATA_FLOAT) + { + *opcode = VKD3DSIH_EQO; + return true; + } + break; + + case VKD3D_SHADER_REL_OP_NE: + *requires_swap = false; + if (data_type == VKD3D_DATA_FLOAT) + { + *opcode = VKD3DSIH_NEO; + return true; + } + break; + } + return false; +} + +static enum vkd3d_result vsir_program_lower_ifc(struct vsir_program *program, + struct vkd3d_shader_instruction *ifc, unsigned int *tmp_idx, + struct vkd3d_shader_message_context *message_context) +{ + struct vkd3d_shader_instruction_array *instructions = &program->instructions; + size_t pos = ifc - instructions->elements; + struct vkd3d_shader_instruction *ins; + enum vkd3d_shader_opcode opcode; + bool swap; + + if (!shader_instruction_array_insert_at(instructions, pos + 1, 2)) + return VKD3D_ERROR_OUT_OF_MEMORY; + + if (*tmp_idx == ~0u) + *tmp_idx = program->temp_count++; + + /* Replace ifc comparison with actual comparison, saving the result in the tmp register. */ + if (!(get_opcode_from_rel_op(ifc->flags, ifc->src[0].reg.data_type, &opcode, &swap))) + { + vkd3d_shader_error(message_context, &ifc->location, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED, + "Aborting due to not yet implemented feature: opcode for rel_op %u and data type %u.", + ifc->flags, ifc->src[0].reg.data_type); + return VKD3D_ERROR_NOT_IMPLEMENTED; + } + + ins = &instructions->elements[pos + 1]; + if (!vsir_instruction_init_with_params(program, ins, &ifc->location, opcode, 1, 2)) + return VKD3D_ERROR_OUT_OF_MEMORY; + + vsir_register_init(&ins->dst[0].reg, VKD3DSPR_TEMP, VKD3D_DATA_UINT, 1); + ins->dst[0].reg.dimension = VSIR_DIMENSION_VEC4; + ins->dst[0].reg.idx[0].offset = *tmp_idx; + ins->dst[0].write_mask = VKD3DSP_WRITEMASK_0; + + ins->src[0] = ifc->src[swap]; + ins->src[1] = ifc->src[!swap]; + + /* Create new if instruction using the previous result. */ + ins = &instructions->elements[pos + 2]; + if (!vsir_instruction_init_with_params(program, ins, &ifc->location, VKD3DSIH_IF, 0, 1)) + return VKD3D_ERROR_OUT_OF_MEMORY; + ins->flags = VKD3D_SHADER_CONDITIONAL_OP_NZ; + + vsir_register_init(&ins->src[0].reg, VKD3DSPR_TEMP, VKD3D_DATA_UINT, 1); + ins->src[0].reg.dimension = VSIR_DIMENSION_VEC4; + ins->src[0].reg.idx[0].offset = *tmp_idx; + ins->src[0].swizzle = VKD3D_SHADER_SWIZZLE(X, X, X, X); + + /* Make the original instruction no-op */ + vkd3d_shader_instruction_make_nop(ifc); + + return VKD3D_OK; +} + static enum vkd3d_result vsir_program_lower_texkill(struct vsir_program *program, struct vkd3d_shader_instruction *texkill, unsigned int *tmp_idx) { @@ -210,7 +310,8 @@ static enum vkd3d_result vsir_program_lower_precise_mad(struct vsir_program *pro return VKD3D_OK; } -static enum vkd3d_result vsir_program_lower_instructions(struct vsir_program *program) +static enum vkd3d_result vsir_program_lower_instructions(struct vsir_program *program, + struct vkd3d_shader_message_context *message_context) { struct vkd3d_shader_instruction_array *instructions = &program->instructions; unsigned int tmp_idx = ~0u, i; @@ -222,6 +323,11 @@ static enum vkd3d_result vsir_program_lower_instructions(struct vsir_program *pr switch (ins->handler_idx) { + case VKD3DSIH_IFC: + if ((ret = vsir_program_lower_ifc(program, ins, &tmp_idx, message_context)) < 0) + return ret; + break; + case VKD3DSIH_TEXKILL: if ((ret = vsir_program_lower_texkill(program, ins, &tmp_idx)) < 0) return ret; @@ -6056,7 +6162,7 @@ enum vkd3d_result vsir_program_normalise(struct vsir_program *program, uint64_t { enum vkd3d_result result = VKD3D_OK; - if ((result = vsir_program_lower_instructions(program)) < 0) + if ((result = vsir_program_lower_instructions(program, message_context)) < 0) return result; if (program->shader_version.major >= 6)

1 0

Francisco Casas : vkd3d-shader/d3dbc: Support SM1 if conditionals.
by Alexandre Julliard 24 Apr '24

24 Apr '24

Module: vkd3d Branch: master Commit: 5e3515f191f34d088dfb3a85dadd1966b75bd0c2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5e3515f191f34d088dfb3a85dadd1… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Mar 26 19:43:54 2024 -0300 vkd3d-shader/d3dbc: Support SM1 if conditionals. According to the documentation, if_comp is available from 2_x pixel and vertex shaders and, unlike "if bool" it doesn't expect a constant boolean register (from the input signature), so: if_neq cond -cond seems like a convenient way to write these, for profiles above 2.0. --- libs/vkd3d-shader/d3dbc.c | 53 ++++++++++++++++++++++++++++++++++++++ tests/hlsl/conditional.shader_test | 32 +++++++++++------------ 2 files changed, 69 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 38181fa4..09e4f596 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1813,6 +1813,7 @@ static uint32_t sm1_encode_register_type(D3DSHADER_PARAM_REGISTER_TYPE type) struct sm1_instruction { D3DSHADER_INSTRUCTION_OPCODE_TYPE opcode; + unsigned int flags; struct sm1_dst_register { @@ -1852,6 +1853,8 @@ static void write_sm1_instruction(struct hlsl_ctx *ctx, struct vkd3d_bytecode_bu uint32_t token = instr->opcode; unsigned int i; + token |= VKD3D_SM1_INSTRUCTION_FLAGS_MASK & (instr->flags << VKD3D_SM1_INSTRUCTION_FLAGS_SHIFT); + if (ctx->profile->major_version > 1) token |= (instr->has_dst + instr->src_count) << D3DSI_INSTLENGTH_SHIFT; put_u32(buffer, token); @@ -2414,6 +2417,49 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b } } +static void write_sm1_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, + const struct hlsl_block *block); + +static void write_sm1_if(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_node *instr) +{ + const struct hlsl_ir_if *iff = hlsl_ir_if(instr); + const struct hlsl_ir_node *condition; + struct sm1_instruction sm1_ifc, sm1_else, sm1_endif; + + condition = iff->condition.node; + assert(condition->data_type->dimx == 1 && condition->data_type->dimy == 1); + + sm1_ifc = (struct sm1_instruction) + { + .opcode = D3DSIO_IFC, + .flags = VKD3D_SHADER_REL_OP_NE, /* Make it a "if_ne" instruction. */ + + .srcs[0].type = D3DSPR_TEMP, + .srcs[0].swizzle = hlsl_swizzle_from_writemask(condition->reg.writemask), + .srcs[0].reg = condition->reg.id, + .srcs[0].mod = 0, + + .srcs[1].type = D3DSPR_TEMP, + .srcs[1].swizzle = hlsl_swizzle_from_writemask(condition->reg.writemask), + .srcs[1].reg = condition->reg.id, + .srcs[1].mod = D3DSPSM_NEG, + + .src_count = 2, + }; + write_sm1_instruction(ctx, buffer, &sm1_ifc); + write_sm1_block(ctx, buffer, &iff->then_block); + + if (!list_empty(&iff->else_block.instrs)) + { + sm1_else = (struct sm1_instruction){.opcode = D3DSIO_ELSE}; + write_sm1_instruction(ctx, buffer, &sm1_else); + write_sm1_block(ctx, buffer, &iff->else_block); + } + + sm1_endif = (struct sm1_instruction){.opcode = D3DSIO_ENDIF}; + write_sm1_instruction(ctx, buffer, &sm1_endif); +} + static void write_sm1_jump(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_node *instr) { const struct hlsl_ir_jump *jump = hlsl_ir_jump(instr); @@ -2643,6 +2689,13 @@ static void write_sm1_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * write_sm1_expr(ctx, buffer, instr); break; + case HLSL_IR_IF: + if (hlsl_version_ge(ctx, 2, 1)) + write_sm1_if(ctx, buffer, instr); + else + hlsl_fixme(ctx, &instr->loc, "Flatten \"if\" conditionals branches."); + break; + case HLSL_IR_JUMP: write_sm1_jump(ctx, buffer, instr); break; diff --git a/tests/hlsl/conditional.shader_test b/tests/hlsl/conditional.shader_test index 5eafa2b1..806d1747 100644 --- a/tests/hlsl/conditional.shader_test +++ b/tests/hlsl/conditional.shader_test @@ -75,7 +75,7 @@ float main() : sv_target shader model >= 3.0 -[pixel shader todo(sm<4)] +[pixel shader] uniform float a; float4 main() : sv_target @@ -87,14 +87,14 @@ float4 main() : sv_target [test] uniform 0 float -2 -todo(sm<4 | glsl) draw quad +todo(glsl) draw quad probe all rgba (1, 2, 3, 4) uniform 0 float 10 -todo(sm<4 | glsl) draw quad +todo(glsl) draw quad probe all rgba (10, 20, 30, 40) -[pixel shader todo(sm<4)] +[pixel shader] uniform float4 u; float4 main() : sv_target @@ -108,7 +108,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.0 0.0 0.0 -todo(sm<4 | glsl) draw quad +todo(glsl) draw quad probe all rgba (0.9, 0.8, 0.7, 0.6) [pixel shader] @@ -129,7 +129,7 @@ todo(glsl) draw quad probe all rgba (9.0, 10.0, 11.0, 12.0) -[pixel shader todo(sm<4)] +[pixel shader] int a, b; float4 main() : sv_target @@ -145,23 +145,23 @@ if(sm<4) uniform 0 float 8 if(sm<4) uniform 4 float 9 if(sm>=4) uniform 0 int 8 if(sm>=4) uniform 1 int 9 -todo(sm<4 | glsl) draw quad +todo(glsl) draw quad probe all rgba (-1.0, -1.0, -1.0, -1.0) if(sm<4) uniform 0 float -3 if(sm<4) uniform 4 float -4 if(sm>=4) uniform 0 int -3 if(sm>=4) uniform 1 int -4 -todo(sm<4 | glsl) draw quad +todo(glsl) draw quad probe all rgba (1.0, 1.0, 1.0, 1.0) if(sm<4) uniform 0 float 7 if(sm<4) uniform 4 float 7 if(sm>=4) uniform 0 int 7 if(sm>=4) uniform 1 int 7 -todo(sm<4 | glsl) draw quad +todo(glsl) draw quad probe all rgba (1.0, 1.0, 1.0, 1.0) -[pixel shader todo(sm<4)] +[pixel shader] int a, b; float4 main() : sv_target @@ -177,23 +177,23 @@ if(sm<4) uniform 0 float 8 if(sm<4) uniform 4 float 9 if(sm>=4) uniform 0 int 8 if(sm>=4) uniform 1 int 9 -todo(sm<4 | glsl) draw quad +todo(glsl) draw quad probe all rgba (-1.0, -1.0, -1.0, -1.0) if(sm<4) uniform 0 float -3 if(sm<4) uniform 4 float -4 if(sm>=4) uniform 0 int -3 if(sm>=4) uniform 1 int -4 -todo(sm<4 | glsl) draw quad +todo(glsl) draw quad probe all rgba (1.0, 1.0, 1.0, 1.0) if(sm<4) uniform 0 float 7 if(sm<4) uniform 4 float 7 if(sm>=4) uniform 0 int 7 if(sm>=4) uniform 1 int 7 -todo(sm<4 | glsl) draw quad +todo(glsl) draw quad probe all rgba (-1.0, -1.0, -1.0, -1.0) -[pixel shader todo(sm<4)] +[pixel shader] int a, b; float4 main() : sv_target @@ -209,13 +209,13 @@ if(sm<4) uniform 0 float -3 if(sm<4) uniform 4 float -2 if(sm>=4) uniform 0 int -3 if(sm>=4) uniform 1 int -2 -todo(sm<4 | glsl) draw quad +todo(glsl) draw quad probe all rgba (-1.0, -1.0, -1.0, -1.0) if(sm<4) uniform 0 float 4 if(sm<4) uniform 4 float 4 if(sm>=4) uniform 0 int 4 if(sm>=4) uniform 1 int 4 -todo(sm<4 | glsl) draw quad +todo(glsl) draw quad probe all rgba (1.0, 1.0, 1.0, 1.0)

1 0

Conor McCarthy : vkd3d-shader/ir: Always check for undominated SSA use in register relative addresses.
by Alexandre Julliard 24 Apr '24

24 Apr '24

Module: vkd3d Branch: master Commit: 075979fa21f0975a01f3f71eaccefac29c25039a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/075979fa21f0975a01f3f71eaccef… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Apr 24 18:07:16 2024 +1000 vkd3d-shader/ir: Always check for undominated SSA use in register relative addresses. --- libs/vkd3d-shader/ir.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index f313eb65..121b0fe3 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -5098,12 +5098,12 @@ static void register_map_undominated_use(struct vkd3d_shader_register *reg, stru { unsigned int i; - if (!register_is_ssa(reg)) - return; - - i = reg->idx[0].offset; - if (alloc->table[i] == UINT_MAX && !vsir_block_dominates(origin_blocks[i], block)) - alloc->table[i] = alloc->next_temp_idx++; + if (register_is_ssa(reg)) + { + i = reg->idx[0].offset; + if (alloc->table[i] == UINT_MAX && !vsir_block_dominates(origin_blocks[i], block)) + alloc->table[i] = alloc->next_temp_idx++; + } for (i = 0; i < reg->idx_count; ++i) if (reg->idx[i].rel_addr)

1 0

Henri Verbeet : vkd3d: Use WIDL_C_INLINE_WRAPPERS.
by Alexandre Julliard 24 Apr '24

24 Apr '24

Module: vkd3d Branch: master Commit: d5717d333b5dd5c647e824b34c6b26889ce46fc9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d5717d333b5dd5c647e824b34c6b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 20:00:46 2024 +0200 vkd3d: Use WIDL_C_INLINE_WRAPPERS. --- libs/vkd3d/device.c | 2 +- libs/vkd3d/resource.c | 2 +- libs/vkd3d/vkd3d_main.c | 2 +- libs/vkd3d/vkd3d_private.h | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index a394e3f7..13d354a7 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2833,7 +2833,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_QueryInterface(ID3D12Device9 *ifac || IsEqualGUID(riid, &IID_ID3D12Object) || IsEqualGUID(riid, &IID_IUnknown)) { - ID3D12Device_AddRef(iface); + ID3D12Device9_AddRef(iface); *object = iface; return S_OK; } diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 17999914..6ee3afa4 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1271,7 +1271,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_QueryInterface(ID3D12Resource2 * || IsEqualGUID(riid, &IID_ID3D12Object) || IsEqualGUID(riid, &IID_IUnknown)) { - ID3D12Resource_AddRef(iface); + ID3D12Resource2_AddRef(iface); *object = iface; return S_OK; } diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 29305fbd..c7431bd8 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -71,7 +71,7 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, if (!device) { - ID3D12Device_Release(&object->ID3D12Device9_iface); + ID3D12Device9_Release(&object->ID3D12Device9_iface); return S_FALSE; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index fa9e1f05..77d95111 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -19,6 +19,9 @@ #ifndef __VKD3D_PRIVATE_H #define __VKD3D_PRIVATE_H +#ifndef __MINGW32__ +#define WIDL_C_INLINE_WRAPPERS +#endif #define COBJMACROS #define NONAMELESSUNION #define VK_NO_PROTOTYPES

1 0

Henri Verbeet : vkd3d-utils: Use WIDL_C_INLINE_WRAPPERS.
by Alexandre Julliard 24 Apr '24

24 Apr '24

Module: vkd3d Branch: master Commit: 534044181b50f45a6e6e72dbc4b4c56788dcf619 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/534044181b50f45a6e6e72dbc4b4c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 20:02:50 2024 +0200 vkd3d-utils: Use WIDL_C_INLINE_WRAPPERS. --- libs/vkd3d-utils/reflection.c | 2 +- libs/vkd3d-utils/vkd3d_utils_private.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-utils/reflection.c b/libs/vkd3d-utils/reflection.c index 920cc371..f4cc78bc 100644 --- a/libs/vkd3d-utils/reflection.c +++ b/libs/vkd3d-utils/reflection.c @@ -340,7 +340,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_reflection_QueryInterface( if (IsEqualGUID(riid, &IID_ID3D12ShaderReflection) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + ID3D12ShaderReflection_AddRef(iface); *object = iface; return S_OK; } diff --git a/libs/vkd3d-utils/vkd3d_utils_private.h b/libs/vkd3d-utils/vkd3d_utils_private.h index 7fece3d6..84f7372e 100644 --- a/libs/vkd3d-utils/vkd3d_utils_private.h +++ b/libs/vkd3d-utils/vkd3d_utils_private.h @@ -19,6 +19,9 @@ #ifndef __VKD3D_UTILS_PRIVATE_H #define __VKD3D_UTILS_PRIVATE_H +#ifndef __MINGW32__ +#define WIDL_C_INLINE_WRAPPERS +#endif #define COBJMACROS #define NONAMELESSUNION #define VK_NO_PROTOTYPES

1 0

Henri Verbeet : vkd3d-common: Use WIDL_C_INLINE_WRAPPERS.
by Alexandre Julliard 24 Apr '24

24 Apr '24

Module: vkd3d Branch: master Commit: 11db8c17191021391bd97f69952cb7e16ff66b65 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/11db8c17191021391bd97f69952cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 20:04:41 2024 +0200 vkd3d-common: Use WIDL_C_INLINE_WRAPPERS. --- libs/vkd3d-common/blob.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-common/blob.c b/libs/vkd3d-common/blob.c index b12d9630..469f9810 100644 --- a/libs/vkd3d-common/blob.c +++ b/libs/vkd3d-common/blob.c @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef __MINGW32__ +#define WIDL_C_INLINE_WRAPPERS +#endif #define COBJMACROS #define INITGUID #define CONST_VTABLE

1 0

Henri Verbeet : tests/shader_runner: Use WIDL_C_INLINE_WRAPPERS.
by Alexandre Julliard 24 Apr '24

24 Apr '24

Module: vkd3d Branch: master Commit: 2b6012df7d240e49bc48842ef7f12b71b60b40ed URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2b6012df7d240e49bc48842ef7f12… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 20:05:16 2024 +0200 tests/shader_runner: Use WIDL_C_INLINE_WRAPPERS. --- tests/shader_runner.c | 2 ++ tests/shader_runner_d3d12.c | 3 +++ tests/shader_runner_gl.c | 3 +++ 3 files changed, 8 insertions(+) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 29ac8749..8e6fdf9b 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -45,6 +45,8 @@ #ifdef __MINGW32__ # define _HRESULT_DEFINED typedef int HRESULT; +#else +# define WIDL_C_INLINE_WRAPPERS #endif #define COBJMACROS diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 7729de7c..8119a66e 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -18,6 +18,9 @@ #include "config.h" #include <assert.h> +#ifndef __MINGW32__ +#define WIDL_C_INLINE_WRAPPERS +#endif #define COBJMACROS #define CONST_VTABLE #define VKD3D_TEST_NO_DEFS diff --git a/tests/shader_runner_gl.c b/tests/shader_runner_gl.c index fdc418ba..632ba5cc 100644 --- a/tests/shader_runner_gl.c +++ b/tests/shader_runner_gl.c @@ -20,6 +20,9 @@ #ifdef HAVE_OPENGL +#ifndef __MINGW32__ +#define WIDL_C_INLINE_WRAPPERS +#endif #define COBJMACROS #define VKD3D_TEST_NO_DEFS #define GL_GLEXT_PROTOTYPES

1 0

Henri Verbeet : vkd3d: Get rid of vkd3d_atomic_compare_exchange_pointer().
by Alexandre Julliard 24 Apr '24

24 Apr '24

Module: vkd3d Branch: master Commit: bfbd29efe6e7e428adf94a1ffc7a14418c8e0937 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bfbd29efe6e7e428adf94a1ffc7a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 18:31:10 2024 +0200 vkd3d: Get rid of vkd3d_atomic_compare_exchange_pointer(). The only uses of this were remove by commit 3ca225980755032b385b36142d4cc44e78a987fd. --- libs/vkd3d/vkd3d_private.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 77d95111..bf02a76f 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -214,11 +214,6 @@ static inline unsigned int vkd3d_atomic_exchange(unsigned int volatile *x, unsig return InterlockedExchange((LONG volatile *)x, val); } -static inline bool vkd3d_atomic_compare_exchange_pointer(void * volatile *x, void *cmp, void *xchg) -{ - return InterlockedCompareExchangePointer(x, xchg, cmp) == cmp; -} - static inline void *vkd3d_atomic_exchange_pointer(void * volatile *x, void *val) { return InterlockedExchangePointer(x, val); @@ -239,11 +234,6 @@ static inline bool vkd3d_atomic_compare_exchange(unsigned int volatile *x, unsig { return __sync_bool_compare_and_swap(x, cmp, xchg); } - -static inline bool vkd3d_atomic_compare_exchange_pointer(void * volatile *x, void *cmp, void *xchg) -{ - return __sync_bool_compare_and_swap(x, cmp, xchg); -} # else # error "vkd3d_atomic_compare_exchange() not implemented for this platform" # endif

1 0

Henri Verbeet : vkd3d-common: Introduce vkd3d_atomic_compare_exchange_u32().
by Alexandre Julliard 24 Apr '24

24 Apr '24

Module: vkd3d Branch: master Commit: 5c8a90a6c995d221033af863a7f667ec6c9f7bed URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5c8a90a6c995d221033af863a7f66… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 18:23:41 2024 +0200 vkd3d-common: Introduce vkd3d_atomic_compare_exchange_u32(). --- include/private/vkd3d_common.h | 11 +++++++++++ libs/vkd3d/resource.c | 8 ++++---- libs/vkd3d/vkd3d_private.h | 16 +--------------- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index de6878a4..88c563eb 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -431,6 +431,17 @@ static inline uint32_t vkd3d_atomic_increment_u32(uint32_t volatile *x) return vkd3d_atomic_add_fetch_u32(x, 1); } +static inline bool vkd3d_atomic_compare_exchange_u32(uint32_t volatile *x, uint32_t expected, uint32_t val) +{ +#if HAVE_SYNC_BOOL_COMPARE_AND_SWAP + return __sync_bool_compare_and_swap(x, expected, val); +#elif defined(_WIN32) + return InterlockedCompareExchange((LONG *)x, val, expected) == expected; +#else +# error "vkd3d_atomic_compare_exchange_u32() not implemented for this platform" +#endif +} + struct vkd3d_mutex { #ifdef _WIN32 diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 6ee3afa4..ff9721fb 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2350,7 +2350,7 @@ static void *vkd3d_desc_object_cache_get(struct vkd3d_desc_object_cache *cache) i = vkd3d_atomic_increment_u32(&cache->next_index) & HEAD_INDEX_MASK; for (;;) { - if (vkd3d_atomic_compare_exchange(&cache->heads[i].spinlock, 0, 1)) + if (vkd3d_atomic_compare_exchange_u32(&cache->heads[i].spinlock, 0, 1)) { if ((u.object = cache->heads[i].head)) { @@ -2381,7 +2381,7 @@ static void vkd3d_desc_object_cache_push(struct vkd3d_desc_object_cache *cache, i = vkd3d_atomic_increment_u32(&cache->next_index) & HEAD_INDEX_MASK; for (;;) { - if (vkd3d_atomic_compare_exchange(&cache->heads[i].spinlock, 0, 1)) + if (vkd3d_atomic_compare_exchange_u32(&cache->heads[i].spinlock, 0, 1)) break; i = (i + 1) & HEAD_INDEX_MASK; } @@ -2695,10 +2695,10 @@ static void d3d12_desc_mark_as_modified(struct d3d12_desc *dst, struct d3d12_des head = descriptor_heap->dirty_list_head; /* Only one thread can swap the value away from zero. */ - if (!vkd3d_atomic_compare_exchange(&dst->next, 0, (head << 1) | 1)) + if (!vkd3d_atomic_compare_exchange_u32(&dst->next, 0, (head << 1) | 1)) return; /* Now it is safe to modify 'next' to another nonzero value if necessary. */ - while (!vkd3d_atomic_compare_exchange(&descriptor_heap->dirty_list_head, head, i)) + while (!vkd3d_atomic_compare_exchange_u32(&descriptor_heap->dirty_list_head, head, i)) { head = descriptor_heap->dirty_list_head; vkd3d_atomic_exchange(&dst->next, (head << 1) | 1); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index bf02a76f..f9b0a093 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -204,11 +204,6 @@ union vkd3d_thread_handle void *handle; }; -static inline bool vkd3d_atomic_compare_exchange(unsigned int volatile *x, unsigned int cmp, unsigned int xchg) -{ - return InterlockedCompareExchange((LONG volatile *)x, xchg, cmp) == cmp; -} - static inline unsigned int vkd3d_atomic_exchange(unsigned int volatile *x, unsigned int val) { return InterlockedExchange((LONG volatile *)x, val); @@ -229,15 +224,6 @@ union vkd3d_thread_handle void *handle; }; -# if HAVE_SYNC_BOOL_COMPARE_AND_SWAP -static inline bool vkd3d_atomic_compare_exchange(unsigned int volatile *x, unsigned int cmp, unsigned int xchg) -{ - return __sync_bool_compare_and_swap(x, cmp, xchg); -} -# else -# error "vkd3d_atomic_compare_exchange() not implemented for this platform" -# endif - # if HAVE_ATOMIC_EXCHANGE_N static inline unsigned int vkd3d_atomic_exchange(unsigned int volatile *x, unsigned int val) { @@ -735,7 +721,7 @@ static inline bool vkd3d_view_incref(void *desc) if (refcount <= 0) return false; } - while (!vkd3d_atomic_compare_exchange(&h->refcount, refcount, refcount + 1)); + while (!vkd3d_atomic_compare_exchange_u32(&h->refcount, refcount, refcount + 1)); return true; }

1 0