wine-commits July 2024

wine-commits@winehq.org

2 participants
519 discussions

Elizabeth Figura : vkd3d-shader: Allow controlling alpha test through vkd3d-shader parameters.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: vkd3d Branch: master Commit: 806363b76546639079bcadc8b2083cec36c16c57 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/806363b76546639079bcadc8b2083… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Jun 10 19:25:18 2024 -0500 vkd3d-shader: Allow controlling alpha test through vkd3d-shader parameters. --- include/vkd3d_shader.h | 47 +++++++ libs/vkd3d-shader/ir.c | 212 +++++++++++++++++++++++++++++++ libs/vkd3d-shader/spirv.c | 39 ++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 4 files changed, 287 insertions(+), 12 deletions(-)

1 0

Elizabeth Figura : vkd3d-shader/spirv: Respect VKD3D_SHADER_CONDITIONAL_OP_Z when discard has a bool argument.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: vkd3d Branch: master Commit: c2ce15b62366967da7b4e139930a415dd8896e36 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c2ce15b62366967da7b4e139930a4… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Thu Jun 13 12:23:50 2024 -0500 vkd3d-shader/spirv: Respect VKD3D_SHADER_CONDITIONAL_OP_Z when discard has a bool argument. --- libs/vkd3d-shader/spirv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 92130ff3..215a64a9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -8152,6 +8152,8 @@ static void spirv_compiler_emit_discard(struct spirv_compiler *compiler, if (src->reg.data_type != VKD3D_DATA_BOOL) condition_id = spirv_compiler_emit_int_to_bool(compiler, instruction->flags, src->reg.data_type, 1, condition_id); + else if (instruction->flags & VKD3D_SHADER_CONDITIONAL_OP_Z) + condition_id = vkd3d_spirv_build_op_logical_not(builder, vkd3d_spirv_get_op_type_bool(builder), condition_id); void_id = vkd3d_spirv_get_op_type_void(builder); vkd3d_spirv_build_op_function_call(builder, void_id, spirv_compiler_get_discard_function_id(compiler), &condition_id, 1);

1 0

Elizabeth Figura : tests: Add a test for the vkd3d_shader_parameter APIs.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: vkd3d Branch: master Commit: 9e59e57cb33fe523c4f5015f7885d80cd1e12ef7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9e59e57cb33fe523c4f5015f7885d… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Jun 10 17:07:21 2024 -0500 tests: Add a test for the vkd3d_shader_parameter APIs. --- Makefile.am | 3 +- tests/vkd3d_shader_api.c | 417 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 419 insertions(+), 1 deletion(-)

1 0

Elizabeth Figura : vkd3d-shader/spirv: Support passing shader parameters through uniform buffers.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: vkd3d Branch: master Commit: e8bdac814730fbcda582873ef3a1072fb59987c8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e8bdac814730fbcda582873ef3a10… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Jun 10 12:36:58 2024 -0500 vkd3d-shader/spirv: Support passing shader parameters through uniform buffers. --- include/vkd3d_shader.h | 29 ++++++++++++++++++++++++++++ libs/vkd3d-shader/spirv.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index d37b0f18..ceee4b86 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -472,6 +472,13 @@ enum vkd3d_shader_parameter_type * constant. This value is only supported for the SPIR-V target type. */ VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT, + /** + * The parameter value is provided to the shader as part of a uniform + * buffer. + * + * \since 1.13 + */ + VKD3D_SHADER_PARAMETER_TYPE_BUFFER, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_PARAMETER_TYPE), }; @@ -536,6 +543,23 @@ struct vkd3d_shader_parameter_specialization_constant uint32_t id; }; +/** + * The linkage of a parameter specified through a uniform buffer, used in + * struct vkd3d_shader_parameter1. + */ +struct vkd3d_shader_parameter_buffer +{ + /** + * The set of the uniform buffer descriptor. If the target environment does + * not support descriptor sets, this value must be set to 0. + */ + unsigned int set; + /** The binding index of the uniform buffer descriptor. */ + unsigned int binding; + /** The byte offset of the parameter within the buffer. */ + uint32_t offset; +}; + /** * An individual shader parameter. * @@ -600,6 +624,11 @@ struct vkd3d_shader_parameter1 * VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT. */ struct vkd3d_shader_parameter_specialization_constant specialization_constant; + /** + * Additional information if \a type is + * VKD3D_SHADER_PARAMETER_TYPE_BUFFER. + */ + struct vkd3d_shader_parameter_buffer buffer; void *_pointer_pad; uint32_t _pad[4]; } u; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d5a3bafd..92130ff3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2421,6 +2421,11 @@ struct spirv_compiler const struct vkd3d_shader_parameter1 *parameters; unsigned int parameter_count; + struct + { + uint32_t buffer_id; + } *spirv_parameter_info; + bool prolog_emitted; struct shader_signature input_signature; struct shader_signature output_signature; @@ -3394,6 +3399,21 @@ static uint32_t spirv_compiler_get_spec_constant(struct spirv_compiler *compiler return spirv_compiler_emit_spec_constant(compiler, name, spec_id); } +static uint32_t spirv_compiler_get_buffer_parameter(struct spirv_compiler *compiler, + const struct vkd3d_shader_parameter1 *parameter) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + unsigned int index = parameter - compiler->parameters; + uint32_t type_id, ptr_id, ptr_type_id; + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, 1); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassUniform, type_id); + ptr_id = vkd3d_spirv_build_op_access_chain1(builder, ptr_type_id, + compiler->spirv_parameter_info[index].buffer_id, + spirv_compiler_get_constant_uint(compiler, 0)); + return vkd3d_spirv_build_op_load(builder, type_id, ptr_id, SpvMemoryAccessMaskNone); +} + static uint32_t spirv_compiler_emit_uint_shader_parameter(struct spirv_compiler *compiler, enum vkd3d_shader_parameter_name name) { @@ -3409,6 +3429,8 @@ static uint32_t spirv_compiler_emit_uint_shader_parameter(struct spirv_compiler return spirv_compiler_get_constant_uint(compiler, parameter->u.immediate_constant.u.u32); if (parameter->type == VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT) return spirv_compiler_get_spec_constant(compiler, name, parameter->u.specialization_constant.id); + if (parameter->type == VKD3D_SHADER_PARAMETER_TYPE_BUFFER) + return spirv_compiler_get_buffer_parameter(compiler, parameter); FIXME("Unhandled parameter type %#x.\n", parameter->type); @@ -10573,6 +10595,32 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, struct compiler->parameter_count = program->parameter_count; compiler->parameters = program->parameters; + compiler->spirv_parameter_info = vkd3d_calloc(compiler->parameter_count, sizeof(*compiler->spirv_parameter_info)); + for (i = 0; i < compiler->parameter_count; ++i) + { + const struct vkd3d_shader_parameter1 *parameter = &compiler->parameters[i]; + + if (parameter->type == VKD3D_SHADER_PARAMETER_TYPE_BUFFER) + { + uint32_t type_id, struct_id, ptr_type_id, var_id; + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_UINT, 1); + + struct_id = vkd3d_spirv_build_op_type_struct(builder, &type_id, 1); + vkd3d_spirv_build_op_decorate(builder, struct_id, SpvDecorationBlock, NULL, 0); + vkd3d_spirv_build_op_member_decorate1(builder, struct_id, 0, + SpvDecorationOffset, parameter->u.buffer.offset); + + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassUniform, struct_id); + var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, + ptr_type_id, SpvStorageClassUniform, 0); + + vkd3d_spirv_build_op_decorate1(builder, var_id, SpvDecorationDescriptorSet, parameter->u.buffer.set); + vkd3d_spirv_build_op_decorate1(builder, var_id, SpvDecorationBinding, parameter->u.buffer.binding); + + compiler->spirv_parameter_info[i].buffer_id = var_id; + } + } if (program->block_count && !spirv_compiler_init_blocks(compiler, program->block_count)) return VKD3D_ERROR_OUT_OF_MEMORY;

