- Wine-Commits - list.winehq.org

Henri Verbeet : tests/shader_runner: Use WIDL_C_INLINE_WRAPPERS.
by Alexandre Julliard April 24, 2024

April 24, 2024

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

Francisco Casas : vkd3d-shader/ir: Lower IFC instructions to IF instructions.
by Alexandre Julliard April 24, 2024

April 24, 2024

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 April 24, 2024

April 24, 2024

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

Francisco Casas : tests: Add additional conditional tests for shader model 3.0.
by Alexandre Julliard April 24, 2024

April 24, 2024

Module: vkd3d Branch: master Commit: 74c998a2a49740adba2e148244f7e3a67a53bc6a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/74c998a2a49740adba2e148244f7e… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Apr 1 20:14:58 2024 -0300 tests: Add additional conditional tests for shader model 3.0. --- tests/hlsl/conditional.shader_test | 168 +++++++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) diff --git a/tests/hlsl/conditional.shader_test b/tests/hlsl/conditional.shader_test index 89e00dce..5eafa2b1 100644 --- a/tests/hlsl/conditional.shader_test +++ b/tests/hlsl/conditional.shader_test @@ -74,6 +74,26 @@ float main() : sv_target [require] shader model >= 3.0 + +[pixel shader todo(sm<4)] +uniform float a; + +float4 main() : sv_target +{ + if (a < 4) + return float4(1, 2, 3, 4); + return float4(10, 20, 30, 40); +} + +[test] +uniform 0 float -2 +todo(sm<4 | glsl) draw quad +probe all rgba (1, 2, 3, 4) +uniform 0 float 10 +todo(sm<4 | glsl) draw quad +probe all rgba (10, 20, 30, 40) + + [pixel shader todo(sm<4)] uniform float4 u; @@ -107,3 +127,151 @@ float4 main() : sv_target [test] todo(glsl) draw quad probe all rgba (9.0, 10.0, 11.0, 12.0) + + +[pixel shader todo(sm<4)] +int a, b; + +float4 main() : sv_target +{ + if (a < b) + return -1.0; + else + return 1.0; +} + +[test] +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 +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 +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 +probe all rgba (1.0, 1.0, 1.0, 1.0) + + +[pixel shader todo(sm<4)] +int a, b; + +float4 main() : sv_target +{ + if (a <= b) + return -1.0; + else + return 1.0; +} + +[test] +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 +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 +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 +probe all rgba (-1.0, -1.0, -1.0, -1.0) + + +[pixel shader todo(sm<4)] +int a, b; + +float4 main() : sv_target +{ + if (a != b) + return -1.0; + else + return 1.0; +} + +[test] +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 +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 +probe all rgba (1.0, 1.0, 1.0, 1.0) + + +% Test "if" conditionals, using resource loads to ensure we aren't removing these instruction with optimizations. +[srv 0] +size (2d, 2, 2) +0.0 0.0 0.0 4.0 1.0 0.0 0.0 4.0 +0.0 1.0 0.0 4.0 1.0 1.0 0.0 4.0 + +[sampler 0] +filter linear linear linear +address clamp clamp clamp + +[pixel shader todo(sm<4)] +Texture2D tex; +sampler sam; +float a; + +float4 main() : sv_target +{ + if (a < 4) + return tex.Sample(sam, float2(0, 0)); + return float4(1, 2, 3, 4); +} + +[test] +uniform 0 float -2 +todo(sm<4 | glsl) draw quad +probe all rgba (0.0, 0.0, 0.0, 4.0) +uniform 0 float 4 +todo(sm<4 | glsl) draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + + +[pixel shader todo(sm<4)] +Texture2D tex; +sampler sam; +float a; + +float4 main() : sv_target +{ + if (a >= 2) + return tex.Sample(sam, float2(0, 0)); + else if (a >= 1) + return tex.Sample(sam, float2(1, 0)); + else + return tex.Sample(sam, float2(1, 1)); +} + +[test] +uniform 0 float 2 +todo(sm<4 | glsl) draw quad +probe all rgba (0.0, 0.0, 0.0, 4.0) +uniform 0 float 1 +todo(sm<4 | glsl) draw quad +probe all rgba (1.0, 0.0, 0.0, 4.0) +uniform 0 float 0 +todo(sm<4 | glsl) draw quad +probe all rgba (1.0, 1.0, 0.0, 4.0)

