January 2024 - Wine-commits

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 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: Use debugstr_hresult() in vkd3d_wait_for_gpu_fence().
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: vkd3d Branch: master Commit: f6ef7c3f46e1c0baf2e53c4cb7e0cd390ed309de URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f6ef7c3f46e1c0baf2e53c4cb7e0c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 16 12:24:54 2024 +0100 vkd3d: Use debugstr_hresult() in vkd3d_wait_for_gpu_fence(). --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4c39d00d..9f9c19bd 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -313,7 +313,7 @@ static void vkd3d_wait_for_gpu_fence(struct vkd3d_fence_worker *worker, TRACE("Signaling fence %p value %#"PRIx64".\n", waiting_fence->fence, waiting_fence->value); if (FAILED(hr = d3d12_fence_signal(waiting_fence->fence, waiting_fence->value, waiting_fence->u.vk_fence, false))) - ERR("Failed to signal D3D12 fence, hr %#x.\n", hr); + ERR("Failed to signal d3d12 fence, hr %s.\n", debugstr_hresult(hr)); d3d12_fence_decref(waiting_fence->fence);

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in d3d12_command_list_copy_incompatible_texture_region().
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: vkd3d Branch: master Commit: ebb2a31e509aa18b89b740d7e9053b27f5ae90e0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ebb2a31e509aa18b89b740d7e9053… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 17:55:19 2024 +0100 vkd3d: Use debugstr_hresult() in d3d12_command_list_copy_incompatible_texture_region(). --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9f9c19bd..5856c773 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3706,7 +3706,7 @@ static void d3d12_command_list_copy_incompatible_texture_region(struct d3d12_com buffer_image_copy.imageExtent.height * buffer_image_copy.imageExtent.depth * layer_count; if (FAILED(hr = d3d12_command_list_allocate_transfer_buffer(list, buffer_size, &transfer_buffer))) { - ERR("Failed to allocate transfer buffer, hr %#x.\n", hr); + ERR("Failed to allocate transfer buffer, hr %s.\n", debugstr_hresult(hr)); return; }

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in d3d12_command_queue_submit_locked().
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: vkd3d Branch: master Commit: dd00e209ac7a55b411545e5e2d87f1b115821f82 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dd00e209ac7a55b411545e5e2d87f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 17 18:01:57 2024 +0100 vkd3d: Use debugstr_hresult() in d3d12_command_queue_submit_locked(). --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 5856c773..d146e322 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -6564,7 +6564,7 @@ static void d3d12_command_queue_submit_locked(struct d3d12_command_queue *queue) if (queue->op_queue.count == 1 && !queue->is_flushing) { if (FAILED(hr = d3d12_command_queue_flush_ops_locked(queue, &flushed_any))) - ERR("Cannot flush queue, hr %#x.\n", hr); + ERR("Failed to flush queue, hr %s.\n", debugstr_hresult(hr)); } }

1 0

Giovanni Mascellani : vkd3d-shader/spirv: Use capability ShaderViewportIndexLayerEXT for decoration Layer.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: vkd3d Branch: master Commit: 6ac525d6c3fafacff7e9b2d01dce9e38e67a3dd5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6ac525d6c3fafacff7e9b2d01dce9… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jan 8 23:56:45 2024 +0100 vkd3d-shader/spirv: Use capability ShaderViewportIndexLayerEXT for decoration Layer. Capability Geometry allows to use the Layer builtin in geometry and pixel shaders. For vertex and domain shaders ShaderLayer should be used, but it's only available starting from SPIR-V 1.5. ShaderViewportIndexLayerEXT can be used instead with extension SPV_EXT_shader_viewport_index_layer. --- include/vkd3d_shader.h | 2 ++ libs/vkd3d-shader/spirv.c | 28 +++++++++++++++++++++++++++- libs/vkd3d/device.c | 9 +++++++-- libs/vkd3d/vkd3d_private.h | 3 ++- 4 files changed, 38 insertions(+), 4 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index a9c9ccc4..449b3684 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -876,6 +876,8 @@ enum vkd3d_shader_spirv_extension VKD3D_SHADER_SPIRV_EXTENSION_EXT_DESCRIPTOR_INDEXING, /** \since 1.3 */ VKD3D_SHADER_SPIRV_EXTENSION_EXT_STENCIL_EXPORT, + /** \since 1.11 */ + VKD3D_SHADER_SPIRV_EXTENSION_EXT_VIEWPORT_INDEX_LAYER, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SPIRV_EXTENSION), }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ef0bfeab..b28f94fb 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1933,6 +1933,8 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, vkd3d_spirv_build_op_extension(&stream, "SPV_EXT_descriptor_indexing"); if (vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStencilExportEXT)) vkd3d_spirv_build_op_extension(&stream, "SPV_EXT_shader_stencil_export"); + if (vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityShaderViewportIndexLayerEXT)) + vkd3d_spirv_build_op_extension(&stream, "SPV_EXT_shader_viewport_index_layer"); if (builder->ext_instr_set_glsl_450) vkd3d_spirv_build_op_ext_inst_import(&stream, builder->ext_instr_set_glsl_450, "GLSL.std.450"); @@ -4241,7 +4243,31 @@ static void spirv_compiler_decorate_builtin(struct spirv_compiler *compiler, spirv_compiler_emit_execution_mode(compiler, SpvExecutionModeDepthReplacing, NULL, 0); break; case SpvBuiltInLayer: - vkd3d_spirv_enable_capability(builder, SpvCapabilityGeometry); + switch (compiler->shader_type) + { + case VKD3D_SHADER_TYPE_PIXEL: + case VKD3D_SHADER_TYPE_GEOMETRY: + vkd3d_spirv_enable_capability(builder, SpvCapabilityGeometry); + break; + + case VKD3D_SHADER_TYPE_VERTEX: + case VKD3D_SHADER_TYPE_DOMAIN: + if (!spirv_compiler_is_target_extension_supported(compiler, + VKD3D_SHADER_SPIRV_EXTENSION_EXT_VIEWPORT_INDEX_LAYER)) + { + FIXME("The target environment does not support decoration Layer.\n"); + spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_UNSUPPORTED_FEATURE, + "Cannot use SV_RenderTargetArrayIndex. " + "The target environment does not support decoration Layer."); + } + vkd3d_spirv_enable_capability(builder, SpvCapabilityShaderViewportIndexLayerEXT); + break; + + default: + spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_INVALID_SHADER, + "Invalid use of SV_RenderTargetArrayIndex."); + break; + } break; case SpvBuiltInViewportIndex: vkd3d_spirv_enable_capability(builder, SpvCapabilityMultiViewport); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index ea243977..75efa41f 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -98,6 +98,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = VK_EXTENSION(EXT_ROBUSTNESS_2, EXT_robustness2), VK_EXTENSION(EXT_SHADER_DEMOTE_TO_HELPER_INVOCATION, EXT_shader_demote_to_helper_invocation), VK_EXTENSION(EXT_SHADER_STENCIL_EXPORT, EXT_shader_stencil_export), + VK_EXTENSION(EXT_SHADER_VIEWPORT_INDEX_LAYER, EXT_shader_viewport_index_layer), VK_EXTENSION(EXT_TEXEL_BUFFER_ALIGNMENT, EXT_texel_buffer_alignment), VK_EXTENSION(EXT_TRANSFORM_FEEDBACK, EXT_transform_feedback), VK_EXTENSION(EXT_VERTEX_ATTRIBUTE_DIVISOR, EXT_vertex_attribute_divisor), @@ -1546,8 +1547,6 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, device->feature_options.StandardSwizzle64KBSupported = FALSE; device->feature_options.CrossNodeSharingTier = D3D12_CROSS_NODE_SHARING_TIER_NOT_SUPPORTED; device->feature_options.CrossAdapterRowMajorTextureSupported = FALSE; - /* SPV_EXT_shader_viewport_index_layer */ - device->feature_options.VPAndRTArrayIndexFromAnyShaderFeedingRasterizerSupportedWithoutGSEmulation = FALSE; device->feature_options.ResourceHeapTier = D3D12_RESOURCE_HEAP_TIER_2; /* Shader Model 6 support. */ @@ -1653,6 +1652,8 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vkd3d_free(vk_extensions); device->feature_options.PSSpecifiedStencilRefSupported = vulkan_info->EXT_shader_stencil_export; + device->feature_options.VPAndRTArrayIndexFromAnyShaderFeedingRasterizerSupportedWithoutGSEmulation = + vulkan_info->EXT_shader_viewport_index_layer; vkd3d_init_feature_level(vulkan_info, features, &device->feature_options); if (vulkan_info->max_feature_level < create_info->minimum_feature_level) @@ -1678,6 +1679,10 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, vulkan_info->shader_extensions[vulkan_info->shader_extension_count++] = VKD3D_SHADER_SPIRV_EXTENSION_EXT_STENCIL_EXPORT; + if (vulkan_info->EXT_shader_viewport_index_layer) + vulkan_info->shader_extensions[vulkan_info->shader_extension_count++] + = VKD3D_SHADER_SPIRV_EXTENSION_EXT_VIEWPORT_INDEX_LAYER; + /* Disable unused Vulkan features. */ features->shaderTessellationAndGeometryPointSize = VK_FALSE; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 7d159a17..2841122a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -55,7 +55,7 @@ #define VKD3D_MAX_COMPATIBLE_FORMAT_COUNT 6u #define VKD3D_MAX_QUEUE_FAMILY_COUNT 3u -#define VKD3D_MAX_SHADER_EXTENSIONS 3u +#define VKD3D_MAX_SHADER_EXTENSIONS 4u #define VKD3D_MAX_SHADER_STAGES 5u #define VKD3D_MAX_VK_SYNC_OBJECTS 4u #define VKD3D_MAX_DEVICE_BLOCKED_QUEUES 16u @@ -137,6 +137,7 @@ struct vkd3d_vulkan_info bool EXT_robustness2; bool EXT_shader_demote_to_helper_invocation; bool EXT_shader_stencil_export; + bool EXT_shader_viewport_index_layer; bool EXT_texel_buffer_alignment; bool EXT_transform_feedback; bool EXT_vertex_attribute_divisor;

1 0

Giovanni Mascellani : vkd3d-shader/spirv: Use capability ShaderViewportIndexLayerEXT for decoration ViewportIndex.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: vkd3d Branch: master Commit: 45495f54f26b3a3f7dcc1fadaf787e16f6c54c1b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/45495f54f26b3a3f7dcc1fadaf787… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jan 9 22:47:38 2024 +0100 vkd3d-shader/spirv: Use capability ShaderViewportIndexLayerEXT for decoration ViewportIndex. --- libs/vkd3d-shader/spirv.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index b28f94fb..e837fc2e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4270,7 +4270,31 @@ static void spirv_compiler_decorate_builtin(struct spirv_compiler *compiler, } break; case SpvBuiltInViewportIndex: - vkd3d_spirv_enable_capability(builder, SpvCapabilityMultiViewport); + switch (compiler->shader_type) + { + case VKD3D_SHADER_TYPE_PIXEL: + case VKD3D_SHADER_TYPE_GEOMETRY: + vkd3d_spirv_enable_capability(builder, SpvCapabilityMultiViewport); + break; + + case VKD3D_SHADER_TYPE_VERTEX: + case VKD3D_SHADER_TYPE_DOMAIN: + if (!spirv_compiler_is_target_extension_supported(compiler, + VKD3D_SHADER_SPIRV_EXTENSION_EXT_VIEWPORT_INDEX_LAYER)) + { + FIXME("The target environment does not support decoration ViewportIndex.\n"); + spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_UNSUPPORTED_FEATURE, + "Cannot use SV_ViewportArrayIndex. " + "The target environment does not support decoration ViewportIndex."); + } + vkd3d_spirv_enable_capability(builder, SpvCapabilityShaderViewportIndexLayerEXT); + break; + + default: + spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_INVALID_SHADER, + "Invalid use of SV_ViewportArrayIndex."); + break; + } break; case SpvBuiltInSampleId: vkd3d_spirv_enable_capability(builder, SpvCapabilitySampleRateShading);

