October 2021 - Wine-Commits

Conor McCarthy : vkd3d: Implement output merger logic ops.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: vkd3d Branch: master Commit: fed21a1245bd1d0f2ec6353f495773e11c9562ce URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fed21a1245bd1d0f2ec6353… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Oct 18 18:28:10 2021 +0200 vkd3d: Implement output merger logic ops. Using vk_logic_op_from_d3d12() from a vkd3d-proton patch by Philip Rebohle. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 58 ++++++++++++++++++++++++++++++++++++++++++---- libs/vkd3d/vkd3d_private.h | 2 ++ tests/d3d12.c | 1 - 3 files changed, 55 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index ef74d7f..413b0a3 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2276,9 +2276,6 @@ static void blend_attachment_from_d3d12(struct VkPipelineColorBlendAttachmentSta vk_desc->colorWriteMask |= VK_COLOR_COMPONENT_B_BIT; if (d3d12_desc->RenderTargetWriteMask & D3D12_COLOR_WRITE_ENABLE_ALPHA) vk_desc->colorWriteMask |= VK_COLOR_COMPONENT_A_BIT; - - if (d3d12_desc->LogicOpEnable) - FIXME("Ignoring LogicOpEnable %#x.\n", d3d12_desc->LogicOpEnable); } static bool is_dual_source_blending_blend(D3D12_BLEND b) @@ -2388,6 +2385,48 @@ static HRESULT d3d12_graphics_pipeline_state_create_render_pass( return vkd3d_render_pass_cache_find(&device->render_pass_cache, device, &key, vk_render_pass); } +static VkLogicOp vk_logic_op_from_d3d12(D3D12_LOGIC_OP op) +{ + switch (op) + { + case D3D12_LOGIC_OP_CLEAR: + return VK_LOGIC_OP_CLEAR; + case D3D12_LOGIC_OP_SET: + return VK_LOGIC_OP_SET; + case D3D12_LOGIC_OP_COPY: + return VK_LOGIC_OP_COPY; + case D3D12_LOGIC_OP_COPY_INVERTED: + return VK_LOGIC_OP_COPY_INVERTED; + case D3D12_LOGIC_OP_NOOP: + return VK_LOGIC_OP_NO_OP; + case D3D12_LOGIC_OP_INVERT: + return VK_LOGIC_OP_INVERT; + case D3D12_LOGIC_OP_AND: + return VK_LOGIC_OP_AND; + case D3D12_LOGIC_OP_NAND: + return VK_LOGIC_OP_NAND; + case D3D12_LOGIC_OP_OR: + return VK_LOGIC_OP_OR; + case D3D12_LOGIC_OP_NOR: + return VK_LOGIC_OP_NOR; + case D3D12_LOGIC_OP_XOR: + return VK_LOGIC_OP_XOR; + case D3D12_LOGIC_OP_EQUIV: + return VK_LOGIC_OP_EQUIVALENT; + case D3D12_LOGIC_OP_AND_REVERSE: + return VK_LOGIC_OP_AND_REVERSE; + case D3D12_LOGIC_OP_AND_INVERTED: + return VK_LOGIC_OP_AND_INVERTED; + case D3D12_LOGIC_OP_OR_REVERSE: + return VK_LOGIC_OP_OR_REVERSE; + case D3D12_LOGIC_OP_OR_INVERTED: + return VK_LOGIC_OP_OR_INVERTED; + default: + FIXME("Unhandled logic op %#x.\n", op); + return VK_LOGIC_OP_NO_OP; + } +} + static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *state, struct d3d12_device *device, const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc) { @@ -2479,6 +2518,15 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s rt_count = ARRAY_SIZE(graphics->blend_attachments); } + graphics->om_logic_op_enable = desc->BlendState.RenderTarget[0].LogicOpEnable + && device->feature_options.OutputMergerLogicOp; + graphics->om_logic_op = graphics->om_logic_op_enable + ? vk_logic_op_from_d3d12(desc->BlendState.RenderTarget[0].LogicOp) + : VK_LOGIC_OP_COPY; + if (desc->BlendState.RenderTarget[0].LogicOpEnable && !graphics->om_logic_op_enable) + WARN("The device does not support output merger logic ops. Ignoring logic op %#x.\n", + desc->BlendState.RenderTarget[0].LogicOp); + graphics->null_attachment_mask = 0; for (i = 0; i < rt_count; ++i) { @@ -3196,8 +3244,8 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta blend_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; blend_desc.pNext = NULL; blend_desc.flags = 0; - blend_desc.logicOpEnable = VK_FALSE; - blend_desc.logicOp = VK_LOGIC_OP_COPY; + blend_desc.logicOpEnable = graphics->om_logic_op_enable; + blend_desc.logicOp = graphics->om_logic_op; blend_desc.attachmentCount = graphics->rt_count; blend_desc.pAttachments = graphics->blend_attachments; blend_desc.blendConstants[0] = D3D12_DEFAULT_BLEND_FACTOR_RED; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 496372e..50d3a33 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -773,6 +773,8 @@ struct d3d12_graphics_pipeline_state size_t instance_divisor_count; size_t attribute_count; + bool om_logic_op_enable; + VkLogicOp om_logic_op; VkPipelineColorBlendAttachmentState blend_attachments[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT]; unsigned int rt_count; unsigned int null_attachment_mask; diff --git a/tests/d3d12.c b/tests/d3d12.c index d538d40..a28c00d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -31155,7 +31155,6 @@ static void test_output_merger_logic_op(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - todo_if(do_test && tests[i].logic_op != D3D12_LOGIC_OP_COPY) check_sub_resource_uint(context.render_target, 0, queue, command_list, do_test ? tests[i].expected_colour : 0x00ff00ff, 1); reset_command_list(command_list, context.allocator);

1 0

Conor McCarthy : tests: Add a test for exporting SV_StencilRef from a pixel shader.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: vkd3d Branch: master Commit: b8ab71e4dc5033b629c50b6b90704d11b5c153a8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b8ab71e4dc5033b629c50b6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Oct 18 18:28:11 2021 +0200 tests: Add a test for exporting SV_StencilRef from a pixel shader. Based on a vkd3d-proton patch by Philip Rebohle. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 181 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 181 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index a28c00d..d69b151 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -614,6 +614,21 @@ static bool is_output_merger_logic_op_supported(ID3D12Device *device) return options.OutputMergerLogicOp; } +static bool is_stencil_ref_export_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.PSSpecifiedStencilRefSupported; +} + #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, @@ -20700,6 +20715,171 @@ static void test_stencil_load(void) destroy_test_context(&context); } +static void test_stencil_export(void) +{ + D3D12_SHADER_RESOURCE_VIEW_DESC stencil_srv_desc; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_DESCRIPTOR_HEAP_DESC heap_desc; + struct depth_stencil_resource ds; + ID3D12PipelineState *pso_sample; + ID3D12RootSignature *rs_sample; + ID3D12DescriptorHeap *srv_heap; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + uint stencil_ref; + + uint main() : SV_StencilRef + { + return stencil_ref; + } +#endif + 0x43425844, 0x3980cb16, 0xbbe87d38, 0xb93f7c61, 0x200c41ed, 0x00000001, 0x000000cc, 0x00000004, + 0x00000030, 0x00000040, 0x00000078, 0x000000bc, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x00000030, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0xffffffff, 0x00000e01, 0x535f5653, 0x636e6574, 0x65526c69, 0xabab0066, 0x58454853, 0x0000003c, + 0x00000050, 0x0000000f, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x02000065, + 0x00029001, 0x05000036, 0x00029001, 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, 0x30494653, + 0x00000008, 0x00000200, 0x00000000, + }; + const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const DWORD ps_sample_code[] = + { +#if 0 + Texture2D<uint4> tex : register(t0); + + uint4 main(float4 pos : SV_Position) : SV_TARGET + { + return tex[uint2(pos.xy)].g; + } +#endif + 0x43425844, 0xdd1e98d4, 0x53c81701, 0x576f6b2e, 0x040b18bb, 0x00000001, 0x0000014c, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x58454853, 0x000000b0, 0x00000050, + 0x0000002c, 0x0100086a, 0x04001858, 0x00107000, 0x00000000, 0x00004444, 0x04002064, 0x00101032, + 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0500001c, + 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8900002d, 0x800000c2, 0x00111103, 0x00100012, + 0x00000000, 0x00100e46, 0x00000000, 0x00107e16, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, + 0x00100006, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_sample = {ps_sample_code, sizeof(ps_sample_code)}; + static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; + + memset(&desc, 0, sizeof(desc)); + desc.rt_width = 640; + desc.rt_height = 480; + desc.rt_format = DXGI_FORMAT_R8_UINT; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + + if (!is_stencil_ref_export_supported(context.device)) + { + skip("The device does not support stencil ref export.\n"); + destroy_test_context(&context); + return; + } + + command_list = context.list; + queue = context.queue; + + init_depth_stencil(&ds, context.device, 640, 480, 1, 1, + DXGI_FORMAT_R32G8X24_TYPELESS, DXGI_FORMAT_D32_FLOAT_S8X24_UINT, NULL); + set_viewport(&context.viewport, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f); + set_rect(&context.scissor_rect, 0, 0, 640, 480); + + context.root_signature = create_32bit_constants_root_signature(context.device, + 0, 1, D3D12_SHADER_VISIBILITY_PIXEL); + + init_pipeline_state_desc(&pso_desc, context.root_signature, 0, NULL, &ps, NULL); + + pso_desc.NumRenderTargets = 0; + pso_desc.DSVFormat = DXGI_FORMAT_D32_FLOAT_S8X24_UINT; + pso_desc.DepthStencilState.StencilEnable = true; + pso_desc.DepthStencilState.StencilReadMask = 0xff; + pso_desc.DepthStencilState.StencilWriteMask = 0xff; + pso_desc.DepthStencilState.FrontFace.StencilFailOp = D3D12_STENCIL_OP_REPLACE; + pso_desc.DepthStencilState.FrontFace.StencilDepthFailOp = D3D12_STENCIL_OP_REPLACE; + pso_desc.DepthStencilState.FrontFace.StencilPassOp = D3D12_STENCIL_OP_REPLACE; + pso_desc.DepthStencilState.FrontFace.StencilFunc = D3D12_COMPARISON_FUNC_ALWAYS; + pso_desc.DepthStencilState.BackFace = pso_desc.DepthStencilState.FrontFace; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + rs_sample = create_texture_root_signature(context.device, D3D12_SHADER_VISIBILITY_PIXEL, 0, 0); + init_pipeline_state_desc(&pso_desc, rs_sample, DXGI_FORMAT_R8_UINT, NULL, &ps_sample, NULL); + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, + &pso_desc, &IID_ID3D12PipelineState, (void **)&pso_sample); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV; + heap_desc.NumDescriptors = 1; + heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE; + heap_desc.NodeMask = 0; + + hr = ID3D12Device_CreateDescriptorHeap(context.device, &heap_desc, + &IID_ID3D12DescriptorHeap, (void **)&srv_heap); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_STENCIL, 0.0f, 0x80, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, NULL, false, &ds.dsv_handle); + ID3D12GraphicsCommandList_OMSetStencilRef(command_list, 0x40); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstant(command_list, 0, 0xff, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + + stencil_srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D; + stencil_srv_desc.Format = DXGI_FORMAT_X32_TYPELESS_G8X24_UINT; + stencil_srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING; + stencil_srv_desc.Texture2D.MostDetailedMip = 0; + stencil_srv_desc.Texture2D.MipLevels = 1; + stencil_srv_desc.Texture2D.PlaneSlice = 1; + stencil_srv_desc.Texture2D.ResourceMinLODClamp = 0.0f; + + ID3D12Device_CreateShaderResourceView(context.device, ds.texture, &stencil_srv_desc, + ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(srv_heap)); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, black, 0, NULL); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &srv_heap); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, rs_sample); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(srv_heap)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso_sample); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint8(context.render_target, 0, queue, command_list, 0xff, 0); + + ID3D12DescriptorHeap_Release(srv_heap); + ID3D12PipelineState_Release(pso_sample); + ID3D12RootSignature_Release(rs_sample); + destroy_depth_stencil(&ds); + destroy_test_context(&context); +} + static void test_typed_buffer_uav(void) { D3D12_CPU_DESCRIPTOR_HANDLE cpu_descriptor_handle; @@ -35500,6 +35680,7 @@ START_TEST(d3d12) run_test(test_depth_load); run_test(test_depth_read_only_view); run_test(test_stencil_load); + run_test(test_stencil_export); run_test(test_typed_buffer_uav); run_test(test_typed_uav_store); run_test(test_compute_shader_registers);

