January 2024 - Wine-Commits

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

Jan. 22, 2024

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

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

Jan. 22, 2024

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 ViewportIndex.
by Alexandre Julliard Jan. 22, 2024

Jan. 22, 2024

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

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

Jan. 22, 2024

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: Introduce struct vsir_program.
by Alexandre Julliard Jan. 22, 2024

Jan. 22, 2024

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/spirv: Handle UINT32_MAX result from FIRSTBIT_HI and FIRSTBIT_SHI instructions.
by Alexandre Julliard Jan. 22, 2024

Jan. 22, 2024

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 : vkd3d-shader/dxil: Handle semantic kind VERTEXID.
by Alexandre Julliard Jan. 22, 2024

Jan. 22, 2024

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 : tests/d3d12: Add a raw firstbit test to test_shader_instructions().
by Alexandre Julliard Jan. 22, 2024

Jan. 22, 2024

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

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

Jan. 22, 2024

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

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

Jan. 22, 2024

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