1 0

Giovanni Mascellani : vkd3d-shader/tpf: Support SV_RenderTargetArrayIndex in pixel and vertex shaders.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: vkd3d Branch: master Commit: b500381b5c059e3a40aef04c899e981fb3e42497 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b500381b5c059e3a40aef04c899e9… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jan 22 14:48:45 2024 +0100 vkd3d-shader/tpf: Support SV_RenderTargetArrayIndex in pixel and vertex shaders. --- libs/vkd3d-shader/tpf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index ecd78484..427c56f8 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2807,6 +2807,7 @@ bool hlsl_sm4_usage_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semant {"position", false, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_POSITION}, {"sv_position", false, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_POSITION}, {"sv_isfrontface", false, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_IS_FRONT_FACE}, + {"sv_rendertargetarrayindex", false, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_RENDER_TARGET_ARRAY_INDEX}, {"color", true, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_TARGET}, {"depth", true, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_DEPTH}, @@ -2818,6 +2819,7 @@ bool hlsl_sm4_usage_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semant {"position", true, VKD3D_SHADER_TYPE_VERTEX, D3D_NAME_POSITION}, {"sv_position", true, VKD3D_SHADER_TYPE_VERTEX, D3D_NAME_POSITION}, + {"sv_rendertargetarrayindex", true, VKD3D_SHADER_TYPE_VERTEX, D3D_NAME_RENDER_TARGET_ARRAY_INDEX}, }; bool needs_compat_mapping = ascii_strncasecmp(semantic->name, "sv_", 3);

