May 2019 - Wine-commits - list.winehq.org

Zebediah Figura : quartz/vmr9: Use strmbase_renderer_cleanup().
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 44dbf4afbfe5d5d2f3e73022a225f7c4e546a559 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44dbf4afbfe5d5d2f3e73022… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 15 18:16:57 2019 -0500 quartz/vmr9: Use strmbase_renderer_cleanup(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 2a39d11..3d22f12 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -826,7 +826,7 @@ static ULONG WINAPI VMR9Inner_AddRef(IUnknown * iface) static ULONG WINAPI VMR9Inner_Release(IUnknown * iface) { struct quartz_vmr *This = impl_from_inner_IUnknown(iface); - ULONG refCount = BaseRendererImpl_Release(&This->renderer.filter.IBaseFilter_iface); + ULONG refCount = InterlockedDecrement(&This->renderer.filter.refCount); TRACE("(%p/%p)->() Release from %d\n", This, iface, refCount + 1); @@ -848,6 +848,7 @@ static ULONG WINAPI VMR9Inner_Release(IUnknown * iface) } FreeLibrary(This->hD3d9); + strmbase_renderer_cleanup(&This->renderer); CoTaskMemFree(This); } return refCount; @@ -2442,7 +2443,7 @@ static HRESULT vmr_create(IUnknown *outer_unk, LPVOID *ppv, const CLSID *clsid) return hr; fail: - BaseRendererImpl_Release(&pVMR->renderer.filter.IBaseFilter_iface); + strmbase_renderer_cleanup(&pVMR->renderer); FreeLibrary(pVMR->hD3d9); CoTaskMemFree(pVMR); return hr;

1 0

Zebediah Figura : quartz/dsoundrender: Use strmbase_renderer_cleanup().
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: cd131ca0262fe6da8a04a58bbd3e8dab6f81fe8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd131ca0262fe6da8a04a58b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 15 18:16:58 2019 -0500 quartz/dsoundrender: Use strmbase_renderer_cleanup(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index f92ab41..b9eb149 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -680,7 +680,7 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) } else { - BaseRendererImpl_Release(&pDSoundRender->renderer.filter.IBaseFilter_iface); + strmbase_renderer_cleanup(&pDSoundRender->renderer); CoTaskMemFree(pDSoundRender); } @@ -725,7 +725,7 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) { DSoundRenderImpl *This = impl_from_IBaseFilter(iface); - ULONG refCount = BaseRendererImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->renderer.filter.refCount); TRACE("(%p)->() Release from %d\n", This, refCount + 1); @@ -748,6 +748,7 @@ static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) CloseHandle(This->blocked); TRACE("Destroying Audio Renderer\n"); + strmbase_renderer_cleanup(&This->renderer); CoTaskMemFree(This); return 0;

1 0

Zebediah Figura : qedit/nullrenderer: Use strmbase_renderer_cleanup().
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 3855216cb3830aa4e6d73c66c19fdc330f14c4df URL: https://source.winehq.org/git/wine.git/?a=commit;h=3855216cb3830aa4e6d73c66… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 15 18:16:59 2019 -0500 qedit/nullrenderer: Use strmbase_renderer_cleanup(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/nullrenderer.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index c19a90d..6ba70cb 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -113,11 +113,12 @@ static ULONG WINAPI NullRendererInner_AddRef(IUnknown *iface) static ULONG WINAPI NullRendererInner_Release(IUnknown *iface) { NullRendererImpl *This = impl_from_IUnknown(iface); - ULONG refCount = BaseRendererImpl_Release(&This->renderer.filter.IBaseFilter_iface); + ULONG refCount = InterlockedDecrement(&This->renderer.filter.refCount); if (!refCount) { TRACE("Destroying Null Renderer\n"); + strmbase_renderer_cleanup(&This->renderer); CoTaskMemFree(This); } @@ -234,10 +235,7 @@ HRESULT NullRenderer_create(IUnknown *pUnkOuter, void **ppv) (DWORD_PTR)(__FILE__ ": NullRendererImpl.csFilter"), &RendererFuncTable); if (FAILED(hr)) - { - BaseRendererImpl_Release(&pNullRenderer->renderer.filter.IBaseFilter_iface); CoTaskMemFree(pNullRenderer); - } else *ppv = &pNullRenderer->IUnknown_inner;