1 0

Conor McCarthy : vkd3d-shader/spirv: Implement support for stencil export.
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: vkd3d Branch: master Commit: 4a2fbe54c057de804b1493c09474166602138540 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4a2fbe54c057de804b1493c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Oct 18 18:28:12 2021 +0200 vkd3d-shader/spirv: Implement support for stencil export. Based on a vkd3d-proton patch by Philip Rebohle. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 1 + libs/vkd3d-shader/dxbc.c | 3 +++ libs/vkd3d-shader/sm4.h | 1 + libs/vkd3d-shader/spirv.c | 20 ++++++++++++++++++++ libs/vkd3d-shader/trace.c | 4 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 6 files changed, 31 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 3ba84a5..4a51b3f 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -651,6 +651,7 @@ enum vkd3d_shader_spirv_extension VKD3D_SHADER_SPIRV_EXTENSION_NONE, VKD3D_SHADER_SPIRV_EXTENSION_EXT_DEMOTE_TO_HELPER_INVOCATION, VKD3D_SHADER_SPIRV_EXTENSION_EXT_DESCRIPTOR_INDEXING, + VKD3D_SHADER_SPIRV_EXTENSION_EXT_STENCIL_EXPORT, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SPIRV_EXTENSION), }; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 44e842d..b83e265 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -885,6 +885,8 @@ static const enum vkd3d_shader_register_type register_type_table[] = /* VKD3D_SM5_RT_GS_INSTANCE_ID */ VKD3DSPR_GSINSTID, /* VKD3D_SM5_RT_DEPTHOUT_GREATER_EQUAL */ VKD3DSPR_DEPTHOUTGE, /* VKD3D_SM5_RT_DEPTHOUT_LESS_EQUAL */ VKD3DSPR_DEPTHOUTLE, + /* VKD3D_SM5_RT_CYCLE_COUNTER */ ~0u, + /* VKD3D_SM5_RT_OUTPUT_STENCIL_REF */ VKD3DSPR_OUTSTENCILREF, }; static const enum vkd3d_shader_register_precision register_precision_table[] = @@ -1252,6 +1254,7 @@ static bool shader_sm4_is_scalar_register(const struct vkd3d_shader_register *re case VKD3DSPR_OUTPOINTID: case VKD3DSPR_PRIMID: case VKD3DSPR_SAMPLEMASK: + case VKD3DSPR_OUTSTENCILREF: return true; default: return false; diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index 3ac41cb..ddcb9a8 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -397,6 +397,7 @@ enum vkd3d_sm4_register_type VKD3D_SM5_RT_GS_INSTANCE_ID = 0x25, VKD3D_SM5_RT_DEPTHOUT_GREATER_EQUAL = 0x26, VKD3D_SM5_RT_DEPTHOUT_LESS_EQUAL = 0x27, + VKD3D_SM5_RT_OUTPUT_STENCIL_REF = 0x29, }; enum vkd3d_sm4_extended_operand_type diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6cf438d..9f6eb88 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1841,6 +1841,8 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageImageArrayDynamicIndexing) || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityShaderNonUniformEXT)) 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 (builder->ext_instr_set_glsl_450) vkd3d_spirv_build_op_ext_inst_import(&stream, builder->ext_instr_set_glsl_450, "GLSL.std.450"); @@ -2903,6 +2905,9 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_PRIMID: /* SPIRV-Tools disassembler generates names for SPIR-V built-ins. */ return false; + case VKD3DSPR_OUTSTENCILREF: + snprintf(buffer, buffer_size, "oStencilRef"); + break; default: FIXME("Unhandled register %#x.\n", reg->type); snprintf(buffer, buffer_size, "unrecognized_%#x", reg->type); @@ -4111,6 +4116,8 @@ vkd3d_register_builtins[] = {VKD3DSPR_DEPTHOUT, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInFragDepth}}, {VKD3DSPR_DEPTHOUTGE, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInFragDepth}}, {VKD3DSPR_DEPTHOUTLE, {VKD3D_SHADER_COMPONENT_FLOAT, 1, SpvBuiltInFragDepth}}, + + {VKD3DSPR_OUTSTENCILREF, {VKD3D_SHADER_COMPONENT_UINT, 1, SpvBuiltInFragStencilRefEXT}}, }; static void vkd3d_dxbc_compiler_emit_register_execution_mode(struct vkd3d_dxbc_compiler *compiler, @@ -4124,6 +4131,18 @@ static void vkd3d_dxbc_compiler_emit_register_execution_mode(struct vkd3d_dxbc_c case VKD3DSPR_DEPTHOUTLE: vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeDepthLess, NULL, 0); break; + case VKD3DSPR_OUTSTENCILREF: + if (!vkd3d_dxbc_compiler_is_target_extension_supported(compiler, + VKD3D_SHADER_SPIRV_EXTENSION_EXT_STENCIL_EXPORT)) + { + FIXME("The target environment does not support stencil export.\n"); + vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_STENCIL_EXPORT_UNSUPPORTED, + "Cannot export stencil reference value for register id %u. " + "The target environment does not support stencil export.", reg->idx[0].offset); + } + vkd3d_spirv_enable_capability(&compiler->spirv_builder, SpvCapabilityStencilExportEXT); + vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeStencilRefReplacingEXT, NULL, 0); + break; default: return; } @@ -4885,6 +4904,7 @@ static void vkd3d_dxbc_compiler_emit_output_register(struct vkd3d_dxbc_compiler reg_symbol.info.reg.dcl_mask = write_mask; reg_symbol.info.reg.is_aggregate = builtin->spirv_array_size; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); + vkd3d_dxbc_compiler_emit_register_execution_mode(compiler, reg); vkd3d_dxbc_compiler_emit_register_debug_name(builder, output_id, reg); } diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index edba0b4..1250503 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1027,6 +1027,10 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const shader_addline(buffer, "vGSInstanceID"); break; + case VKD3DSPR_OUTSTENCILREF: + shader_addline(buffer, "oStencilRef"); + break; + default: shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type); break; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index cacba30..62073cf 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -76,6 +76,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_SPV_INVALID_REGISTER_TYPE = 2001, VKD3D_SHADER_ERROR_SPV_INVALID_DESCRIPTOR_BINDING = 2002, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_IDX_UNSUPPORTED = 2003, + VKD3D_SHADER_ERROR_SPV_STENCIL_EXPORT_UNSUPPORTED = 2004, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY = 3000, VKD3D_SHADER_ERROR_RS_INVALID_VERSION = 3001, @@ -444,6 +445,7 @@ enum vkd3d_shader_register_type VKD3DSPR_DEPTHOUTGE, VKD3DSPR_DEPTHOUTLE, VKD3DSPR_RASTERIZER, + VKD3DSPR_OUTSTENCILREF, VKD3DSPR_INVALID = ~0u, };