1 0

Giovanni Mascellani : vkd3d-shader/tpf: Support SV_InstanceID in vertex shaders.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: vkd3d Branch: master Commit: 3a90f3e29dc99817c1a489e8051de6795ff65e98 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3a90f3e29dc99817c1a489e8051de… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jan 22 15:00:05 2024 +0100 vkd3d-shader/tpf: Support SV_InstanceID in vertex shaders. --- libs/vkd3d-shader/tpf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 427c56f8..5e3a6360 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2816,6 +2816,7 @@ bool hlsl_sm4_usage_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semant {"sv_position", false, VKD3D_SHADER_TYPE_VERTEX, D3D_NAME_UNDEFINED}, {"sv_vertexid", false, VKD3D_SHADER_TYPE_VERTEX, D3D_NAME_VERTEX_ID}, + {"sv_instanceid", false, VKD3D_SHADER_TYPE_VERTEX, D3D_NAME_INSTANCE_ID}, {"position", true, VKD3D_SHADER_TYPE_VERTEX, D3D_NAME_POSITION}, {"sv_position", true, VKD3D_SHADER_TYPE_VERTEX, D3D_NAME_POSITION},

1 0

Giovanni Mascellani : vkd3d-shader/tpf: Support SV_ViewportArrayIndex in pixel and vertex shaders.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: vkd3d Branch: master Commit: dc56320b3129f5f8cd04c0a2d1f070008ad52d9c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dc56320b3129f5f8cd04c0a2d1f07… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jan 22 15:21:33 2024 +0100 vkd3d-shader/tpf: Support SV_ViewportArrayIndex in pixel and vertex shaders. --- libs/vkd3d-shader/tpf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 5e3a6360..df10cd25 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2808,6 +2808,7 @@ bool hlsl_sm4_usage_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semant {"sv_position", false, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_POSITION}, {"sv_isfrontface", false, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_IS_FRONT_FACE}, {"sv_rendertargetarrayindex", false, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_RENDER_TARGET_ARRAY_INDEX}, + {"sv_viewportarrayindex", false, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_VIEWPORT_ARRAY_INDEX}, {"color", true, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_TARGET}, {"depth", true, VKD3D_SHADER_TYPE_PIXEL, D3D_NAME_DEPTH}, @@ -2821,6 +2822,7 @@ bool hlsl_sm4_usage_from_semantic(struct hlsl_ctx *ctx, const struct hlsl_semant {"position", true, VKD3D_SHADER_TYPE_VERTEX, D3D_NAME_POSITION}, {"sv_position", true, VKD3D_SHADER_TYPE_VERTEX, D3D_NAME_POSITION}, {"sv_rendertargetarrayindex", true, VKD3D_SHADER_TYPE_VERTEX, D3D_NAME_RENDER_TARGET_ARRAY_INDEX}, + {"sv_viewportarrayindex", true, VKD3D_SHADER_TYPE_VERTEX, D3D_NAME_VIEWPORT_ARRAY_INDEX}, }; bool needs_compat_mapping = ascii_strncasecmp(semantic->name, "sv_", 3);

1 0