1 0

Francisco Casas : vkd3d-shader/d3dbc: Pass hlsl_block instead of function declaration.
by Alexandre Julliard April 24, 2024

April 24, 2024

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

Rémi Bernon : mfreadwrite/reader: Avoid leaking the stream transform service MFT.
by Alexandre Julliard April 24, 2024

April 24, 2024

Module: wine Branch: master Commit: 7bb1b147ce2c83156a468e323dc03a151c1b1ff1 URL: https://gitlab.winehq.org/wine/wine/-/commit/7bb1b147ce2c83156a468e323dc03a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 4 16:20:53 2024 +0200 mfreadwrite/reader: Avoid leaking the stream transform service MFT. --- dlls/mfreadwrite/reader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 96bb316ac85..ab8c3993570 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -223,6 +223,8 @@ static void media_stream_destroy(struct media_stream *stream) transform_entry_destroy(entry); } + if (stream->transform_service) + IMFTransform_Release(stream->transform_service); if (stream->stream) IMFMediaStream_Release(stream->stream); if (stream->current)

1 0

Rémi Bernon : mfreadwrite/tests: Do not accept MFVideoFormat_RGB32 in the test transform.
by Alexandre Julliard April 24, 2024

April 24, 2024

Module: wine Branch: master Commit: 7b47833b28ccc365efd677853fa96fcfc4e94697 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b47833b28ccc365efd677853fa96f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 3 13:09:25 2024 +0200 mfreadwrite/tests: Do not accept MFVideoFormat_RGB32 in the test transform. --- dlls/mfreadwrite/tests/mfplat.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index a2c46869250..00b79353090 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -2488,6 +2488,13 @@ static HRESULT WINAPI test_decoder_SetInputType(IMFTransform *iface, DWORD id, I static HRESULT WINAPI test_decoder_SetOutputType(IMFTransform *iface, DWORD id, IMFMediaType *type, DWORD flags) { struct test_decoder *decoder = test_decoder_from_IMFTransform(iface); + GUID subtype; + HRESULT hr; + + if (type && SUCCEEDED(hr = IMFMediaType_GetGUID(type, &MF_MT_SUBTYPE, &subtype)) + && IsEqualGUID(&subtype, &MFVideoFormat_RGB32)) + return MF_E_INVALIDMEDIATYPE; + if (flags & MFT_SET_TYPE_TEST_ONLY) return S_OK; if (decoder->output_type) @@ -2900,7 +2907,7 @@ static void test_source_reader_transforms_d3d(void) ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32), ATTR_RATIO(MF_MT_FRAME_SIZE, 96, 96), - ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1, .todo = TRUE), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), ATTR_UINT32(MF_MT_COMPRESSED, 0, .todo = TRUE), ATTR_UINT32(MF_MT_INTERLACE_MODE, 2, .todo = TRUE), {0}, @@ -3019,18 +3026,14 @@ static void test_source_reader_transforms_d3d(void) /* video processor transform is not D3D aware */ hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 1, NULL, &video_processor); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - /* FIXME: Wine skips the video processor as the test decoder accepts the output type directly */ - if (hr == S_OK) - { - ok(video_processor->lpVtbl != &test_decoder_vtbl, "got unexpected transform\n"); - hr = IMFTransform_GetAttributes(video_processor, &attributes); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = IMFAttributes_GetUINT32(attributes, &MF_SA_D3D_AWARE, &value); - ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); - IMFAttributes_Release(attributes); - IMFTransform_Release(video_processor); - } + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(video_processor->lpVtbl != &test_decoder_vtbl, "got unexpected transform\n"); + hr = IMFTransform_GetAttributes(video_processor, &attributes); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFAttributes_GetUINT32(attributes, &MF_SA_D3D_AWARE, &value); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#lx.\n", hr); + IMFAttributes_Release(attributes); + IMFTransform_Release(video_processor); hr = IMFSourceReaderEx_GetTransformForStream(reader_ex, 0, 0, NULL, &test_decoder); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Rémi Bernon : mfreadwrite/tests: Avoid using MFCreateMediaBufferFromMediaType.
by Alexandre Julliard April 24, 2024