1 0

Conor McCarthy : vkd3d: Do not emit a FIXME for UINT_MAX Texture3D.WSize in vkd3d_create_texture_uav().
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: vkd3d Branch: master Commit: c8d94c036dc8d89c21005cff655b9ad2edd7b393 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c8d94c036dc8d89c21005cf… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Oct 18 18:28:07 2021 +0200 vkd3d: Do not emit a FIXME for UINT_MAX Texture3D.WSize in vkd3d_create_texture_uav(). Specifying UINT_MAX here is equivalent to specifying the remaining layers for the mip-level. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 705e720..1c667aa 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2967,7 +2967,8 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, case D3D12_UAV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; - if (desc->u.Texture3D.FirstWSlice || desc->u.Texture3D.WSize != resource->desc.DepthOrArraySize) + if (desc->u.Texture3D.FirstWSlice || (desc->u.Texture3D.WSize != resource->desc.DepthOrArraySize + && desc->u.Texture3D.WSize != UINT_MAX)) FIXME("Unhandled depth view %u-%u.\n", desc->u.Texture3D.FirstWSlice, desc->u.Texture3D.WSize); break;

1 0

Conor McCarthy : vkd3d: Take the mip-level into account for the 3D UAV slice check in vkd3d_create_texture_uav().
by Alexandre Julliard Oct. 18, 2021