1 0

Józef Kucia : vkd3d: Update current framebuffer before pipeline.
by Alexandre Julliard 16 May '19

16 May '19

Module: vkd3d Branch: master Commit: 54dcb2901b01ff6e258fc51ea8f48aec4e81b6bb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=54dcb2901b01ff6e258fc51… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 15 13:17:54 2019 +0200 vkd3d: Update current framebuffer before pipeline. Framebuffers are created with a render pass from the graphics pipeline. In the next commits, we defer the creation of render passes for graphics pipelines with invalid DSV formats. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index e4221c9..8c7057b 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2787,10 +2787,10 @@ static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list return false; } - if (!d3d12_command_list_update_current_framebuffer(list)) - return false; if (!d3d12_command_list_update_current_pipeline(list)) return false; + if (!d3d12_command_list_update_current_framebuffer(list)) + return false; d3d12_command_list_update_descriptors(list, VK_PIPELINE_BIND_POINT_GRAPHICS);

1 0

Józef Kucia : vkd3d: Introduce helper to create render pass for pipeline state.
by Alexandre Julliard 16 May '19

16 May '19

Module: vkd3d Branch: master Commit: 99c3e383dd408d5ee41e3ab6def2582c051b9b3f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=99c3e383dd408d5ee41e3ab… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 15 13:17:55 2019 +0200 vkd3d: Introduce helper to create render pass for pipeline state. Signed-off-by: Józef Kucia <jkucia(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 | 73 ++++++++++++++++++++++++++++------------------ libs/vkd3d/vkd3d_private.h | 2 ++ 2 files changed, 47 insertions(+), 28 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index bc59b01..b1f4ef9 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2051,6 +2051,40 @@ bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_ STATIC_ASSERT(sizeof(struct vkd3d_shader_transform_feedback_element) == sizeof(D3D12_SO_DECLARATION_ENTRY)); +static HRESULT d3d12_graphics_pipeline_state_create_render_pass( + struct d3d12_graphics_pipeline_state *graphics, struct d3d12_device *device) +{ + struct vkd3d_render_pass_key key; + unsigned int i; + + if (graphics->rt_idx) + { + assert(graphics->ds_desc.front.writeMask == graphics->ds_desc.back.writeMask); + key.depth_enable = graphics->ds_desc.depthTestEnable; + key.stencil_enable = graphics->ds_desc.stencilTestEnable; + key.depth_stencil_write = graphics->ds_desc.depthWriteEnable + || graphics->ds_desc.front.writeMask; + key.vk_formats[0] = graphics->dsv_format; + } + else + { + key.depth_enable = false; + key.stencil_enable = false; + key.depth_stencil_write = false; + key.vk_formats[ARRAY_SIZE(key.vk_formats) - 1] = VK_FORMAT_UNDEFINED; + } + + memcpy(&key.vk_formats[graphics->rt_idx], graphics->rtv_formats, sizeof(graphics->rtv_formats)); + for (i = graphics->attachment_count; i < ARRAY_SIZE(key.vk_formats); ++i) + assert(key.vk_formats[i] == VK_FORMAT_UNDEFINED); + + key.attachment_count = graphics->attachment_count; + key.padding = 0; + key.sample_count = graphics->ms_desc.rasterizationSamples; + + return vkd3d_render_pass_cache_find(&device->render_pass_cache, device, &key, &graphics->render_pass); +} + static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *state, struct d3d12_device *device, const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc) { @@ -2069,7 +2103,6 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s struct vkd3d_shader_interface_info shader_interface; const struct d3d12_root_signature *root_signature; struct vkd3d_shader_signature input_signature; - struct vkd3d_render_pass_key render_pass_key; VkShaderStageFlagBits xfb_stage = 0; VkSampleCountFlagBits sample_count; const struct vkd3d_format *format; @@ -2153,8 +2186,6 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (desc->DSVFormat != DXGI_FORMAT_UNKNOWN && (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable)) { - const D3D12_DEPTH_STENCIL_DESC *ds_desc = &desc->DepthStencilState; - if (!(format = vkd3d_get_format(device, desc->DSVFormat, true))) { WARN("Invalid DSV format %#x.\n", desc->DSVFormat); @@ -2165,11 +2196,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (!(format->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) FIXME("Format %#x is not depth/stencil format.\n", format->dxgi_format); - render_pass_key.depth_enable = desc->DepthStencilState.DepthEnable; - render_pass_key.stencil_enable = desc->DepthStencilState.StencilEnable; - render_pass_key.depth_stencil_write = (ds_desc->DepthEnable && ds_desc->DepthWriteMask) - || (ds_desc->StencilEnable && ds_desc->StencilWriteMask); - render_pass_key.vk_formats[0] = format->vk_format; + graphics->dsv_format = format->vk_format; ++graphics->rt_idx; if (!desc->PS.pShaderBytecode) @@ -2181,28 +2208,21 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ++graphics->stage_count; } } - else - { - render_pass_key.depth_enable = false; - render_pass_key.stencil_enable = false; - render_pass_key.depth_stencil_write = false; - } for (i = 0; i < rt_count; ++i) { const D3D12_RENDER_TARGET_BLEND_DESC *rt_desc; - size_t idx = graphics->rt_idx + i; if (desc->RTVFormats[i] == DXGI_FORMAT_UNKNOWN) { - graphics->null_attachment_mask |= 1u << idx; + graphics->null_attachment_mask |= 1u << i; ps_output_swizzle[i] = VKD3D_NO_SWIZZLE; - render_pass_key.vk_formats[idx] = VK_FORMAT_UNDEFINED; + graphics->rtv_formats[i] = VK_FORMAT_UNDEFINED; } else if ((format = vkd3d_get_format(device, desc->RTVFormats[i], false))) { ps_output_swizzle[i] = vkd3d_get_rt_format_swizzle(format); - render_pass_key.vk_formats[idx] = format->vk_format; + graphics->rtv_formats[i] = format->vk_format; } else { @@ -2227,8 +2247,12 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s blend_attachment_from_d3d12(&graphics->blend_attachments[i], rt_desc); } + graphics->null_attachment_mask <<= graphics->rt_idx; graphics->attachment_count = graphics->rt_idx + rt_count; + for (i = rt_count; i < ARRAY_SIZE(graphics->rtv_formats); ++i) + graphics->rtv_formats[i] = VK_FORMAT_UNDEFINED; + ps_shader_parameters[0].name = VKD3D_SHADER_PARAMETER_NAME_RASTERIZER_SAMPLE_COUNT; ps_shader_parameters[0].type = VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT; ps_shader_parameters[0].data_type = VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32; @@ -2486,16 +2510,6 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } - render_pass_key.attachment_count = graphics->attachment_count; - render_pass_key.padding = 0; - render_pass_key.sample_count = sample_count; - for (i = render_pass_key.attachment_count; i < ARRAY_SIZE(render_pass_key.vk_formats); ++i) - render_pass_key.vk_formats[i] = VK_FORMAT_UNDEFINED; - - if (FAILED(hr = vkd3d_render_pass_cache_find(&device->render_pass_cache, device, - &render_pass_key, &graphics->render_pass))) - goto fail; - rs_desc_from_d3d12(&graphics->rs_desc, &desc->RasterizerState); if ((!graphics->attachment_count && !(desc->PS.pShaderBytecode && desc->PS.BytecodeLength)) || so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM) @@ -2524,6 +2538,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ds_desc_from_d3d12(&graphics->ds_desc, &desc->DepthStencilState); + if (FAILED(hr = d3d12_graphics_pipeline_state_create_render_pass(graphics, device))) + goto fail; + graphics->root_signature = root_signature; list_init(&graphics->compiled_pipelines); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 402ac0a..4ae6afe 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -676,6 +676,8 @@ struct d3d12_graphics_pipeline_state VkPipelineColorBlendAttachmentState blend_attachments[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT]; unsigned int attachment_count, rt_idx; unsigned int null_attachment_mask; + VkFormat dsv_format; + VkFormat rtv_formats[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT]; VkRenderPass render_pass; D3D12_INDEX_BUFFER_STRIP_CUT_VALUE index_buffer_strip_cut_value;

1 0

Józef Kucia : vkd3d: Do not disable depth-stencil tests for PSOs with invalid DSV format.
by Alexandre Julliard 16 May '19

16 May '19

Module: vkd3d Branch: master Commit: 9eba55403d9a3b9cd58f76a6f14ddf5f745df73a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9eba55403d9a3b9cd58f76a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 15 13:17:56 2019 +0200 vkd3d: Do not disable depth-stencil tests for PSOs with invalid DSV format. This is invalid usage according to the D3D12 validation layer. However, Shadow of the Tomb Raider uses PSOs with DSVFormat equal to DXGI_FORMAT_UNKNOWN and enabled depth-stencil tests. Moreover, the test in the next commit passes on Windows with AMD, Intel and Nvidia GPUs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 14 +++++++-- libs/vkd3d/state.c | 78 +++++++++++++++++++++++++++++++++------------- libs/vkd3d/vkd3d_private.h | 5 ++- 3 files changed, 72 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=9eba55403d9a3b9cd58…

1 0

Józef Kucia : tests: Add test for DSVFormat equal to DXGI_FORMAT_UNKNOWN.
by Alexandre Julliard 16 May '19

16 May '19

Module: vkd3d Branch: master Commit: 2482af566d1ff975a7639758d7295229542d52b9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2482af566d1ff975a763975… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 15 13:17:57 2019 +0200 tests: Add test for DSVFormat equal to DXGI_FORMAT_UNKNOWN. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 82264c0..529f5e9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4839,6 +4839,105 @@ static void test_unknown_rtv_format(void) destroy_test_context(&context); } +static void test_unknown_dsv_format(void) +{ + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + struct depth_stencil_resource ds; + D3D12_CLEAR_VALUE clear_value; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + HRESULT hr; + + static const DWORD ps_color_code[] = + { +#if 0 + float4 color; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + return color; + } +#endif + 0x43425844, 0xd18ead43, 0x8b8264c1, 0x9c0a062d, 0xfc843226, 0x00000001, 0x000000e0, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000044, 0x00000050, + 0x00000011, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x06000036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_color = {ps_color_code, sizeof(ps_color_code)}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + + memset(&desc, 0, sizeof(desc)); + desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + clear_value.Format = DXGI_FORMAT_D32_FLOAT; + clear_value.DepthStencil.Depth = 0.5f; + clear_value.DepthStencil.Stencil = 0; + init_depth_stencil(&ds, context.device, 32, 32, 1, 1, DXGI_FORMAT_D32_FLOAT, 0, &clear_value); + + context.root_signature = create_32bit_constants_root_signature(context.device, + 0, 4, D3D12_SHADER_VISIBILITY_PIXEL); + + /* DSVFormat = DXGI_FORMAT_UNKNOWN and D3D12_DEPTH_WRITE_MASK_ZERO */ + init_pipeline_state_desc(&pso_desc, context.root_signature, desc.rt_format, NULL, &ps_color, NULL); + pso_desc.DSVFormat = DXGI_FORMAT_UNKNOWN; + pso_desc.DepthStencilState.DepthEnable = TRUE; + pso_desc.DepthStencilState.DepthWriteMask = D3D12_DEPTH_WRITE_MASK_ZERO; + pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_EQUAL; + hr = ID3D12Device_CreateGraphicsPipelineState(context.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_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, 0.5f, 0, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, &ds.dsv_handle); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &green.x, 0); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.5f, 0.5f); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &red.x, 0); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 1.0f, 1.0f); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.0f, 0.0f); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.55f, 0.55f); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_float(ds.texture, 0, queue, command_list, 0.5f, 1); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_vec4(context.render_target, 0, queue, command_list, &green, 0); + + destroy_depth_stencil(&ds); + destroy_test_context(&context); +} + static void test_append_aligned_element(void) { ID3D12GraphicsCommandList *command_list; @@ -29055,6 +29154,7 @@ START_TEST(d3d12) run_test(test_draw_no_descriptor_bindings); run_test(test_multiple_render_targets); run_test(test_unknown_rtv_format); + run_test(test_unknown_dsv_format); run_test(test_append_aligned_element); run_test(test_gpu_virtual_address); run_test(test_fragment_coords);

1 0

Józef Kucia : vkd3d: Implement NULL vertex buffer views.
by Alexandre Julliard 16 May '19

16 May '19

Module: vkd3d Branch: master Commit: 9bbd520e898009703c0e5f13e06ddf1ca077af5c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9bbd520e898009703c0e5f1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 15 13:17:58 2019 +0200 vkd3d: Implement NULL vertex buffer views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 22 +++++++++------------- libs/vkd3d/resource.c | 28 ++++++++++++++-------------- libs/vkd3d/vkd3d_private.h | 4 ++-- 3 files changed, 25 insertions(+), 29 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 861c840..16c40ce 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4186,17 +4186,19 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi UINT start_slot, UINT view_count, const D3D12_VERTEX_BUFFER_VIEW *views) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList1(iface); + const struct vkd3d_null_resources *null_resources; struct vkd3d_gpu_va_allocator *gpu_va_allocator; VkDeviceSize offsets[ARRAY_SIZE(list->strides)]; const struct vkd3d_vk_device_procs *vk_procs; VkBuffer buffers[ARRAY_SIZE(list->strides)]; - unsigned int i, first, count, stride; struct d3d12_resource *resource; bool invalidate = false; + unsigned int i, stride; TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); vk_procs = &list->device->vk_procs; + null_resources = &list->device->null_resources; gpu_va_allocator = &list->device->gpu_va_allocator; if (start_slot >= ARRAY_SIZE(list->strides) || view_count > ARRAY_SIZE(list->strides) - start_slot) @@ -4205,25 +4207,19 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi return; } - count = 0; - first = start_slot; for (i = 0; i < view_count; ++i) { if (views[i].BufferLocation) { resource = vkd3d_gpu_va_allocator_dereference(gpu_va_allocator, views[i].BufferLocation); - buffers[count] = resource->u.vk_buffer; - offsets[count] = views[i].BufferLocation - resource->gpu_address; + buffers[i] = resource->u.vk_buffer; + offsets[i] = views[i].BufferLocation - resource->gpu_address; stride = views[i].StrideInBytes; - ++count; } else { - if (count) - VK_CALL(vkCmdBindVertexBuffers(list->vk_command_buffer, first, count, buffers, offsets)); - count = 0; - first = start_slot + i + 1; - + buffers[i] = null_resources->vk_buffer; + offsets[i] = 0; stride = 0; } @@ -4231,8 +4227,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetVertexBuffers(ID3D12Graphi list->strides[start_slot + i] = stride; } - if (count) - VK_CALL(vkCmdBindVertexBuffers(list->vk_command_buffer, first, count, buffers, offsets)); + if (view_count) + VK_CALL(vkCmdBindVertexBuffers(list->vk_command_buffer, start_slot, view_count, buffers, offsets)); if (invalidate) d3d12_command_list_invalidate_current_pipeline(list); diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 36fcb22..4a6af7f 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -18,7 +18,7 @@ #include "vkd3d_private.h" -#define VKD3D_NULL_CBV_BUFFER_SIZE 4 +#define VKD3D_NULL_BUFFER_SIZE 16 #define VKD3D_NULL_VIEW_FORMAT DXGI_FORMAT_R8G8B8A8_UNORM static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32_t memory_type_mask, @@ -2005,9 +2005,9 @@ void d3d12_desc_create_cbv(struct d3d12_desc *descriptor, else { /* NULL descriptor */ - buffer_info->buffer = device->null_resources.vk_uniform_buffer; + buffer_info->buffer = device->null_resources.vk_buffer; buffer_info->offset = 0; - buffer_info->range = VKD3D_NULL_CBV_BUFFER_SIZE; + buffer_info->range = VKD3D_NULL_BUFFER_SIZE; } descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_CBV; @@ -3235,7 +3235,7 @@ static HRESULT vkd3d_init_null_resources_data(struct vkd3d_null_resources *null_ } /* fill CBV buffer */ - VK_CALL(vkCmdFillBuffer(vk_command_buffer, null_resource->vk_uniform_buffer, 0, VK_WHOLE_SIZE, 0x00000000)); + VK_CALL(vkCmdFillBuffer(vk_command_buffer, null_resource->vk_buffer, 0, VK_WHOLE_SIZE, 0x00000000)); /* transition 2D SRV image */ barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; @@ -3322,7 +3322,7 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, /* CBV */ resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; resource_desc.Alignment = 0; - resource_desc.Width = VKD3D_NULL_CBV_BUFFER_SIZE; + resource_desc.Width = VKD3D_NULL_BUFFER_SIZE; resource_desc.Height = 1; resource_desc.DepthOrArraySize = 1; resource_desc.MipLevels = 1; @@ -3333,10 +3333,10 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, resource_desc.Flags = D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE; if (FAILED(hr = vkd3d_create_buffer(device, &heap_properties, D3D12_HEAP_FLAG_NONE, - &resource_desc, &null_resources->vk_uniform_buffer))) + &resource_desc, &null_resources->vk_buffer))) goto fail; - if (FAILED(hr = vkd3d_allocate_buffer_memory(device, null_resources->vk_uniform_buffer, - &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_uniform_buffer_memory))) + if (FAILED(hr = vkd3d_allocate_buffer_memory(device, null_resources->vk_buffer, + &heap_properties, D3D12_HEAP_FLAG_NONE, &null_resources->vk_buffer_memory))) goto fail; /* 2D SRV */ @@ -3360,10 +3360,10 @@ HRESULT vkd3d_init_null_resources(struct vkd3d_null_resources *null_resources, goto fail; /* set Vulkan object names */ - vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_uniform_buffer, - VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT, "NULL CBV buffer"); - vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_uniform_buffer_memory, - VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL CBV memory"); + vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_buffer, + VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_EXT, "NULL buffer"); + vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_buffer_memory, + VK_DEBUG_REPORT_OBJECT_TYPE_DEVICE_MEMORY_EXT, "NULL memory"); vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_2d_image, VK_DEBUG_REPORT_OBJECT_TYPE_IMAGE_EXT, "NULL 2D SRV image"); vkd3d_set_vk_object_name_utf8(device, (uint64_t)null_resources->vk_2d_image_memory, @@ -3382,8 +3382,8 @@ void vkd3d_destroy_null_resources(struct vkd3d_null_resources *null_resources, { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - VK_CALL(vkDestroyBuffer(device->vk_device, null_resources->vk_uniform_buffer, NULL)); - VK_CALL(vkFreeMemory(device->vk_device, null_resources->vk_uniform_buffer_memory, NULL)); + VK_CALL(vkDestroyBuffer(device->vk_device, null_resources->vk_buffer, NULL)); + VK_CALL(vkFreeMemory(device->vk_device, null_resources->vk_buffer_memory, NULL)); VK_CALL(vkDestroyImage(device->vk_device, null_resources->vk_2d_image, NULL)); VK_CALL(vkFreeMemory(device->vk_device, null_resources->vk_2d_image_memory, NULL)); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 3fd1eac..002eeac 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -960,8 +960,8 @@ struct d3d12_command_signature *unsafe_impl_from_ID3D12CommandSignature(ID3D12Co /* NULL resources */ struct vkd3d_null_resources { - VkBuffer vk_uniform_buffer; - VkDeviceMemory vk_uniform_buffer_memory; + VkBuffer vk_buffer; + VkDeviceMemory vk_buffer_memory; VkImage vk_2d_image; VkDeviceMemory vk_2d_image_memory;

1 0

Józef Kucia : tests: Add test for NULL VBV.
by Alexandre Julliard 16 May '19

16 May '19

Module: vkd3d Branch: master Commit: e4f78a2433e0011d73b726c88bc54fe64871353c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e4f78a2433e0011d73b726c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 15 13:17:59 2019 +0200 tests: Add test for NULL VBV. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 529f5e9..305d087 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -17040,6 +17040,129 @@ static void test_null_srv(void) destroy_test_context(&context); } +static void test_null_vbv(void) +{ + ID3D12GraphicsCommandList *command_list; + D3D12_INPUT_LAYOUT_DESC input_layout; + D3D12_VERTEX_BUFFER_VIEW vbv[2]; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Resource *vb; + + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"SV_POSITION", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D12_APPEND_ALIGNED_ELEMENT, + D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 1, D3D12_APPEND_ALIGNED_ELEMENT, + D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const DWORD vs_code[] = + { +#if 0 + struct vs_data + { + float4 pos : SV_POSITION; + float4 color : COLOR; + }; + + void main(in struct vs_data vs_input, out struct vs_data vs_output) + { + vs_output.pos = vs_input.pos; + vs_output.color = vs_input.color; + } +#endif + 0x43425844, 0xd5b32785, 0x35332906, 0x4d05e031, 0xf66a58af, 0x00000001, 0x00000144, 0x00000003, + 0x0000002c, 0x00000080, 0x000000d4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x00000068, 0x00010040, + 0x0000001a, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, 0x04000067, + 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001, + 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const DWORD ps_code[] = + { +#if 0 + struct ps_data + { + float4 pos : SV_POSITION; + float4 color : COLOR; + }; + + float4 main(struct ps_data ps_input) : SV_Target + { + return ps_input.color; + } +#endif + 0x43425844, 0x89803e59, 0x3f798934, 0xf99181df, 0xf5556512, 0x00000001, 0x000000f4, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const struct vec4 positions[] = + { + {-1.0f, -1.0f, 0.0f, 1.0f}, + {-1.0f, 1.0f, 0.0f, 1.0f}, + { 1.0f, -1.0f, 0.0f, 1.0f}, + { 1.0f, 1.0f, 0.0f, 1.0f}, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + context.root_signature = create_empty_root_signature(context.device, + D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT); + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, &vs, &ps, &input_layout); + + vb = create_upload_buffer(context.device, sizeof(positions), positions); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + + vbv[0].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); + vbv[0].StrideInBytes = sizeof(*positions); + vbv[0].SizeInBytes = sizeof(positions); + vbv[1] = vbv[0]; + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + vbv[1].BufferLocation = 0; + vbv[1].StrideInBytes = 0; + vbv[1].SizeInBytes = 0; + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 4, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0); + + ID3D12Resource_Release(vb); + destroy_test_context(&context); +} + #define check_copyable_footprints(a, b, c, d, e, f, g, h) \ check_copyable_footprints_(__LINE__, a, b, c, d, e, f, g, h) static void check_copyable_footprints_(unsigned int line, const D3D12_RESOURCE_DESC *desc, @@ -29200,6 +29323,7 @@ START_TEST(d3d12) run_test(test_create_null_descriptors); run_test(test_null_cbv); run_test(test_null_srv); + run_test(test_null_vbv); run_test(test_get_copyable_footprints); run_test(test_depth_clip); run_test(test_depth_stencil_sampling);

1 0

Józef Kucia : vkd3d: Add warning for unbinding transform feedback buffers.
by Alexandre Julliard 16 May '19

16 May '19

Module: vkd3d Branch: master Commit: 74f068f86914f12f14e15ac33999b046713af99c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=74f068f86914f12f14e15ac… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 15 13:18:00 2019 +0200 vkd3d: Add warning for unbinding transform feedback buffers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 16c40ce..edf13d6 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4290,6 +4290,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_SOSetTargets(ID3D12GraphicsComm list->so_counter_buffers[start_slot + i] = VK_NULL_HANDLE; list->so_counter_buffer_offsets[start_slot + i] = 0; + + WARN("Trying to unbind transform feedback buffer %u. Ignoring.\n", start_slot + i); } }

1 0