April 24, 2024

Module: wine Branch: master Commit: c908181eefe542a85a062c439c57071a512c8a88 URL: https://gitlab.winehq.org/wine/wine/-/commit/c908181eefe542a85a062c439c5707… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 3 13:29:03 2024 +0200 mfreadwrite/tests: Avoid using MFCreateMediaBufferFromMediaType. It's not available on Win7. --- dlls/mfreadwrite/tests/mfplat.c | 54 ++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 00b79353090..69478bd58cb 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -2604,28 +2604,25 @@ static HRESULT WINAPI test_decoder_ProcessOutput(IMFTransform *iface, DWORD flag hr = MFCreateSample(&data->pSample); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - hr = MFCreateMediaBufferFromMediaType(decoder->output_type, 0, 0, 0, &buffer); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (hr != S_OK) - { - hr = MFCreateMemoryBuffer(96 * 96 * 4, &buffer); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - } + hr = MFCreateMemoryBuffer(96 * 96 * 4, &buffer); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFSample_AddBuffer(data->pSample, buffer); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaBuffer_Release(buffer); } + else + { + ok(!!data->pSample, "Missing sample\n"); - ok(!!data->pSample, "Missing sample\n"); - - hr = IMFSample_GetBufferByIndex(data->pSample, 0, &buffer); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine check_interface(buffer, &IID_IMF2DBuffer2, TRUE); - todo_wine check_interface(buffer, &IID_IMFGetService, TRUE); - check_interface(buffer, &IID_IMFDXGIBuffer, FALSE); - hr = MFGetService((IUnknown *)buffer, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&unknown); - todo_wine ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); - IMFMediaBuffer_Release(buffer); + hr = IMFSample_GetBufferByIndex(data->pSample, 0, &buffer); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine check_interface(buffer, &IID_IMF2DBuffer2, TRUE); + todo_wine check_interface(buffer, &IID_IMFGetService, TRUE); + check_interface(buffer, &IID_IMFDXGIBuffer, FALSE); + hr = MFGetService((IUnknown *)buffer, &MR_BUFFER_SERVICE, &IID_IDirect3DSurface9, (void **)&unknown); + todo_wine ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr); + IMFMediaBuffer_Release(buffer); + } if (decoder->next_output == MF_E_TRANSFORM_STREAM_CHANGE) { @@ -2817,6 +2814,16 @@ static void test_source_reader_transform_stream_change(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaSource_Release(source); + /* skip tests on Win7 which misses IMFSourceReaderEx */ + hr = IMFSourceReader_QueryInterface(reader, &IID_IMFSourceReaderEx, (void **)&reader_ex); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Win7 */, "Unexpected hr %#lx.\n", hr); + if (broken(hr == E_NOINTERFACE)) + { + win_skip("missing IMFSourceReaderEx interface, skipping tests on Win7\n"); + goto skip_tests; + } + IMFSourceReaderEx_Release(reader_ex); + hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -2881,6 +2888,7 @@ static void test_source_reader_transform_stream_change(void) IMFTransform_Release(test_decoder); +skip_tests: IMFSourceReader_Release(reader); hr = MFTUnregisterLocal(&factory); @@ -2993,6 +3001,17 @@ static void test_source_reader_transforms_d3d(void) IMFAttributes_Release(attributes); IMFMediaSource_Release(source); + /* skip tests on Win7 which misses IMFSourceReaderEx */ + hr = IMFSourceReader_QueryInterface(reader, &IID_IMFSourceReaderEx, (void **)&reader_ex); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Win7 */, "Unexpected hr %#lx.\n", hr); + if (broken(hr == E_NOINTERFACE)) + { + win_skip("missing IMFSourceReaderEx interface, skipping tests on Win7\n"); + IMFSourceReader_Release(reader); + goto skip_tests; + } + IMFSourceReaderEx_Release(reader_ex); + hr = IMFSourceReader_SetStreamSelection(reader, 0, TRUE); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -3152,6 +3171,7 @@ static void test_source_reader_transforms_d3d(void) test_decoder_allocate_samples = FALSE; +skip_tests: hr = MFTUnregisterLocal(&factory); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Rémi Bernon : mfreadwrite/tests: Shutdown the test stream event queues on source shutdown.
by Alexandre Julliard April 24, 2024