Oct. 18, 2021

Module: vkd3d Branch: master Commit: 566eeb046542636116e4367b830fd03b92f3fb74 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=566eeb046542636116e4367… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Oct 18 18:28:08 2021 +0200 vkd3d: Take the mip-level into account for the 3D UAV slice check in vkd3d_create_texture_uav(). Based on a vkd3d-proton patch by Philip Rebohle. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 1c667aa..2887779 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2967,8 +2967,9 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, case D3D12_UAV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; - if (desc->u.Texture3D.FirstWSlice || (desc->u.Texture3D.WSize != resource->desc.DepthOrArraySize - && desc->u.Texture3D.WSize != UINT_MAX)) + if (desc->u.Texture3D.FirstWSlice || (desc->u.Texture3D.WSize != UINT_MAX + && desc->u.Texture3D.WSize != max(1u, + resource->desc.DepthOrArraySize >> desc->u.Texture3D.MipSlice))) FIXME("Unhandled depth view %u-%u.\n", desc->u.Texture3D.FirstWSlice, desc->u.Texture3D.WSize); break;

1 0

Nikolay Sivov : d3d10/effect: Use SamplerState.Texture when setting shader resources.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 69ae2cc7e737e3dd9a6053ff925339c2afb9606c URL: https://source.winehq.org/git/wine.git/?a=commit;h=69ae2cc7e737e3dd9a6053ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 14 09:42:20 2021 +0300 d3d10/effect: Use SamplerState.Texture when setting shader resources. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 24 ++++- dlls/d3d10/tests/effect.c | 245 ++++++++++++++++++++++++++++------------------ 2 files changed, 171 insertions(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=69ae2cc7e737e3dd9a60…

