January 2024 - Wine-commits

Giovanni Mascellani : tests: Compile HLSL shaders at runtime in test_ps_layer().
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: vkd3d Branch: master Commit: 5ddf745d95fe15a841fdb1170027dfdb0ecb85b0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5ddf745d95fe15a841fdb1170027d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jan 22 14:50:17 2024 +0100 tests: Compile HLSL shaders at runtime in test_ps_layer(). --- tests/d3d12.c | 62 ++++++++++++++++++++++++----------------------------------- 1 file changed, 25 insertions(+), 37 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1fd07cca..9c8601bf 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -28132,7 +28132,9 @@ static void test_ps_layer(void) { D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; ID3D12GraphicsCommandList *command_list; + ID3D10Blob *vs_bytecode, *ps_bytecode; struct test_context_desc desc; + D3D12_SHADER_BYTECODE vs, ps; struct test_context context; ID3D12CommandQueue *queue; ID3D12Device *device; @@ -28140,23 +28142,11 @@ static void test_ps_layer(void) HRESULT hr; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; - static const DWORD vs_code[] = - { -#if 0 - void main(in uint vertex_id : SV_VertexID, out uint layer : LAYER) - { - layer = vertex_id; - } -#endif - 0x43425844, 0xd2b4abd8, 0xf9adf7df, 0xed1b4eb0, 0x4bf54391, 0x00000001, 0x000000d8, 0x00000003, - 0x0000002c, 0x00000060, 0x00000090, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, - 0x00000000, 0x00000006, 0x00000001, 0x00000000, 0x00000101, 0x565f5653, 0x65747265, 0x00444978, - 0x4e47534f, 0x00000028, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, - 0x00000000, 0x00000e01, 0x4559414c, 0xabab0052, 0x58454853, 0x00000040, 0x00010050, 0x00000010, - 0x0100086a, 0x04000060, 0x00101012, 0x00000000, 0x00000006, 0x03000065, 0x00102012, 0x00000000, - 0x05000036, 0x00102012, 0x00000000, 0x0010100a, 0x00000000, 0x0100003e, - }; - static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const char vs_code[] = + "void main(in uint vertex_id : SV_VertexID, out uint layer : LAYER)\n" + "{\n" + " layer = vertex_id;\n" + "}\n"; static const DWORD gs_code[] = { #if 0 @@ -28206,26 +28196,11 @@ static void test_ps_layer(void) 0x0020100a, 0x00000000, 0x00000000, 0x03000075, 0x00110000, 0x00000000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE gs = {gs_code, sizeof(gs_code)}; - static const DWORD ps_code[] = - { -#if 0 - float4 main(float4 p : SV_Position, uint layer : SV_RenderTargetArrayIndex) : SV_Target0 - { - return layer / 255.0; - } -#endif - 0x43425844, 0x53474926, 0xbd247b84, 0x389660f4, 0x331cf598, 0x00000001, 0x00000140, 0x00000003, - 0x0000002c, 0x00000094, 0x000000c8, 0x4e475349, 0x00000060, 0x00000002, 0x00000008, 0x00000038, - 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000004, - 0x00000001, 0x00000001, 0x00000101, 0x505f5653, 0x7469736f, 0x006e6f69, 0x525f5653, 0x65646e65, - 0x72615472, 0x41746567, 0x79617272, 0x65646e49, 0xabab0078, 0x4e47534f, 0x0000002c, 0x00000001, - 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, - 0x65677261, 0xabab0074, 0x58454853, 0x00000070, 0x00000050, 0x0000001c, 0x0100086a, 0x04000864, - 0x00101012, 0x00000001, 0x00000004, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, - 0x05000056, 0x00100012, 0x00000000, 0x0010100a, 0x00000001, 0x0a000038, 0x001020f2, 0x00000000, - 0x00100006, 0x00000000, 0x00004002, 0x3b808081, 0x3b808081, 0x3b808081, 0x3b808081, 0x0100003e, - }; - static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const char ps_code[] = + "float4 main(float4 p : SV_Position, uint layer : SV_RenderTargetArrayIndex) : SV_Target0\n" + "{\n" + " return layer / 255.0;\n" + "}\n"; static const unsigned int expected_results[] = { 0x00000000, @@ -28236,11 +28211,21 @@ static void test_ps_layer(void) 0x05050505, }; + vs_bytecode = compile_shader(vs_code, sizeof(vs_code) - 1, "vs_4_0"); + vs = shader_bytecode_from_blob(vs_bytecode); + + ps_bytecode = compile_shader(ps_code, sizeof(ps_code) - 1, "ps_4_0"); + ps = shader_bytecode_from_blob(ps_bytecode); + memset(&desc, 0, sizeof(desc)); desc.rt_array_size = 6; desc.no_pipeline = true; if (!init_test_context(&context, &desc)) + { + ID3D10Blob_Release(vs_bytecode); + ID3D10Blob_Release(ps_bytecode); return; + } device = context.device; command_list = context.list; queue = context.queue; @@ -28273,6 +28258,9 @@ static void test_ps_layer(void) } destroy_test_context(&context); + + ID3D10Blob_Release(vs_bytecode); + ID3D10Blob_Release(ps_bytecode); } static void test_nop_tessellation_shaders(void)

1 0

Giovanni Mascellani : tests: Test using SV_RenderTargetArrayIndex in the vertex shader.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: vkd3d Branch: master Commit: 245cce02bd501cd53f8bde961e40d51c7bf5a6ff URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/245cce02bd501cd53f8bde961e40d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jan 22 15:01:11 2024 +0100 tests: Test using SV_RenderTargetArrayIndex in the vertex shader. --- tests/d3d12.c | 95 +++++++++++++++++++++++++---------------------------------- 1 file changed, 40 insertions(+), 55 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9c8601bf..c4952953 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -576,6 +576,21 @@ static bool are_typed_uav_load_additional_formats_supported(ID3D12Device *device return options.TypedUAVLoadAdditionalFormats; } +static bool is_vs_array_index_supported(ID3D12Device *device) +{ + D3D12_FEATURE_DATA_D3D12_OPTIONS options; + HRESULT hr; + + if (FAILED(hr = ID3D12Device_CheckFeatureSupport(device, + D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options)))) + { + trace("Failed to check feature support, hr %#x.\n", hr); + return false; + } + + return options.VPAndRTArrayIndexFromAnyShaderFeedingRasterizerSupportedWithoutGSEmulation; +} + #define create_cb_root_signature(a, b, c, e) create_cb_root_signature_(__LINE__, a, b, c, e) static ID3D12RootSignature *create_cb_root_signature_(unsigned int line, ID3D12Device *device, unsigned int reg_idx, D3D12_SHADER_VISIBILITY shader_visibility, @@ -28143,59 +28158,22 @@ static void test_ps_layer(void) static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; static const char vs_code[] = - "void main(in uint vertex_id : SV_VertexID, out uint layer : LAYER)\n" + "float4 main(in uint vertex_id : SV_VertexID, in uint instance_id : SV_InstanceID,\n" + " out uint layer : SV_RenderTargetArrayIndex) : SV_Position\n" "{\n" - " layer = vertex_id;\n" + " layer = instance_id;\n" + " switch (vertex_id)\n" + " {\n" + " case 0:\n" + " return float4(-1, 1, 0, 1);\n" + " case 1:\n" + " return float4(3, 1, 0, 1);\n" + " case 2:\n" + " return float4(-1, -3, 0, 1);\n" + " default:\n" + " return float4(0, 0, 0, 0);\n" + " }\n" "}\n"; - static const DWORD gs_code[] = - { -#if 0 - struct gs_in - { - uint layer : LAYER; - }; - - struct gs_out - { - float4 position : SV_Position; - uint layer : SV_RenderTargetArrayIndex; - }; - - [maxvertexcount(3)] - void main(point gs_in vin[1], inout TriangleStream<gs_out> vout) - { - gs_out o; - - o.layer = vin[0].layer; - - o.position = float4(-1, 1, 0, 1); - vout.Append(o); - - o.position = float4(3, 1, 0, 1); - vout.Append(o); - - o.position = float4(-1, -3, 0, 1); - vout.Append(o); - } -#endif - 0x43425844, 0x2589d822, 0x7557587c, 0x7d7e9cc0, 0x6bad86aa, 0x00000001, 0x000001fc, 0x00000003, - 0x0000002c, 0x0000005c, 0x000000cc, 0x4e475349, 0x00000028, 0x00000001, 0x00000008, 0x00000020, - 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000101, 0x4559414c, 0xabab0052, 0x3547534f, - 0x00000068, 0x00000002, 0x00000008, 0x00000000, 0x00000040, 0x00000000, 0x00000001, 0x00000003, - 0x00000000, 0x0000000f, 0x00000000, 0x0000004c, 0x00000000, 0x00000004, 0x00000001, 0x00000001, - 0x00000e01, 0x505f5653, 0x7469736f, 0x006e6f69, 0x525f5653, 0x65646e65, 0x72615472, 0x41746567, - 0x79617272, 0x65646e49, 0xabab0078, 0x58454853, 0x00000128, 0x00020050, 0x0000004a, 0x0100086a, - 0x0400005f, 0x00201012, 0x00000001, 0x00000000, 0x0100085d, 0x0300008f, 0x00110000, 0x00000000, - 0x0100285c, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x04000067, 0x00102012, 0x00000001, - 0x00000004, 0x0200005e, 0x00000003, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0xbf800000, - 0x3f800000, 0x00000000, 0x3f800000, 0x06000036, 0x00102012, 0x00000001, 0x0020100a, 0x00000000, - 0x00000000, 0x03000075, 0x00110000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, - 0x40400000, 0x3f800000, 0x00000000, 0x3f800000, 0x06000036, 0x00102012, 0x00000001, 0x0020100a, - 0x00000000, 0x00000000, 0x03000075, 0x00110000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, - 0x00004002, 0xbf800000, 0xc0400000, 0x00000000, 0x3f800000, 0x06000036, 0x00102012, 0x00000001, - 0x0020100a, 0x00000000, 0x00000000, 0x03000075, 0x00110000, 0x00000000, 0x0100003e, - }; - static const D3D12_SHADER_BYTECODE gs = {gs_code, sizeof(gs_code)}; static const char ps_code[] = "float4 main(float4 p : SV_Position, uint layer : SV_RenderTargetArrayIndex) : SV_Target0\n" "{\n" @@ -28226,14 +28204,21 @@ static void test_ps_layer(void) ID3D10Blob_Release(ps_bytecode); return; } + + if (!is_vs_array_index_supported(context.device)) + { + skip("The device does not support SV_RenderTargetArrayIndex in VS.\n"); + destroy_test_context(&context); + return; + } + device = context.device; command_list = context.list; queue = context.queue; init_pipeline_state_desc(&pso_desc, context.root_signature, context.render_target_desc.Format, &vs, &ps, NULL); - pso_desc.GS = gs; - pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_POINT; + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE; hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, &IID_ID3D12PipelineState, (void **)&context.pipeline_state); ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); @@ -28245,8 +28230,8 @@ static void test_ps_layer(void) ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); - ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_POINTLIST); - ID3D12GraphicsCommandList_DrawInstanced(command_list, 6, 1, 0, 0); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 6, 0, 0); transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE);

1 0

Giovanni Mascellani : tests: Use test utils to create the pipeline state in test_ps_layer().
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: vkd3d Branch: master Commit: bd84b96e9f930eadba9b2aee01bd7f2777adad42 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bd84b96e9f930eadba9b2aee01bd7… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jan 22 15:35:44 2024 +0100 tests: Use test utils to create the pipeline state in test_ps_layer(). --- tests/d3d12.c | 14 ++------------ tests/d3d12_test_utils.h | 3 ++- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index c4952953..4d73702f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -28145,16 +28145,13 @@ static void test_layered_rendering(void) static void test_ps_layer(void) { - D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; ID3D12GraphicsCommandList *command_list; ID3D10Blob *vs_bytecode, *ps_bytecode; struct test_context_desc desc; D3D12_SHADER_BYTECODE vs, ps; struct test_context context; ID3D12CommandQueue *queue; - ID3D12Device *device; unsigned int i; - HRESULT hr; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; static const char vs_code[] = @@ -28197,7 +28194,8 @@ static void test_ps_layer(void) memset(&desc, 0, sizeof(desc)); desc.rt_array_size = 6; - desc.no_pipeline = true; + desc.vs = &vs; + desc.ps = &ps; if (!init_test_context(&context, &desc)) { ID3D10Blob_Release(vs_bytecode); @@ -28212,17 +28210,9 @@ static void test_ps_layer(void) return; } - device = context.device; command_list = context.list; queue = context.queue; - init_pipeline_state_desc(&pso_desc, context.root_signature, - context.render_target_desc.Format, &vs, &ps, NULL); - pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE; - hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, - &IID_ID3D12PipelineState, (void **)&context.pipeline_state); - ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 7473bbc4..e50ac45c 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -994,6 +994,7 @@ struct test_context_desc bool no_render_target; bool no_root_signature; bool no_pipeline; + const D3D12_SHADER_BYTECODE *vs; const D3D12_SHADER_BYTECODE *ps; }; @@ -1153,7 +1154,7 @@ static inline bool init_test_context_(unsigned int line, struct test_context *co context->pipeline_state = create_pipeline_state_(line, device, context->root_signature, context->render_target_desc.Format, - NULL, desc ? desc->ps : NULL, NULL); + desc ? desc->vs : NULL, desc ? desc->ps : NULL, NULL); return true; }