1 0

Elizabeth Figura : include: Document shader parameters.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: vkd3d Branch: master Commit: 3dff608bf857c8029ae7a2a7f4c58734ab7e8039 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3dff608bf857c8029ae7a2a7f4c58… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Jun 7 18:20:49 2024 -0500 include: Document shader parameters. --- include/vkd3d_shader.h | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index a754a3d0..d37b0f18 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -458,44 +458,96 @@ enum vkd3d_shader_binding_flag VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_BINDING_FLAG), }; +/** + * The manner in which a parameter value is provided to the shader, used in + * struct vkd3d_shader_parameter and struct vkd3d_shader_parameter1. + */ enum vkd3d_shader_parameter_type { VKD3D_SHADER_PARAMETER_TYPE_UNKNOWN, + /** The parameter value is embedded directly in the shader. */ VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT, + /** + * The parameter value is provided to the shader via a specialization + * constant. This value is only supported for the SPIR-V target type. + */ VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_PARAMETER_TYPE), }; +/** + * The format of data provided to the shader, used in + * struct vkd3d_shader_parameter and struct vkd3d_shader_parameter1. + */ enum vkd3d_shader_parameter_data_type { VKD3D_SHADER_PARAMETER_DATA_TYPE_UNKNOWN, + /** The parameter is provided as a 32-bit unsigned integer. */ VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_PARAMETER_DATA_TYPE), }; +/** + * Names a specific shader parameter, used in + * struct vkd3d_shader_parameter and struct vkd3d_shader_parameter1. + */ enum vkd3d_shader_parameter_name { VKD3D_SHADER_PARAMETER_NAME_UNKNOWN, + /** + * The sample count of the framebuffer, as returned by the HLSL function + * GetRenderTargetSampleCount() or the GLSL builtin gl_NumSamples. + * + * This parameter should be specified when compiling to SPIR-V, which + * provides no builtin ability to query this information from the shader. + * + * The default value is 1. + */ VKD3D_SHADER_PARAMETER_NAME_RASTERIZER_SAMPLE_COUNT, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_PARAMETER_NAME), }; +/** + * The value of an immediate constant parameter, used in + * struct vkd3d_shader_parameter and struct vkd3d_shader_parameter1. + */ struct vkd3d_shader_parameter_immediate_constant { union { + /** + * The value if the parameter's data type is + * VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32. + */ uint32_t u32; } u; }; +/** + * The linkage of a specialization constant parameter, used in + * struct vkd3d_shader_parameter and struct vkd3d_shader_parameter1. + */ struct vkd3d_shader_parameter_specialization_constant { + /** The ID of the specialization constant. */ uint32_t id; }; +/** + * An individual shader parameter. + * + * This structure is an earlier version of struct vkd3d_shader_parameter1 + * which supports fewer parameter types; + * refer to that structure for usage information. + * + * Only the following types may be used with this structure: + * + * - VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT + * - VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT + */ struct vkd3d_shader_parameter { enum vkd3d_shader_parameter_name name; @@ -508,14 +560,45 @@ struct vkd3d_shader_parameter } u; }; +/** + * An individual shader parameter. + * + * This structure is used in struct vkd3d_shader_parameter_info; see there for + * explanation of shader parameters. + * + * For example, to specify the rasterizer sample count to the shader via an + * unsigned integer specialization constant with ID 3, + * set the following members: + * + * - \a name = VKD3D_SHADER_PARAMETER_NAME_RASTERIZER_SAMPLE_COUNT + * - \a type = VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT + * - \a data_type = VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32 + * - \a u.specialization_constant.id = 3 + * + * This structure is an extended version of struct vkd3d_shader_parameter. + */ struct vkd3d_shader_parameter1 { + /** The builtin parameter to be mapped. */ enum vkd3d_shader_parameter_name name; + /** How the parameter will be provided to the shader. */ enum vkd3d_shader_parameter_type type; + /** + * The data type of the supplied parameter, which determines how it is to + * be interpreted. + */ enum vkd3d_shader_parameter_data_type data_type; union { + /** + * Additional information if \a type is + * VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT. + */ struct vkd3d_shader_parameter_immediate_constant immediate_constant; + /** + * Additional information if \a type is + * VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT. + */ struct vkd3d_shader_parameter_specialization_constant specialization_constant; void *_pointer_pad; uint32_t _pad[4];

1 0

Elizabeth Figura : vkd3d-shader: Introduce struct vkd3d_shader_parameter_info and struct vkd3d_shader_parameter1.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: vkd3d Branch: master Commit: 98def3214bd373d086a19794c8150158583ed052 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/98def3214bd373d086a19794c8150… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Jun 7 17:32:56 2024 -0500 vkd3d-shader: Introduce struct vkd3d_shader_parameter_info and struct vkd3d_shader_parameter1. As the newly added documentation describes, this reroll serves two purposes: * to allow shader parameters to be used for any target type (which allows using parameters for things like Direct3D 8-9 alpha test), * to allow the union in struct vkd3d_shader_parameter to contain types larger than 32 bits (by specifying them indirectly through a pointer). --- include/vkd3d_shader.h | 58 +++++++++++++++++++++++++++ libs/vkd3d-shader/d3dbc.c | 2 +- libs/vkd3d-shader/dxil.c | 11 +++--- libs/vkd3d-shader/hlsl_codegen.c | 2 +- libs/vkd3d-shader/ir.c | 68 +++++++++++++++++++++++++++++++- libs/vkd3d-shader/spirv.c | 16 +++++--- libs/vkd3d-shader/tpf.c | 8 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 7 +++- 8 files changed, 153 insertions(+), 19 deletions(-)

1 0

Petrichor Park : vkd3d-shader/tpf: Implmenent HLSL_OP1_RCP.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: vkd3d Branch: master Commit: bec4f413dc8ddddd1dff4e8436abb39c0a5a7c91 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bec4f413dc8ddddd1dff4e8436abb… Author: Petrichor Park <ppark(a)codeweavers.com> Date: Mon Apr 22 12:24:16 2024 -0500 vkd3d-shader/tpf: Implmenent HLSL_OP1_RCP. SM5 comes with a RCP opcode; for SM4, implement it as `DIV dst, 1, x`. --- libs/vkd3d-shader/tpf.c | 38 ++++++++++++++++++++++++++++++++++++++ tests/hlsl/rcp.shader_test | 26 +++++++++++++------------- 2 files changed, 51 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index a7c37215..a3938d32 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -5189,6 +5189,44 @@ static void write_sm4_expr(const struct tpf_writer *tpf, const struct hlsl_ir_ex } break; + case HLSL_OP1_RCP: + switch (dst_type->e.numeric.type) + { + case HLSL_TYPE_FLOAT: + /* SM5 comes with a RCP opcode */ + if (tpf->ctx->profile->major_version >= 5) + { + write_sm4_unary_op(tpf, VKD3D_SM5_OP_RCP, &expr->node, arg1, 0); + } + else + { + /* For SM4, implement as DIV dst, 1.0, src */ + struct sm4_instruction instr; + struct hlsl_constant_value one; + + assert(type_is_float(dst_type)); + + memset(&instr, 0, sizeof(instr)); + instr.opcode = VKD3D_SM4_OP_DIV; + + sm4_dst_from_node(&instr.dsts[0], &expr->node); + instr.dst_count = 1; + + for (unsigned int i = 0; i < 4; i++) + one.u[i].f = 1.0f; + sm4_src_from_constant_value(&instr.srcs[0], &one, dst_type->dimx, instr.dsts[0].write_mask); + sm4_src_from_node(tpf, &instr.srcs[1], arg1, instr.dsts[0].write_mask); + instr.src_count = 2; + + write_sm4_instruction(tpf, &instr); + } + break; + + default: + hlsl_fixme(tpf->ctx, &expr->node.loc, "SM4 %s rcp expression.", dst_type_string->buffer); + } + break; + case HLSL_OP1_REINTERPRET: write_sm4_unary_op(tpf, VKD3D_SM4_OP_MOV, &expr->node, arg1, 0); break; diff --git a/tests/hlsl/rcp.shader_test b/tests/hlsl/rcp.shader_test index 65cf1a81..3fb1185f 100644 --- a/tests/hlsl/rcp.shader_test +++ b/tests/hlsl/rcp.shader_test @@ -1,4 +1,4 @@ -[pixel shader todo(sm>=4)] +[pixel shader] uniform float4 f; float4 main() : sv_target @@ -8,28 +8,28 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -todo(sm>=4 & sm<6) draw quad +todo(glsl) draw quad probe (0, 0) rgba (1.0, 0.5, 0.3333333, 0.25) 8 uniform 0 float4 -1.0 -2.0 -3.0 -4.0 -todo(sm>=4 & sm<6) draw quad +todo(glsl) draw quad probe (0, 0) rgba (-1.0, -0.5, -0.3333333, -0.25) 8 uniform 0 float4 12.34 56.78 -90.12 -34.56 -todo(sm>=4 & sm<6) draw quad +todo(glsl) draw quad probe (0, 0) rgba (0.081037275, 0.017611835, -0.011096316, -0.028935184) 8 uniform 0 float4 0.25 0.125 0.0625 0.3333333 -todo(sm>=4 & sm<6) draw quad +todo(glsl) draw quad probe (0, 0) rgba (4.0, 8.0, 16.0, 3.0) 8 % Degenerate cases uniform 0 float4 0.0 -0.0 1.0e39 -1.0e39 -todo(sm>=4 & sm<6) draw quad +todo(glsl) draw quad probe (0, 0) rgba (1.0e39, -1.0e39, 0.0, -0.0) 8 -[pixel shader todo(sm>=4)] +[pixel shader] % Check invertibility uniform float4 f; @@ -40,19 +40,19 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -todo(sm>=4 & sm<6) draw quad +todo(glsl) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) 8 uniform 0 float4 7.604 3.1415 2.72 9.876 -todo(sm>=4 & sm<6) draw quad +todo(glsl) draw quad probe (0, 0) rgba (7.604, 3.1415, 2.72, 9.876) 8 uniform 0 float4 0.0 -0.0 1.0e39 -1.0e39 -todo(sm>=4 & sm<6) draw quad +todo(glsl) draw quad probe (0, 0) rgba (0.0, -0.0, 1.0e39, -1.0e39) -[pixel shader todo(sm>=4)] +[pixel shader] % Make sure swizzling works uniform float4 f; @@ -68,9 +68,9 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -todo(sm>=4 & sm<6) draw quad +todo(glsl) draw quad probe (0, 0) rgba (1.0, 0.5, 0.3333333, 0.25) 8 uniform 0 float4 -1.0 -2.0 -3.0 -4.0 -todo(sm>=4 & sm<6) draw quad +todo(glsl) draw quad probe (0, 0) rgba (-1.0, -0.5, -0.3333333, -0.25) 8

1 0

Petrichor Park : vkd3d-shader/hlsl: Implement the rcp() intrinisic.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: vkd3d Branch: master Commit: b3f0cd5788fa13093f69228cf6955a0f9d733f74 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b3f0cd5788fa13093f69228cf6955… Author: Petrichor Park <ppark(a)codeweavers.com> Date: Mon Apr 29 12:46:15 2024 -0500 vkd3d-shader/hlsl: Implement the rcp() intrinisic. SM1 already has the RCP opcode implemented; SM4 implementation is in the next commit. --- libs/vkd3d-shader/hlsl.y | 12 ++++++++++++ tests/hlsl/rcp.shader_test | 26 +++++++++++++------------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 7b058a65..56736a65 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4065,6 +4065,17 @@ static bool intrinsic_radians(struct hlsl_ctx *ctx, return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, arg, rad, loc); } +static bool intrinsic_rcp(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_RCP, arg, loc); +} + static bool intrinsic_reflect(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -4760,6 +4771,7 @@ intrinsic_functions[] = {"normalize", 1, true, intrinsic_normalize}, {"pow", 2, true, intrinsic_pow}, {"radians", 1, true, intrinsic_radians}, + {"rcp", 1, true, intrinsic_rcp}, {"reflect", 2, true, intrinsic_reflect}, {"refract", 3, true, intrinsic_refract}, {"round", 1, true, intrinsic_round}, diff --git a/tests/hlsl/rcp.shader_test b/tests/hlsl/rcp.shader_test index dcfeb924..65cf1a81 100644 --- a/tests/hlsl/rcp.shader_test +++ b/tests/hlsl/rcp.shader_test @@ -1,4 +1,4 @@ -[pixel shader todo] +[pixel shader todo(sm>=4)] uniform float4 f; float4 main() : sv_target @@ -8,28 +8,28 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -todo(sm<6) draw quad +todo(sm>=4 & sm<6) draw quad probe (0, 0) rgba (1.0, 0.5, 0.3333333, 0.25) 8 uniform 0 float4 -1.0 -2.0 -3.0 -4.0 -todo(sm<6) draw quad +todo(sm>=4 & sm<6) draw quad probe (0, 0) rgba (-1.0, -0.5, -0.3333333, -0.25) 8 uniform 0 float4 12.34 56.78 -90.12 -34.56 -todo(sm<6) draw quad +todo(sm>=4 & sm<6) draw quad probe (0, 0) rgba (0.081037275, 0.017611835, -0.011096316, -0.028935184) 8 uniform 0 float4 0.25 0.125 0.0625 0.3333333 -todo(sm<6) draw quad +todo(sm>=4 & sm<6) draw quad probe (0, 0) rgba (4.0, 8.0, 16.0, 3.0) 8 % Degenerate cases uniform 0 float4 0.0 -0.0 1.0e39 -1.0e39 -todo(sm<6) draw quad +todo(sm>=4 & sm<6) draw quad probe (0, 0) rgba (1.0e39, -1.0e39, 0.0, -0.0) 8 -[pixel shader todo] +[pixel shader todo(sm>=4)] % Check invertibility uniform float4 f; @@ -40,19 +40,19 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -todo(sm<6) draw quad +todo(sm>=4 & sm<6) draw quad probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) 8 uniform 0 float4 7.604 3.1415 2.72 9.876 -todo(sm<6) draw quad +todo(sm>=4 & sm<6) draw quad probe (0, 0) rgba (7.604, 3.1415, 2.72, 9.876) 8 uniform 0 float4 0.0 -0.0 1.0e39 -1.0e39 -todo(sm<6) draw quad +todo(sm>=4 & sm<6) draw quad probe (0, 0) rgba (0.0, -0.0, 1.0e39, -1.0e39) -[pixel shader todo] +[pixel shader todo(sm>=4)] % Make sure swizzling works uniform float4 f; @@ -68,9 +68,9 @@ float4 main() : sv_target [test] uniform 0 float4 1.0 2.0 3.0 4.0 -todo(sm<6) draw quad +todo(sm>=4 & sm<6) draw quad probe (0, 0) rgba (1.0, 0.5, 0.3333333, 0.25) 8 uniform 0 float4 -1.0 -2.0 -3.0 -4.0 -todo(sm<6) draw quad +todo(sm>=4 & sm<6) draw quad probe (0, 0) rgba (-1.0, -0.5, -0.3333333, -0.25) 8

