wine-commits January 2024

wine-commits@winehq.org

1 participants
711 discussions

Henri Verbeet : vkd3d-shader/ir: Store the temporary register count in struct vsir_program.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: vkd3d Branch: master Commit: adc02eada8ed8ab539a044a53c6300c2061e2980 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/adc02eada8ed8ab539a044a53c630… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 21:28:23 2024 +0100 vkd3d-shader/ir: Store the temporary register count in struct vsir_program. --- libs/vkd3d-shader/d3dbc.c | 4 ++-- libs/vkd3d-shader/ir.c | 19 ++++++++++--------- libs/vkd3d-shader/spirv.c | 4 ++-- libs/vkd3d-shader/tpf.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 8896a36e..035095d5 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -765,13 +765,13 @@ static void record_constant_register(struct vkd3d_shader_sm1_parser *sm1, static void shader_sm1_scan_register(struct vkd3d_shader_sm1_parser *sm1, const struct vkd3d_shader_register *reg, unsigned int mask, bool from_def) { - struct vkd3d_shader_desc *desc = &sm1->p.shader_desc; + struct vsir_program *program = &sm1->p.program; uint32_t register_index = reg->idx[0].offset; switch (reg->type) { case VKD3DSPR_TEMP: - desc->temp_count = max(desc->temp_count, register_index + 1); + program->temp_count = max(program->temp_count, register_index + 1); break; case VKD3DSPR_CONST: diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index aac10a0d..a797e493 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -2369,7 +2369,7 @@ static void vsir_validate_register(struct validation_context *ctx, /* SM1-3 shaders do not include a DCL_TEMPS instruction. */ if (ctx->program->shader_version.major <= 3) - temp_count = ctx->parser->shader_desc.temp_count; + temp_count = ctx->program->temp_count; if (reg->type >= VKD3DSPR_COUNT) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE, "Invalid register type %#x.", @@ -2421,10 +2421,10 @@ static void vsir_validate_register(struct validation_context *ctx, break; } - /* parser->shader_desc.temp_count might be smaller then - * temp_count if the parser made a mistake; we still don't - * want to overflow the array. */ - if (reg->idx[0].offset >= ctx->parser->shader_desc.temp_count) + /* program->temp_count might be smaller then temp_count if the + * parser made a mistake; we still don't want to overflow the + * array. */ + if (reg->idx[0].offset >= ctx->program->temp_count) break; data = &ctx->temps[reg->idx[0].offset]; @@ -2788,9 +2788,10 @@ static void vsir_validate_instruction(struct validation_context *ctx) vsir_validate_src_count(ctx, instruction, 0); if (ctx->dcl_temps_found) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_DUPLICATE_DCL_TEMPS, "Duplicate DCL_TEMPS instruction."); - if (instruction->declaration.count > ctx->parser->shader_desc.temp_count) - validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DCL_TEMPS, "Invalid DCL_TEMPS count %u, expected at most %u.", - instruction->declaration.count, ctx->parser->shader_desc.temp_count); + if (instruction->declaration.count > ctx->program->temp_count) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DCL_TEMPS, + "Invalid DCL_TEMPS count %u, expected at most %u.", + instruction->declaration.count, ctx->program->temp_count); ctx->dcl_temps_found = true; ctx->temp_count = instruction->declaration.count; break; @@ -3005,7 +3006,7 @@ enum vkd3d_result vsir_validate(struct vkd3d_shader_parser *parser) if (!(parser->config_flags & VKD3D_SHADER_CONFIG_FLAG_FORCE_VALIDATION)) return VKD3D_OK; - if (!(ctx.temps = vkd3d_calloc(parser->shader_desc.temp_count, sizeof(*ctx.temps)))) + if (!(ctx.temps = vkd3d_calloc(ctx.program->temp_count, sizeof(*ctx.temps)))) goto fail; if (!(ctx.ssas = vkd3d_calloc(ctx.program->ssa_count, sizeof(*ctx.ssas)))) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 56f999ed..ef0bfeab 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9687,8 +9687,8 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, if ((result = vkd3d_shader_normalise(parser, compile_info)) < 0) return result; - if (parser->shader_desc.temp_count) - spirv_compiler_emit_temps(compiler, parser->shader_desc.temp_count); + if (program->temp_count) + spirv_compiler_emit_temps(compiler, program->temp_count); if (program->ssa_count) spirv_compiler_allocate_ssa_register_ids(compiler, program->ssa_count); diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 729e2cfe..ecd78484 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -1072,7 +1072,7 @@ static void shader_sm4_read_declaration_count(struct vkd3d_shader_instruction *i { ins->declaration.count = *tokens; if (opcode == VKD3D_SM4_OP_DCL_TEMPS) - priv->p.shader_desc.temp_count = max(priv->p.shader_desc.temp_count, *tokens); + priv->p.program.temp_count = max(priv->p.program.temp_count, *tokens); } static void shader_sm4_read_declaration_dst(struct vkd3d_shader_instruction *ins, uint32_t opcode, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 17bded3c..887c47fc 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1022,7 +1022,6 @@ struct vkd3d_shader_desc unsigned int input_control_point_count, output_control_point_count; - uint32_t temp_count; unsigned int block_count; struct @@ -1272,6 +1271,7 @@ struct vsir_program struct vkd3d_shader_version shader_version; struct vkd3d_shader_instruction_array instructions; + unsigned int temp_count; unsigned int ssa_count; bool use_vocp; };

1 0

Henri Verbeet : vkd3d-shader/ir: Store the SSA register count in struct vsir_program.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: vkd3d Branch: master Commit: 94ca46916aea9f4407d58bf6d6e5574adeb7c855 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/94ca46916aea9f4407d58bf6d6e55… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 21:14:41 2024 +0100 vkd3d-shader/ir: Store the SSA register count in struct vsir_program. --- libs/vkd3d-shader/dxil.c | 2 +- libs/vkd3d-shader/ir.c | 15 ++++++++------- libs/vkd3d-shader/spirv.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index f106e907..15cc380f 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -7170,7 +7170,7 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t return VKD3D_ERROR_OUT_OF_MEMORY; } - sm6->p.shader_desc.ssa_count = sm6->ssa_next_id; + sm6->p.program.ssa_count = sm6->ssa_next_id; if (!(fn = sm6_parser_get_function(sm6, sm6->entry_point))) { diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 48ac2a8e..aac10a0d 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -2465,10 +2465,11 @@ static void vsir_validate_register(struct validation_context *ctx, if (reg->idx[0].rel_addr) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, "Non-NULL relative address for a SSA register."); - if (reg->idx[0].offset >= ctx->parser->shader_desc.ssa_count) + if (reg->idx[0].offset >= ctx->program->ssa_count) { - validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, "SSA register index %u exceeds the maximum count %u.", - reg->idx[0].offset, ctx->parser->shader_desc.ssa_count); + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, + "SSA register index %u exceeds the maximum count %u.", + reg->idx[0].offset, ctx->program->ssa_count); break; } @@ -2600,7 +2601,7 @@ static void vsir_validate_dst_param(struct validation_context *ctx, dst->shift); } - if (dst->reg.type == VKD3DSPR_SSA && dst->reg.idx[0].offset < ctx->parser->shader_desc.ssa_count) + if (dst->reg.type == VKD3DSPR_SSA && dst->reg.idx[0].offset < ctx->program->ssa_count) { struct validation_context_ssa_data *data = &ctx->ssas[dst->reg.idx[0].offset]; @@ -2635,7 +2636,7 @@ static void vsir_validate_src_param(struct validation_context *ctx, validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_MODIFIERS, "Source has invalid modifiers %#x.", src->modifiers); - if (src->reg.type == VKD3DSPR_SSA && src->reg.idx[0].offset < ctx->parser->shader_desc.ssa_count) + if (src->reg.type == VKD3DSPR_SSA && src->reg.idx[0].offset < ctx->program->ssa_count) { struct validation_context_ssa_data *data = &ctx->ssas[src->reg.idx[0].offset]; unsigned int i; @@ -3007,7 +3008,7 @@ enum vkd3d_result vsir_validate(struct vkd3d_shader_parser *parser) if (!(ctx.temps = vkd3d_calloc(parser->shader_desc.temp_count, sizeof(*ctx.temps)))) goto fail; - if (!(ctx.ssas = vkd3d_calloc(parser->shader_desc.ssa_count, sizeof(*ctx.ssas)))) + if (!(ctx.ssas = vkd3d_calloc(ctx.program->ssa_count, sizeof(*ctx.ssas)))) goto fail; for (ctx.instruction_idx = 0; ctx.instruction_idx < parser->program.instructions.count; ++ctx.instruction_idx) @@ -3018,7 +3019,7 @@ enum vkd3d_result vsir_validate(struct vkd3d_shader_parser *parser) if (ctx.depth != 0) validator_error(&ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_CONTROL_FLOW, "%zu nested blocks were not closed.", ctx.depth); - for (i = 0; i < parser->shader_desc.ssa_count; ++i) + for (i = 0; i < ctx.program->ssa_count; ++i) { struct validation_context_ssa_data *data = &ctx.ssas[i]; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0e01df4c..56f999ed 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9689,8 +9689,8 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, if (parser->shader_desc.temp_count) spirv_compiler_emit_temps(compiler, parser->shader_desc.temp_count); - if (parser->shader_desc.ssa_count) - spirv_compiler_allocate_ssa_register_ids(compiler, parser->shader_desc.ssa_count); + if (program->ssa_count) + spirv_compiler_allocate_ssa_register_ids(compiler, program->ssa_count); spirv_compiler_emit_descriptor_declarations(compiler); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 8ffaf553..17bded3c 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1023,7 +1023,6 @@ struct vkd3d_shader_desc unsigned int input_control_point_count, output_control_point_count; uint32_t temp_count; - unsigned int ssa_count; unsigned int block_count; struct @@ -1273,6 +1272,7 @@ struct vsir_program struct vkd3d_shader_version shader_version; struct vkd3d_shader_instruction_array instructions; + unsigned int ssa_count; bool use_vocp; };

1 0

Henri Verbeet : vkd3d-shader/ir: Store the "use_vocp" field in struct vsir_program.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: vkd3d Branch: master Commit: 7b85cd6a313ad89c26bbe2dbd743e85817260b9f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7b85cd6a313ad89c26bbe2dbd743e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 20:39:55 2024 +0100 vkd3d-shader/ir: Store the "use_vocp" field in struct vsir_program. --- libs/vkd3d-shader/ir.c | 15 ++++++++------- libs/vkd3d-shader/spirv.c | 7 ++++--- libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++-- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 8be14291..48ac2a8e 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1241,20 +1241,21 @@ static void shader_instruction_normalise_io_params(struct vkd3d_shader_instructi static enum vkd3d_result shader_normalise_io_registers(struct vkd3d_shader_parser *parser) { struct io_normaliser normaliser = {parser->program.instructions}; + struct vsir_program *program = &parser->program; struct vkd3d_shader_instruction *ins; bool has_control_point_phase; unsigned int i, j; normaliser.phase = VKD3DSIH_INVALID; - normaliser.shader_type = parser->program.shader_version.type; - normaliser.major = parser->program.shader_version.major; + normaliser.shader_type = program->shader_version.type; + normaliser.major = program->shader_version.major; normaliser.input_signature = &parser->shader_desc.input_signature; normaliser.output_signature = &parser->shader_desc.output_signature; normaliser.patch_constant_signature = &parser->shader_desc.patch_constant_signature; - for (i = 0, has_control_point_phase = false; i < parser->program.instructions.count; ++i) + for (i = 0, has_control_point_phase = false; i < program->instructions.count; ++i) { - ins = &parser->program.instructions.elements[i]; + ins = &program->instructions.elements[i]; switch (ins->handler_idx) { @@ -1297,7 +1298,7 @@ static enum vkd3d_result shader_normalise_io_registers(struct vkd3d_shader_parse || !shader_signature_merge(&parser->shader_desc.output_signature, normaliser.output_range_map, false) || !shader_signature_merge(&parser->shader_desc.patch_constant_signature, normaliser.pc_range_map, true)) { - parser->program.instructions = normaliser.instructions; + program->instructions = normaliser.instructions; return VKD3D_ERROR_OUT_OF_MEMORY; } @@ -1305,8 +1306,8 @@ static enum vkd3d_result shader_normalise_io_registers(struct vkd3d_shader_parse for (i = 0; i < normaliser.instructions.count; ++i) shader_instruction_normalise_io_params(&normaliser.instructions.elements[i], &normaliser); - parser->program.instructions = normaliser.instructions; - parser->shader_desc.use_vocp = normaliser.use_vocp; + program->instructions = normaliser.instructions; + program->use_vocp = normaliser.use_vocp; return VKD3D_OK; } diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1128788b..0e01df4c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9680,6 +9680,7 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_shader_desc *shader_desc = &parser->shader_desc; struct vkd3d_shader_instruction_array instructions; + struct vsir_program *program = &parser->program; enum vkd3d_result result = VKD3D_OK; unsigned int i; @@ -9699,8 +9700,8 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, if (parser->shader_desc.block_count && !spirv_compiler_init_blocks(compiler, parser->shader_desc.block_count)) return VKD3D_ERROR_OUT_OF_MEMORY; - instructions = parser->program.instructions; - memset(&parser->program.instructions, 0, sizeof(parser->program.instructions)); + instructions = program->instructions; + memset(&program->instructions, 0, sizeof(program->instructions)); compiler->input_signature = shader_desc->input_signature; compiler->output_signature = shader_desc->output_signature; @@ -9708,7 +9709,7 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, memset(&shader_desc->input_signature, 0, sizeof(shader_desc->input_signature)); memset(&shader_desc->output_signature, 0, sizeof(shader_desc->output_signature)); memset(&shader_desc->patch_constant_signature, 0, sizeof(shader_desc->patch_constant_signature)); - compiler->use_vocp = parser->shader_desc.use_vocp; + compiler->use_vocp = program->use_vocp; compiler->block_names = parser->shader_desc.block_names; compiler->block_name_count = parser->shader_desc.block_name_count; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index f350e0bc..8ffaf553 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1031,8 +1031,6 @@ struct vkd3d_shader_desc uint32_t used, external; } flat_constant_count[3]; - bool use_vocp; - const char **block_names; size_t block_name_count; }; @@ -1274,6 +1272,8 @@ struct vsir_program { struct vkd3d_shader_version shader_version; struct vkd3d_shader_instruction_array instructions; + + bool use_vocp; }; bool vsir_program_init(struct vsir_program *program, const struct vkd3d_shader_version *version, unsigned int reserve);

1 0

Henri Verbeet : vkd3d-shader/ir: Store the shader version in struct vsir_program.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: vkd3d Branch: master Commit: 23dcd4f22b5048360a11c14ab793790cb9ca6111 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/23dcd4f22b5048360a11c14ab7937… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 16 16:40:30 2024 +0100 vkd3d-shader/ir: Store the shader version in struct vsir_program. --- libs/vkd3d-shader/d3d_asm.c | 14 ++++++------- libs/vkd3d-shader/d3dbc.c | 30 ++++++++++++++------------- libs/vkd3d-shader/dxil.c | 4 ++-- libs/vkd3d-shader/ir.c | 35 ++++++++++++++++++-------------- libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-shader/tpf.c | 9 ++++---- libs/vkd3d-shader/vkd3d_shader_main.c | 12 +++++------ libs/vkd3d-shader/vkd3d_shader_private.h | 11 +++++----- 8 files changed, 61 insertions(+), 56 deletions(-)

1 0

Henri Verbeet : vkd3d-shader/ir: Introduce struct vsir_program.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: vkd3d Branch: master Commit: fc9043be3cf229cafa77feb408a1723baada0174 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fc9043be3cf229cafa77feb408a17… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 16 14:47:34 2024 +0100 vkd3d-shader/ir: Introduce struct vsir_program. --- libs/vkd3d-shader/d3dbc.c | 4 +-- libs/vkd3d-shader/dxil.c | 20 +++++------ libs/vkd3d-shader/glsl.c | 6 ++-- libs/vkd3d-shader/ir.c | 62 ++++++++++++++++++-------------- libs/vkd3d-shader/spirv.c | 4 +-- libs/vkd3d-shader/tpf.c | 6 ++-- libs/vkd3d-shader/vkd3d_shader_main.c | 15 ++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 16 ++++++--- 8 files changed, 75 insertions(+), 58 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/dxil: Handle semantic kind ISFRONTFACE.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: vkd3d Branch: master Commit: 55c7cd5c22e06b735738f1dfe1c7bc7965c06c82 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/55c7cd5c22e06b735738f1dfe1c7b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Jan 20 00:35:52 2024 +1000 vkd3d-shader/dxil: Handle semantic kind ISFRONTFACE. --- libs/vkd3d-shader/dxil.c | 1 + tests/hlsl/is-front-face.shader_test | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 63771e14..e5818386 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -5791,6 +5791,7 @@ static const enum vkd3d_shader_sysval_semantic sysval_semantic_table[] = [SEMANTIC_KIND_ARBITRARY] = VKD3D_SHADER_SV_NONE, [SEMANTIC_KIND_VERTEXID] = VKD3D_SHADER_SV_VERTEX_ID, [SEMANTIC_KIND_POSITION] = VKD3D_SHADER_SV_POSITION, + [SEMANTIC_KIND_ISFRONTFACE] = VKD3D_SHADER_SV_IS_FRONT_FACE, [SEMANTIC_KIND_TARGET] = VKD3D_SHADER_SV_TARGET, }; diff --git a/tests/hlsl/is-front-face.shader_test b/tests/hlsl/is-front-face.shader_test index 162d4e63..11447d26 100644 --- a/tests/hlsl/is-front-face.shader_test +++ b/tests/hlsl/is-front-face.shader_test @@ -22,7 +22,7 @@ float4 main(bool face : sv_isfrontface) : sv_target } [test] -todo(sm>=6) draw triangle strip 4 +draw triangle strip 4 probe all rgba (0.0, 1.0, 0.0, 1.0) [vertex buffer 0] @@ -32,5 +32,5 @@ probe all rgba (0.0, 1.0, 0.0, 1.0) 2.0 2.0 [test] -todo(sm>=6) draw triangle strip 4 +draw triangle strip 4 probe all rgba (1.0, 2.0, 1.0, 2.0)

1 0

Conor McCarthy : vkd3d-shader/dxil: Handle semantic kind VERTEXID.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: vkd3d Branch: master Commit: 9f409b67d72dcf3cdc4c723e57283b79e770e0c0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9f409b67d72dcf3cdc4c723e57283… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Jan 20 00:34:42 2024 +1000 vkd3d-shader/dxil: Handle semantic kind VERTEXID. --- libs/vkd3d-shader/dxil.c | 1 + tests/hlsl/nointerpolation.shader_test | 26 +++++++++++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 29964575..63771e14 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -5789,6 +5789,7 @@ static enum vkd3d_shader_minimum_precision minimum_precision_from_dxil_component static const enum vkd3d_shader_sysval_semantic sysval_semantic_table[] = { [SEMANTIC_KIND_ARBITRARY] = VKD3D_SHADER_SV_NONE, + [SEMANTIC_KIND_VERTEXID] = VKD3D_SHADER_SV_VERTEX_ID, [SEMANTIC_KIND_POSITION] = VKD3D_SHADER_SV_POSITION, [SEMANTIC_KIND_TARGET] = VKD3D_SHADER_SV_TARGET, }; diff --git a/tests/hlsl/nointerpolation.shader_test b/tests/hlsl/nointerpolation.shader_test index a3c9edfd..155a033f 100644 --- a/tests/hlsl/nointerpolation.shader_test +++ b/tests/hlsl/nointerpolation.shader_test @@ -23,7 +23,7 @@ float4 main(nointerpolation float4 t : texcoord) : sv_target } [test] -todo(sm>=6) draw triangle list 3 +draw triangle list 3 probe all rgba (0.0, 1.0, 0.0, 1.0) [vertex shader] @@ -50,7 +50,7 @@ float4 main(ps_input input) : sv_target } [test] -todo(sm>=6) draw triangle list 3 +draw triangle list 3 probe all rgba (0.0, 1.0, 0.0, 1.0) [vertex shader] @@ -77,7 +77,7 @@ float4 main(nointerpolation ps_input input) : sv_target } [test] -todo(sm>=6) draw triangle list 3 +draw triangle list 3 probe all rgba (0.0, 1.0, 0.0, 1.0) [vertex shader] @@ -104,7 +104,7 @@ float4 main(centroid ps_input input) : sv_target } [test] -todo(sm>=6) draw triangle list 3 +draw triangle list 3 probe all rgba (0.0, 1.0, 0.0, 1.0) [vertex shader] @@ -130,10 +130,26 @@ float4 main(nointerpolation ps_input input) : sv_target return input.t; } +[require] +shader model >= 4.0 +shader model < 6.0 + [test] -todo(sm>=6) draw triangle list 3 +draw triangle list 3 probe all rgba (0.0, 1.0, 0.0, 1.0) +% Centroid for SM 6. +[require] +shader model >= 6.0 + +[test] +draw triangle list 3 +probe (320,240) rgba (0.250390589, 0.499088615, 0.250520796, 1.0) 1 + +[require] +shader model >= 4.0 + + [vertex shader fail todo] struct ps_input {

1 0

Conor McCarthy : vkd3d-shader/spirv: Handle UINT32_MAX result from FIRSTBIT_HI and FIRSTBIT_SHI instructions.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: vkd3d Branch: master Commit: ca7487a56d01b7c3ec1bfba867825968110641f8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ca7487a56d01b7c3ec1bfba867825… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Jan 13 00:36:44 2024 +1000 vkd3d-shader/spirv: Handle UINT32_MAX result from FIRSTBIT_HI and FIRSTBIT_SHI instructions. --- libs/vkd3d-shader/spirv.c | 8 ++++++-- tests/d3d12.c | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 5d9b78b2..8a79c116 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6892,11 +6892,11 @@ static enum GLSLstd450 spirv_compiler_map_ext_glsl_instruction( static void spirv_compiler_emit_ext_glsl_instruction(struct spirv_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { + uint32_t instr_set_id, type_id, val_id, rev_val_id, uint_max_id, condition_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; uint32_t src_id[SPIRV_MAX_SRC_COUNT]; - uint32_t instr_set_id, type_id, val_id; unsigned int i, component_count; enum GLSLstd450 glsl_inst; @@ -6925,8 +6925,12 @@ static void spirv_compiler_emit_ext_glsl_instruction(struct spirv_compiler *comp { /* In D3D bits are numbered from the most significant bit. */ component_count = vsir_write_mask_component_count(dst->write_mask); - val_id = vkd3d_spirv_build_op_isub(builder, type_id, + uint_max_id = spirv_compiler_get_constant_uint_vector(compiler, UINT32_MAX, component_count); + condition_id = vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, SpvOpIEqual, + vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_BOOL, component_count), val_id, uint_max_id); + rev_val_id = vkd3d_spirv_build_op_isub(builder, type_id, spirv_compiler_get_constant_uint_vector(compiler, 31, component_count), val_id); + val_id = vkd3d_spirv_build_op_select(builder, type_id, condition_id, val_id, rev_val_id); } spirv_compiler_emit_store_dst(compiler, dst, val_id); diff --git a/tests/d3d12.c b/tests/d3d12.c index b17812b9..1fd07cca 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -10577,11 +10577,11 @@ static void test_shader_instructions(void) {&ps_bits_vector, {{{0x11111111, 0x00080000}}}, {{8, 1, 28, 19}}}, - {&ps_firstbit_raw, {{{ 0, 0}}}, {{ ~0u, ~0u, ~0u, 0}}, false, true}, + {&ps_firstbit_raw, {{{ 0, 0}}}, {{ ~0u, ~0u, ~0u, 0}}}, {&ps_firstbit_raw, {{{0x80000000, 0x80000000}}}, {{ 31, 0, 1, 0}}}, {&ps_firstbit_raw, {{{0x80000001, 0x80000001}}}, {{ 0, 0, 1, 0}}}, {&ps_firstbit_raw, {{{0x11111111, 0x11111111}}}, {{ 0, 3, 3, 0}}}, - {&ps_firstbit_raw, {{{0x00080000, 0xffffffff}}}, {{ 19, 12, ~0u, 0}}, false, true}, + {&ps_firstbit_raw, {{{0x00080000, 0xffffffff}}}, {{ 19, 12, ~0u, 0}}}, {&ps_ishr, {{{0x00000000, 0x00000000, 0x00000000, 0x00000000}, {~0x1fu, 0, 32, 64}}}, {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}},

1 0

Conor McCarthy : tests/d3d12: Add a raw firstbit test to test_shader_instructions().
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: vkd3d Branch: master Commit: 62e15dac8dc58e5bc4db86257ddc9a074fb94173 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/62e15dac8dc58e5bc4db86257ddc9… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jan 19 13:44:55 2024 +1000 tests/d3d12: Add a raw firstbit test to test_shader_instructions(). --- tests/d3d12.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index d2638f31..b17812b9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9179,6 +9179,30 @@ static void test_shader_instructions(void) 0x06000086, 0x00102032, 0x00000000, 0x00208046, 0x00000000, 0x00000000, 0x0100003e, }; static struct named_shader ps_bits_vector = {"bits_vector", ps_bits_vector_code, sizeof(ps_bits_vector_code)}; + static const DWORD ps_firstbit_raw_code[] = + { + /* Without the fixup instructions emitted by fxc. */ +#if 0 + ps_5_0 + dcl_globalFlags refactoringAllowed + dcl_constantBuffer cb0[1], immediateIndexed + dcl_output o0.xyzw <v4:float> + firstbit_lo o0.x <v4:uint>, cb0[0].x <v4:uint> + firstbit_hi o0.y <v4:uint>, cb0[0].x <v4:uint> + firstbit_shi o0.z <v4:uint>, cb0[0].y <v4:int> + mov o0.w <v4:float>, l(0) <s:float> + ret +#endif + 0x43425844, 0xea469de0, 0x78a93361, 0xed27f28b, 0x8c34dd51, 0x00000001, 0x00000100, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000088, 0x00000050, 0x00000022, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x06000088, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x06000087, 0x00102022, + 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x06000089, 0x00102042, 0x00000000, 0x0020801a, + 0x00000000, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x00000000, 0x0100003e, + }; + static struct named_shader ps_firstbit_raw = {"firstbit_raw", ps_firstbit_raw_code, sizeof(ps_firstbit_raw_code)}; static const DWORD ps_ishr_code[] = { #if 0 @@ -10553,6 +10577,12 @@ static void test_shader_instructions(void) {&ps_bits_vector, {{{0x11111111, 0x00080000}}}, {{8, 1, 28, 19}}}, + {&ps_firstbit_raw, {{{ 0, 0}}}, {{ ~0u, ~0u, ~0u, 0}}, false, true}, + {&ps_firstbit_raw, {{{0x80000000, 0x80000000}}}, {{ 31, 0, 1, 0}}}, + {&ps_firstbit_raw, {{{0x80000001, 0x80000001}}}, {{ 0, 0, 1, 0}}}, + {&ps_firstbit_raw, {{{0x11111111, 0x11111111}}}, {{ 0, 3, 3, 0}}}, + {&ps_firstbit_raw, {{{0x00080000, 0xffffffff}}}, {{ 19, 12, ~0u, 0}}, false, true}, + {&ps_ishr, {{{0x00000000, 0x00000000, 0x00000000, 0x00000000}, {~0x1fu, 0, 32, 64}}}, {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}}, {&ps_ishr, {{{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}, {~0x1fu, 0, 32, 64}}}, @@ -11119,7 +11149,6 @@ static void test_shader_instructions(void) current_ps = uint_tests[i].ps; shader.pShaderBytecode = current_ps->code; shader.BytecodeLength = current_ps->size; - todo_if(uint_tests[i].is_todo) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, desc.rt_format, NULL, &shader, NULL); if (!context.pipeline_state) @@ -11146,7 +11175,7 @@ static void test_shader_instructions(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - todo_if(uint_tests[i].todo_on_nvidia && is_nvidia_device(context.device)) + todo_if(uint_tests[i].is_todo || (uint_tests[i].todo_on_nvidia && is_nvidia_device(context.device))) check_sub_resource_uvec4(context.render_target, 0, queue, command_list, &uint_tests[i].output.u); reset_command_list(command_list, context.allocator);

1 0

Bernhard Übelacker : dbghelp: Return early if HeapAlloc failed.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: c3ef1a6c67673b846dabed4c5e9c0b4f25b5849e URL: https://gitlab.winehq.org/wine/wine/-/commit/c3ef1a6c67673b846dabed4c5e9c0b… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Sat Jan 20 14:21:16 2024 +0100 dbghelp: Return early if HeapAlloc failed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56223 --- dlls/dbghelp/msc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 7f695928e4a..a62667ea8c3 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -3036,6 +3036,7 @@ static void* pdb_jg_read(const struct PDB_JG_HEADER* pdb, const WORD* block_list num_blocks = (size + pdb->block_size - 1) / pdb->block_size; buffer = HeapAlloc(GetProcessHeap(), 0, num_blocks * pdb->block_size); + if (!buffer) return NULL; for (i = 0; i < num_blocks; i++) memcpy(buffer + i * pdb->block_size, @@ -3054,6 +3055,7 @@ static void* pdb_ds_read(const struct PDB_DS_HEADER* pdb, const UINT *block_list num_blocks = (size + pdb->block_size - 1) / pdb->block_size; buffer = HeapAlloc(GetProcessHeap(), 0, num_blocks * pdb->block_size); + if (!buffer) return NULL; for (i = 0; i < num_blocks; i++) memcpy(buffer + i * pdb->block_size,

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
72
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 January 2024