April 24, 2024

Module: wine Branch: master Commit: 8514ddb2001b1fa2485ae1617b8b174cbb625b9e URL: https://gitlab.winehq.org/wine/wine/-/commit/8514ddb2001b1fa2485ae1617b8b17… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 4 18:04:18 2024 +0200 mfreadwrite/tests: Shutdown the test stream event queues on source shutdown. --- dlls/mfreadwrite/tests/mfplat.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 69478bd58cb..b70d0587072 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -554,9 +554,15 @@ static HRESULT WINAPI test_source_Shutdown(IMFMediaSource *iface) { struct test_source *source = impl_from_IMFMediaSource(iface); HRESULT hr; + UINT i; hr = IMFMediaEventQueue_Shutdown(source->event_queue); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + for (i = 0; i < source->stream_count; ++i) + { + hr = IMFMediaEventQueue_Shutdown(source->streams[i]->event_queue); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + } return S_OK; }

1 0

Alexandros Frantzis : winewayland.drv: Enable wglDescribePixelFormat through p_get_pixel_formats.
by Alexandre Julliard April 24, 2024

April 24, 2024

Module: wine Branch: master Commit: 5571422344ad2b5bc1e05369c664951698e9608d URL: https://gitlab.winehq.org/wine/wine/-/commit/5571422344ad2b5bc1e05369c66495… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu Mar 21 15:00:08 2024 +0200 winewayland.drv: Enable wglDescribePixelFormat through p_get_pixel_formats. --- dlls/winewayland.drv/opengl.c | 121 ++++++++++++++++++++++-------------------- 1 file changed, 63 insertions(+), 58 deletions(-) diff --git a/dlls/winewayland.drv/opengl.c b/dlls/winewayland.drv/opengl.c index f072b8063a1..3cb8b1e8a0d 100644 --- a/dlls/winewayland.drv/opengl.c +++ b/dlls/winewayland.drv/opengl.c @@ -544,63 +544,6 @@ static BOOL wayland_wglDeleteContext(struct wgl_context *ctx) return TRUE; } -static BOOL has_opengl(void); - -static int wayland_wglDescribePixelFormat(HDC hdc, int fmt, UINT size, - PIXELFORMATDESCRIPTOR *pfd) -{ - EGLint val; - EGLConfig config; - - if (!has_opengl()) return 0; - if (!pfd) return num_egl_configs; - if (size < sizeof(*pfd)) return 0; - if (fmt <= 0 || fmt > num_egl_configs) return 0; - - config = egl_configs[fmt - 1]; - - memset(pfd, 0, sizeof(*pfd)); - pfd->nSize = sizeof(*pfd); - pfd->nVersion = 1; - pfd->dwFlags = PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW | PFD_DOUBLEBUFFER | - PFD_SUPPORT_COMPOSITION; - pfd->iPixelType = PFD_TYPE_RGBA; - pfd->iLayerType = PFD_MAIN_PLANE; - - /* Although the documentation describes cColorBits as excluding alpha, real - * drivers tend to return the full pixel size, so do the same. */ - p_eglGetConfigAttrib(egl_display, config, EGL_BUFFER_SIZE, &val); - pfd->cColorBits = val; - p_eglGetConfigAttrib(egl_display, config, EGL_RED_SIZE, &val); - pfd->cRedBits = val; - p_eglGetConfigAttrib(egl_display, config, EGL_GREEN_SIZE, &val); - pfd->cGreenBits = val; - p_eglGetConfigAttrib(egl_display, config, EGL_BLUE_SIZE, &val); - pfd->cBlueBits = val; - p_eglGetConfigAttrib(egl_display, config, EGL_ALPHA_SIZE, &val); - pfd->cAlphaBits = val; - p_eglGetConfigAttrib(egl_display, config, EGL_DEPTH_SIZE, &val); - pfd->cDepthBits = val; - p_eglGetConfigAttrib(egl_display, config, EGL_STENCIL_SIZE, &val); - pfd->cStencilBits = val; - - /* Although we don't get information from EGL about the component shifts - * or the native format, the 0xARGB order is the most common. */ - pfd->cBlueShift = 0; - pfd->cGreenShift = pfd->cBlueBits; - pfd->cRedShift = pfd->cGreenBits + pfd->cBlueBits; - if (pfd->cAlphaBits) - pfd->cAlphaShift = pfd->cRedBits + pfd->cGreenBits + pfd->cBlueBits; - else - pfd->cAlphaShift = 0; - - TRACE("fmt %u color %u %u/%u/%u/%u depth %u stencil %u\n", - fmt, pfd->cColorBits, pfd->cRedBits, pfd->cGreenBits, pfd->cBlueBits, - pfd->cAlphaBits, pfd->cDepthBits, pfd->cStencilBits); - - return num_egl_configs; -} - static const char *wayland_wglGetExtensionsStringARB(HDC hdc) { TRACE("() returning \"%s\"\n", wgl_extensions); @@ -762,6 +705,68 @@ static BOOL wayland_wglSwapIntervalEXT(int interval) return ret; } +static void describe_pixel_format(EGLConfig config, struct wgl_pixel_format *fmt) +{ + EGLint value; + PIXELFORMATDESCRIPTOR *pfd = &fmt->pfd; + + memset(pfd, 0, sizeof(*pfd)); + pfd->nSize = sizeof(*pfd); + pfd->nVersion = 1; + pfd->dwFlags = PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW | PFD_DOUBLEBUFFER | + PFD_SUPPORT_COMPOSITION; + pfd->iPixelType = PFD_TYPE_RGBA; + pfd->iLayerType = PFD_MAIN_PLANE; + +#define SET_ATTRIB(field, attrib) \ + value = 0; \ + p_eglGetConfigAttrib(egl_display, config, attrib, &value); \ + pfd->field = value; + + /* Although the documentation describes cColorBits as excluding alpha, real + * drivers tend to return the full pixel size, so do the same. */ + SET_ATTRIB(cColorBits, EGL_BUFFER_SIZE); + SET_ATTRIB(cRedBits, EGL_RED_SIZE); + SET_ATTRIB(cGreenBits, EGL_GREEN_SIZE); + SET_ATTRIB(cBlueBits, EGL_BLUE_SIZE); + SET_ATTRIB(cAlphaBits, EGL_ALPHA_SIZE); + /* Although we don't get information from EGL about the component shifts + * or the native format, the 0xARGB order is the most common. */ + pfd->cBlueShift = 0; + pfd->cGreenShift = pfd->cBlueBits; + pfd->cRedShift = pfd->cGreenBits + pfd->cBlueBits; + if (pfd->cAlphaBits) + pfd->cAlphaShift = pfd->cRedBits + pfd->cGreenBits + pfd->cBlueBits; + else + pfd->cAlphaShift = 0; + + SET_ATTRIB(cDepthBits, EGL_DEPTH_SIZE); + SET_ATTRIB(cStencilBits, EGL_STENCIL_SIZE); + +#undef SET_ATTRIB +} + +static BOOL has_opengl(void); + +static void wayland_get_pixel_formats(struct wgl_pixel_format *formats, + UINT max_formats, UINT *num_formats, + UINT *num_onscreen_formats) +{ + UINT i; + + if (!has_opengl()) + { + *num_formats = *num_onscreen_formats = 0; + return; + } + if (formats) + { + for (i = 0; i < min(max_formats, num_egl_configs); ++i) + describe_pixel_format(egl_configs[i], &formats[i]); + } + *num_formats = *num_onscreen_formats = num_egl_configs; +} + static BOOL has_extension(const char *list, const char *ext) { size_t len = strlen(ext); @@ -980,12 +985,12 @@ static struct opengl_funcs opengl_funcs = .p_wglCopyContext = wayland_wglCopyContext, .p_wglCreateContext = wayland_wglCreateContext, .p_wglDeleteContext = wayland_wglDeleteContext, - .p_wglDescribePixelFormat = wayland_wglDescribePixelFormat, .p_wglGetProcAddress = wayland_wglGetProcAddress, .p_wglMakeCurrent = wayland_wglMakeCurrent, .p_wglSetPixelFormat = wayland_wglSetPixelFormat, .p_wglShareLists = wayland_wglShareLists, .p_wglSwapBuffers = wayland_wglSwapBuffers, + .p_get_pixel_formats = wayland_get_pixel_formats, } };

1 0