1 0

Nikolay Sivov : d3d10/effect: Use destination index when setting array property element.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: c0e2138ed735fc42c74c65f08d90c07934e82701 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0e2138ed735fc42c74c65f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 14 09:42:19 2021 +0300 d3d10/effect: Use destination index when setting array property element. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 29d59f2620b..6fc69b0df39 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1830,7 +1830,7 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size return E_FAIL; } - *(void **)dst = variable; + ((void **)dst)[idx] = variable; } else { @@ -1888,11 +1888,11 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size case D3D10_SVT_VERTEXSHADER: case D3D10_SVT_PIXELSHADER: case D3D10_SVT_GEOMETRYSHADER: - *(void **)dst = variable; + ((void **)dst)[idx] = variable; *dst_index = variable_idx; break; default: - *(void **)dst = &variable->elements[variable_idx]; + ((void **)dst)[idx] = &variable->elements[variable_idx]; } } else @@ -1957,7 +1957,7 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size return E_FAIL; } - *(void **)dst = variable; + ((void **)dst)[idx] = variable; break;

1 0

Piotr Caban : imm32: Only call ImmSetActiveContext for active window in ImmAssociateContext.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 01e072bb68166c235bfda20874b0fc0065a25e62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01e072bb68166c235bfda208… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 15 15:27:10 2021 +0200 imm32: Only call ImmSetActiveContext for active window in ImmAssociateContext. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 14 ++++++-------- dlls/imm32/tests/imm32.c | 13 +++++++++++-- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 790afc34adc..eea8cdb055e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -592,12 +592,6 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) if (!IsWindow(hWnd) || (hIMC && !data)) return NULL; - /* - * If already associated just return - */ - if (hIMC && data->IMC.hWnd == hWnd) - return hIMC; - if (hIMC && IMM_IsCrossThreadAccess(hWnd, hIMC)) return NULL; @@ -608,6 +602,7 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) else if (old == (HIMC)-1) old = NULL; + /* If already associated just return */ if (old == hIMC) return hIMC; @@ -618,8 +613,11 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) else SetPropW(hWnd, szwWineIMCProperty, hIMC); - ImmSetActiveContext(hWnd, old, FALSE); - ImmSetActiveContext(hWnd, hIMC, TRUE); + if (GetActiveWindow() == hWnd) + { + ImmSetActiveContext(hWnd, old, FALSE); + ImmSetActiveContext(hWnd, hIMC, TRUE); + } return old; } diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 77df36b8e38..f837e3da61b 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -662,6 +662,7 @@ static void test_ImmAssociateContextEx(void) if (imc) { HIMC retimc, newimc; + HWND focus; SET_ENABLE(WM_IME_SETCONTEXT_ACTIVATE, TRUE); SET_ENABLE(WM_IME_SETCONTEXT_DEACTIVATE, TRUE); @@ -703,11 +704,19 @@ static void test_ImmAssociateContextEx(void) ok(retimc == newimc, "handles should be the same\n"); ImmReleaseContext(hwnd,retimc); + focus = CreateWindowA("button", "button", 0, 0, 0, 0, 0, 0, 0, 0, 0); + ok(focus != NULL, "CreateWindow failed\n"); SET_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); + SetFocus(focus); + todo_wine CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); + rc = pImmAssociateContextEx(hwnd, imc, 0); + ok(rc, "ImmAssociateContextEx failed\n"); SET_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); + DestroyWindow(focus); + todo_wine CHECK_CALLED(WM_IME_SETCONTEXT_ACTIVATE); + SetFocus(hwnd); + rc = pImmAssociateContextEx(hwnd, NULL, IACE_DEFAULT); - CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); - CHECK_CALLED(WM_IME_SETCONTEXT_ACTIVATE); ok(rc, "ImmAssociateContextEx failed\n"); SET_ENABLE(WM_IME_SETCONTEXT_ACTIVATE, FALSE);