1 0

Petrichor Park : vkd3d-shader/hlsl: Implement tests for the rcp() intrinsic.
by Alexandre Julliard 11 Jul '24

11 Jul '24

Module: vkd3d Branch: master Commit: 3a498520754a6dc5ad30ab021e88f10a6126cadd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3a498520754a6dc5ad30ab021e88f… Author: Petrichor Park <ppark(a)codeweavers.com> Date: Mon Apr 29 12:45:52 2024 -0500 vkd3d-shader/hlsl: Implement tests for the rcp() intrinsic. --- Makefile.am | 1 + tests/hlsl/rcp.shader_test | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/Makefile.am b/Makefile.am index 2b655fa4..1d736d25 100644 --- a/Makefile.am +++ b/Makefile.am @@ -176,6 +176,7 @@ vkd3d_shader_tests = \ tests/hlsl/pow.shader_test \ tests/hlsl/precise-modifier.shader_test \ tests/hlsl/rasteriser-ordered-views.shader_test \ + tests/hlsl/rcp.shader_test \ tests/hlsl/reflect.shader_test \ tests/hlsl/refract.shader_test \ tests/hlsl/register-reservations-numeric.shader_test \ diff --git a/tests/hlsl/rcp.shader_test b/tests/hlsl/rcp.shader_test new file mode 100644 index 00000000..dcfeb924 --- /dev/null +++ b/tests/hlsl/rcp.shader_test @@ -0,0 +1,76 @@ +[pixel shader todo] +uniform float4 f; + +float4 main() : sv_target +{ + return rcp(f); +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +todo(sm<6) draw quad +probe (0, 0) rgba (1.0, 0.5, 0.3333333, 0.25) 8 + +uniform 0 float4 -1.0 -2.0 -3.0 -4.0 +todo(sm<6) draw quad +probe (0, 0) rgba (-1.0, -0.5, -0.3333333, -0.25) 8 + +uniform 0 float4 12.34 56.78 -90.12 -34.56 +todo(sm<6) draw quad +probe (0, 0) rgba (0.081037275, 0.017611835, -0.011096316, -0.028935184) 8 + +uniform 0 float4 0.25 0.125 0.0625 0.3333333 +todo(sm<6) draw quad +probe (0, 0) rgba (4.0, 8.0, 16.0, 3.0) 8 + +% Degenerate cases +uniform 0 float4 0.0 -0.0 1.0e39 -1.0e39 +todo(sm<6) draw quad +probe (0, 0) rgba (1.0e39, -1.0e39, 0.0, -0.0) 8 + + +[pixel shader todo] +% Check invertibility +uniform float4 f; + +float4 main() : sv_target +{ + return rcp(rcp(f)); +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +todo(sm<6) draw quad +probe (0, 0) rgba (1.0, 2.0, 3.0, 4.0) 8 + +uniform 0 float4 7.604 3.1415 2.72 9.876 +todo(sm<6) draw quad +probe (0, 0) rgba (7.604, 3.1415, 2.72, 9.876) 8 + +uniform 0 float4 0.0 -0.0 1.0e39 -1.0e39 +todo(sm<6) draw quad +probe (0, 0) rgba (0.0, -0.0, 1.0e39, -1.0e39) + + +[pixel shader todo] +% Make sure swizzling works +uniform float4 f; + +float4 main() : sv_target +{ + float a = rcp(f.x); + float2 b = rcp(f.zy); + float3 c = rcp(f.wxz); + float4 d = rcp(f.zyxw); + + return float4(a, b.y, c.z, d.w); +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +todo(sm<6) draw quad +probe (0, 0) rgba (1.0, 0.5, 0.3333333, 0.25) 8 + +uniform 0 float4 -1.0 -2.0 -3.0 -4.0 +todo(sm<6) draw quad +probe (0, 0) rgba (-1.0, -0.5, -0.3333333, -0.25) 8

1 0

Nikolay Sivov : vkd3d-shader/fx: Do not output empty strings for missing semantics for fx_2_0.
by Alexandre Julliard 10 Jul '24

10 Jul '24

Module: vkd3d Branch: master Commit: c792114a6a58c7c97abf827d154d7ecd22d81536 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c792114a6a58c7c97abf827d154d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 10 19:24:48 2024 +0200 vkd3d-shader/fx: Do not output empty strings for missing semantics for fx_2_0. This is directly visible in parameter description. For a parameter without semantic it should return null, instead of a pointer to an empty string. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 0857ebb6..bd2ad129 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -830,7 +830,7 @@ static uint32_t write_fx_2_parameter(const struct hlsl_type *type, const char *n } name_offset = write_string(name, fx); - semantic_offset = write_string(semantic->raw_name, fx); + semantic_offset = semantic->raw_name ? write_string(semantic->raw_name, fx) : 0; offset = put_u32(buffer, hlsl_sm1_base_type(type)); put_u32(buffer, hlsl_sm1_class(type));

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2024