1 0

Giovanni Mascellani : tests: Add a test for SV_ViewportArrayIndex.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: vkd3d Branch: master Commit: 72e2eeaf146e856497890241213a98327c098c6d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/72e2eeaf146e856497890241213a9… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jan 22 16:02:38 2024 +0100 tests: Add a test for SV_ViewportArrayIndex. --- tests/d3d12.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/d3d12_test_utils.h | 12 ++++++ 2 files changed, 110 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 4d73702f..896a0f22 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -28238,6 +28238,103 @@ static void test_ps_layer(void) ID3D10Blob_Release(ps_bytecode); } +static void test_ps_viewport_index(void) +{ + ID3D12GraphicsCommandList *command_list; + ID3D10Blob *vs_bytecode, *ps_bytecode; + struct test_context_desc desc; + D3D12_SHADER_BYTECODE vs, ps; + struct test_context context; + D3D12_VIEWPORT viewports[4]; + ID3D12CommandQueue *queue; + D3D12_BOX box; + + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const char vs_code[] = + "float4 main(in uint vertex_id : SV_VertexID, in uint instance_id : SV_InstanceID,\n" + " out uint viewport : SV_ViewportArrayIndex) : SV_Position\n" + "{\n" + " viewport = instance_id;\n" + " switch (vertex_id)\n" + " {\n" + " case 0:\n" + " return float4(-1, 1, 0, 1);\n" + " case 1:\n" + " return float4(3, 1, 0, 1);\n" + " case 2:\n" + " return float4(-1, -3, 0, 1);\n" + " default:\n" + " return float4(0, 0, 0, 0);\n" + " }\n" + "}\n"; + static const char ps_code[] = + "float4 main(float4 p : SV_Position, uint viewport : SV_ViewportArrayIndex) : SV_Target0\n" + "{\n" + " return viewport / 255.0;\n" + "}\n"; + + vs_bytecode = compile_shader(vs_code, sizeof(vs_code) - 1, "vs_4_0"); + vs = shader_bytecode_from_blob(vs_bytecode); + + ps_bytecode = compile_shader(ps_code, sizeof(ps_code) - 1, "ps_4_0"); + ps = shader_bytecode_from_blob(ps_bytecode); + + memset(&desc, 0, sizeof(desc)); + desc.vs = &vs; + desc.ps = &ps; + if (!init_test_context(&context, &desc)) + { + ID3D10Blob_Release(vs_bytecode); + ID3D10Blob_Release(ps_bytecode); + return; + } + + if (!is_vs_array_index_supported(context.device)) + { + skip("The device does not support SV_ViewportArrayIndex in VS.\n"); + destroy_test_context(&context); + return; + } + + command_list = context.list; + queue = context.queue; + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + set_viewport(&viewports[0], + 0.0f, 0.0f, + context.render_target_desc.Width / 2, context.render_target_desc.Height / 2, 0.0f, 1.0f); + set_viewport(&viewports[1], + context.render_target_desc.Width / 2, 0.0f, + context.render_target_desc.Width, context.render_target_desc.Height / 2, 0.0f, 1.0f); + set_viewport(&viewports[2], + 0.0f, context.render_target_desc.Height / 2, + context.render_target_desc.Width / 2, context.render_target_desc.Height, 0.0f, 1.0f); + set_viewport(&viewports[3], + context.render_target_desc.Width / 2, context.render_target_desc.Height / 2, + context.render_target_desc.Width, context.render_target_desc.Height, 0.0f, 1.0f); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_RSSetViewports(command_list, ARRAY_SIZE(viewports), viewports); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 4, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + set_box(&box, 0, 0, 0, context.render_target_desc.Width / 2, context.render_target_desc.Height / 2, 1); + check_sub_resource_uint_with_box(context.render_target, 0, queue, command_list, &box, 0x00000000, 0); + reset_command_list(command_list, context.allocator); + + destroy_test_context(&context); + + ID3D10Blob_Release(vs_bytecode); + ID3D10Blob_Release(ps_bytecode); +} + static void test_nop_tessellation_shaders(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -38077,6 +38174,7 @@ START_TEST(d3d12) run_test(test_geometry_shader); run_test(test_layered_rendering); run_test(test_ps_layer); + run_test(test_ps_viewport_index); run_test(test_nop_tessellation_shaders); run_test(test_quad_tessellation); run_test(test_tessellation_dcl_index_range); diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index e50ac45c..6de828d1 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -585,6 +585,18 @@ static inline void check_sub_resource_uint_(unsigned int line, ID3D12Resource *t release_resource_readback(&rb); } +#define check_sub_resource_uint_with_box(a, b, c, d, e, f, g) check_sub_resource_uint_with_box_(__LINE__, a, b, c, d, e, f, g) +static inline void check_sub_resource_uint_with_box_(unsigned int line, ID3D12Resource *texture, + unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, + const D3D12_BOX *box, unsigned int expected, unsigned int max_diff) +{ + struct d3d12_resource_readback rb; + + get_resource_readback_with_command_list(texture, sub_resource_idx, &rb, queue, command_list); + check_readback_data_uint_(line, &rb.rb, box, expected, max_diff); + release_resource_readback(&rb); +} + #define check_sub_resource_vec4(a, b, c, d, e, f) check_sub_resource_vec4_(__LINE__, a, b, c, d, e, f) static inline void check_sub_resource_vec4_(unsigned int line, ID3D12Resource *texture, unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list,

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

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 : 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/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

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

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