1 0

Piotr Caban : winex11.drv: Silence ImeSetActiveContext fixme.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 0925a730272ed0c97f64c3365ebe542401f60d7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0925a730272ed0c97f64c336… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 15 15:27:40 2021 +0200 winex11.drv: Silence ImeSetActiveContext fixme. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/ime.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index dfeed2cb1e6..c1584930861 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -620,7 +620,10 @@ BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect) BOOL WINAPI ImeSetActiveContext(HIMC hIMC,BOOL fFlag) { - FIXME("(%p, %x): stub\n", hIMC, fFlag); + static int once; + + if (!once++) + FIXME("(%p, %x): stub\n", hIMC, fFlag); return TRUE; }

1 0

Piotr Caban : imm32: Exit on invalid window in ImmAssociateContext.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 266c1101b3e0e0297b6062a4d34b2b766b4c9d33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=266c1101b3e0e0297b6062a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 15 15:26:57 2021 +0200 imm32: Exit on invalid window in ImmAssociateContext. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index d933ca06c2f..cbcc70daedf 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -583,12 +583,13 @@ BOOL WINAPI ImmSetActiveContext(HWND hwnd, HIMC himc, BOOL activate) */ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) { - HIMC old = NULL; InputContextData *data = get_imc_data(hIMC); + HIMC defaultContext; + HIMC old; TRACE("(%p, %p):\n", hWnd, hIMC); - if(hIMC && !data) + if (!IsWindow(hWnd) || (hIMC && !data)) return NULL; /* @@ -600,30 +601,26 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) if (hIMC && IMM_IsCrossThreadAccess(hWnd, hIMC)) return NULL; - if (hWnd) - { - HIMC defaultContext = get_default_context( hWnd ); - old = RemovePropW(hWnd,szwWineIMCProperty); + defaultContext = get_default_context( hWnd ); + old = RemovePropW(hWnd, szwWineIMCProperty); + if (old == NULL) + old = defaultContext; + else if (old == (HIMC)-1) + old = NULL; - if (old == NULL) - old = defaultContext; - else if (old == (HIMC)-1) - old = NULL; - - if (hIMC != defaultContext) - { - if (hIMC == NULL) /* Meaning disable imm for that window*/ - SetPropW(hWnd,szwWineIMCProperty,(HANDLE)-1); - else - SetPropW(hWnd,szwWineIMCProperty,hIMC); - } + if (hIMC != defaultContext) + { + if (hIMC == NULL) /* Meaning disable imm for that window*/ + SetPropW(hWnd, szwWineIMCProperty, (HANDLE)-1); + else + SetPropW(hWnd, szwWineIMCProperty, hIMC); + } - if (old) - { - InputContextData *old_data = old; - if (old_data->IMC.hWnd == hWnd) - old_data->IMC.hWnd = NULL; - } + if (old) + { + InputContextData *old_data = old; + if (old_data->IMC.hWnd == hWnd) + old_data->IMC.hWnd = NULL; } if (!hIMC)

1 0