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

[PATCH vkd3d 6/8] tests: Add test for NULL VBV.
by Józef Kucia 16 May '19

16 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 529f5e9e9e44..305d08776de2 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); -- 2.21.0

2 1

[PATCH vkd3d 3/8] vkd3d: Do not disable depth-stencil tests for PSOs with invalid DSV format.
by Józef Kucia 16 May '19

16 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> 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> --- libs/vkd3d/command.c | 14 +++++-- libs/vkd3d/state.c | 78 ++++++++++++++++++++++++++++---------- libs/vkd3d/vkd3d_private.h | 5 ++- 3 files changed, 72 insertions(+), 25 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 8c7057b36340..861c8405c3e6 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2251,11 +2251,13 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, list->fb_width = 0; list->fb_height = 0; list->fb_layer_count = 0; + list->dsv_format = VK_FORMAT_UNDEFINED; list->xfb_enabled = false; list->current_framebuffer = VK_NULL_HANDLE; list->current_pipeline = VK_NULL_HANDLE; + list->pso_render_pass = VK_NULL_HANDLE; list->current_render_pass = VK_NULL_HANDLE; memset(list->pipeline_bindings, 0, sizeof(list->pipeline_bindings)); @@ -2370,7 +2372,7 @@ static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_l fb_desc.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO; fb_desc.pNext = NULL; fb_desc.flags = 0; - fb_desc.renderPass = graphics->render_pass; + fb_desc.renderPass = list->pso_render_pass; fb_desc.attachmentCount = view_count; fb_desc.pAttachments = views; d3d12_command_list_get_fb_extent(list, &fb_desc.width, &fb_desc.height, &fb_desc.layers); @@ -2407,9 +2409,12 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list } if (!(vk_pipeline = d3d12_pipeline_state_get_or_create_pipeline(list->state, - list->primitive_topology, list->strides))) + list->primitive_topology, list->strides, list->dsv_format, &list->pso_render_pass))) return false; + if (!list->pso_render_pass) + list->pso_render_pass = list->state->u.graphics.render_pass; + VK_CALL(vkCmdBindPipeline(list->vk_command_buffer, list->state->vk_bind_point, vk_pipeline)); list->current_pipeline = vk_pipeline; @@ -2797,7 +2802,8 @@ static bool d3d12_command_list_begin_render_pass(struct d3d12_command_list *list if (list->current_render_pass != VK_NULL_HANDLE) return true; - vk_render_pass = list->state->u.graphics.render_pass; + vk_render_pass = list->pso_render_pass; + assert(vk_render_pass); begin_desc.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO; begin_desc.pNext = NULL; @@ -4373,11 +4379,13 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi list->fb_width = max(list->fb_width, dsv_desc->width); list->fb_height = max(list->fb_height, dsv_desc->height); list->fb_layer_count = max(list->fb_layer_count, dsv_desc->layer_count); + list->dsv_format = dsv_desc->format; } else { WARN("DSV descriptor is not initialized.\n"); list->views[0] = VK_NULL_HANDLE; + list->dsv_format = VK_FORMAT_UNDEFINED; } } diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index b1f4ef9acac1..457f3d9bc84b 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1236,6 +1236,7 @@ struct vkd3d_pipeline_key { D3D12_PRIMITIVE_TOPOLOGY topology; uint32_t strides[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; + VkFormat dsv_format; }; struct vkd3d_compiled_pipeline @@ -1243,6 +1244,7 @@ struct vkd3d_compiled_pipeline struct list entry; struct vkd3d_pipeline_key key; VkPipeline vk_pipeline; + VkRenderPass vk_render_pass; }; /* ID3D12PipelineState */ @@ -2052,7 +2054,8 @@ 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 d3d12_graphics_pipeline_state *graphics, struct d3d12_device *device, + VkFormat dynamic_dsv_format, VkRenderPass *vk_render_pass) { struct vkd3d_render_pass_key key; unsigned int i; @@ -2064,7 +2067,12 @@ static HRESULT d3d12_graphics_pipeline_state_create_render_pass( 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; + + if (!(key.vk_formats[0] = graphics->dsv_format)) + key.vk_formats[0] = dynamic_dsv_format; + + if (!key.vk_formats[0]) + FIXME("Compiling with DXGI_FORMAT_UNKNOWN.\n"); } else { @@ -2082,7 +2090,7 @@ static HRESULT d3d12_graphics_pipeline_state_create_render_pass( 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); + return vkd3d_render_pass_cache_find(&device->render_pass_cache, device, &key, vk_render_pass); } static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *state, @@ -2177,26 +2185,29 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s rt_count = ARRAY_SIZE(graphics->blend_attachments); } - if (desc->DSVFormat == DXGI_FORMAT_UNKNOWN - && (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable)) - FIXME("DSV format is DXGI_FORMAT_UNKNOWN, disabling depth/stencil tests.\n"); - graphics->rt_idx = 0; graphics->null_attachment_mask = 0; - if (desc->DSVFormat != DXGI_FORMAT_UNKNOWN - && (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable)) + if (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable) { - if (!(format = vkd3d_get_format(device, desc->DSVFormat, true))) + if (desc->DSVFormat == DXGI_FORMAT_UNKNOWN) + { + WARN("DSV format is DXGI_FORMAT_UNKNOWN.\n"); + graphics->dsv_format = VK_FORMAT_UNDEFINED; + } + else if ((format = vkd3d_get_format(device, desc->DSVFormat, true))) + { + 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); + + graphics->dsv_format = format->vk_format; + } + else { WARN("Invalid DSV format %#x.\n", desc->DSVFormat); hr = E_INVALIDARG; goto fail; } - 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); - - graphics->dsv_format = format->vk_format; ++graphics->rt_idx; if (!desc->PS.pShaderBytecode) @@ -2538,7 +2549,10 @@ 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))) + if (graphics->dsv_format == VK_FORMAT_UNDEFINED) + graphics->render_pass = VK_NULL_HANDLE; + else if (FAILED(hr = d3d12_graphics_pipeline_state_create_render_pass(graphics, + device, 0, &graphics->render_pass))) goto fail; graphics->root_signature = root_signature; @@ -2640,7 +2654,7 @@ static enum VkPrimitiveTopology vk_topology_from_d3d12_topology(D3D12_PRIMITIVE_ } static VkPipeline d3d12_pipeline_state_find_compiled_pipeline(const struct d3d12_pipeline_state *state, - const struct vkd3d_pipeline_key *key) + const struct vkd3d_pipeline_key *key, VkRenderPass *vk_render_pass) { const struct d3d12_graphics_pipeline_state *graphics = &state->u.graphics; struct d3d12_device *device = state->device; @@ -2648,6 +2662,8 @@ static VkPipeline d3d12_pipeline_state_find_compiled_pipeline(const struct d3d12 struct vkd3d_compiled_pipeline *current; int rc; + *vk_render_pass = VK_NULL_HANDLE; + if (!(rc = pthread_mutex_lock(&device->mutex))) { LIST_FOR_EACH_ENTRY(current, &graphics->compiled_pipelines, struct vkd3d_compiled_pipeline, entry) @@ -2655,6 +2671,7 @@ static VkPipeline d3d12_pipeline_state_find_compiled_pipeline(const struct d3d12 if (!memcmp(&current->key, key, sizeof(*key))) { vk_pipeline = current->vk_pipeline; + *vk_render_pass = current->vk_render_pass; break; } } @@ -2669,7 +2686,7 @@ static VkPipeline d3d12_pipeline_state_find_compiled_pipeline(const struct d3d12 } static bool d3d12_pipeline_state_put_pipeline_to_cache(struct d3d12_pipeline_state *state, - const struct vkd3d_pipeline_key *key, VkPipeline vk_pipeline) + const struct vkd3d_pipeline_key *key, VkPipeline vk_pipeline, VkRenderPass vk_render_pass) { struct d3d12_graphics_pipeline_state *graphics = &state->u.graphics; struct vkd3d_compiled_pipeline *compiled_pipeline, *current; @@ -2681,6 +2698,7 @@ static bool d3d12_pipeline_state_put_pipeline_to_cache(struct d3d12_pipeline_sta compiled_pipeline->key = *key; compiled_pipeline->vk_pipeline = vk_pipeline; + compiled_pipeline->vk_render_pass = vk_render_pass; if ((rc = pthread_mutex_lock(&device->mutex))) { @@ -2707,7 +2725,8 @@ static bool d3d12_pipeline_state_put_pipeline_to_cache(struct d3d12_pipeline_sta } VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_state *state, - D3D12_PRIMITIVE_TOPOLOGY topology, const uint32_t *strides) + D3D12_PRIMITIVE_TOPOLOGY topology, const uint32_t *strides, VkFormat dsv_format, + VkRenderPass *vk_render_pass) { VkVertexInputBindingDescription bindings[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; const struct vkd3d_vk_device_procs *vk_procs = &state->device->vk_procs; @@ -2725,6 +2744,7 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta unsigned int i; uint32_t mask; VkResult vr; + HRESULT hr; static const VkPipelineViewportStateCreateInfo vp_desc = { @@ -2754,6 +2774,8 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta assert(d3d12_pipeline_state_is_graphics(state)); + *vk_render_pass = VK_NULL_HANDLE; + memset(&pipeline_key, 0, sizeof(pipeline_key)); pipeline_key.topology = topology; @@ -2783,7 +2805,9 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta ++binding_count; } - if ((vk_pipeline = d3d12_pipeline_state_find_compiled_pipeline(state, &pipeline_key))) + pipeline_key.dsv_format = dsv_format; + + if ((vk_pipeline = d3d12_pipeline_state_find_compiled_pipeline(state, &pipeline_key, vk_render_pass))) return vk_pipeline; input_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO; @@ -2846,6 +2870,18 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta pipeline_desc.subpass = 0; pipeline_desc.basePipelineHandle = VK_NULL_HANDLE; pipeline_desc.basePipelineIndex = -1; + + /* Create a render pass for pipelines with DXGI_FORMAT_UNKNOWN. */ + if (!pipeline_desc.renderPass) + { + TRACE("Compiling %p with DSV format %#x.\n", state, dsv_format); + if (FAILED(hr = d3d12_graphics_pipeline_state_create_render_pass(graphics, device, dsv_format, + &pipeline_desc.renderPass))) + return VK_NULL_HANDLE; + + *vk_render_pass = pipeline_desc.renderPass; + } + if ((vr = VK_CALL(vkCreateGraphicsPipelines(device->vk_device, device->vk_pipeline_cache, 1, &pipeline_desc, NULL, &vk_pipeline))) < 0) { @@ -2853,12 +2889,12 @@ VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_sta return VK_NULL_HANDLE; } - if (d3d12_pipeline_state_put_pipeline_to_cache(state, &pipeline_key, vk_pipeline)) + if (d3d12_pipeline_state_put_pipeline_to_cache(state, &pipeline_key, vk_pipeline, pipeline_desc.renderPass)) return vk_pipeline; /* Other thread compiled the pipeline before us. */ VK_CALL(vkDestroyPipeline(device->vk_device, vk_pipeline, NULL)); - vk_pipeline = d3d12_pipeline_state_find_compiled_pipeline(state, &pipeline_key); + vk_pipeline = d3d12_pipeline_state_find_compiled_pipeline(state, &pipeline_key, vk_render_pass); if (!vk_pipeline) ERR("Could not get the pipeline compiled by other thread from the cache.\n"); return vk_pipeline; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 4ae6afe128db..3fd1eacbfc77 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -741,7 +741,8 @@ HRESULT d3d12_pipeline_state_create_compute(struct d3d12_device *device, HRESULT d3d12_pipeline_state_create_graphics(struct d3d12_device *device, const D3D12_GRAPHICS_PIPELINE_STATE_DESC *desc, struct d3d12_pipeline_state **state) DECLSPEC_HIDDEN; VkPipeline d3d12_pipeline_state_get_or_create_pipeline(struct d3d12_pipeline_state *state, - D3D12_PRIMITIVE_TOPOLOGY topology, const uint32_t *strides) DECLSPEC_HIDDEN; + D3D12_PRIMITIVE_TOPOLOGY topology, const uint32_t *strides, VkFormat dsv_format, + VkRenderPass *vk_render_pass) DECLSPEC_HIDDEN; bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_state *state_a, const struct d3d12_pipeline_state *state_b) DECLSPEC_HIDDEN; struct d3d12_pipeline_state *unsafe_impl_from_ID3D12PipelineState(ID3D12PipelineState *iface) DECLSPEC_HIDDEN; @@ -861,11 +862,13 @@ struct d3d12_command_list unsigned int fb_width; unsigned int fb_height; unsigned int fb_layer_count; + VkFormat dsv_format; bool xfb_enabled; VkFramebuffer current_framebuffer; VkPipeline current_pipeline; + VkRenderPass pso_render_pass; VkRenderPass current_render_pass; struct vkd3d_pipeline_bindings pipeline_bindings[VK_PIPELINE_BIND_POINT_RANGE_SIZE]; -- 2.21.0

2 1

[PATCH vkd3d 7/8] vkd3d: Add warning for unbinding transform feedback buffers.
by Józef Kucia 16 May '19

16 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 16c40ce9eb66..edf13d688d9a 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); } } -- 2.21.0

2 1

[PATCH vkd3d 5/8] vkd3d: Implement NULL vertex buffer views.
by Józef Kucia 16 May '19

16 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 861c8405c3e6..16c40ce9eb66 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 36fcb22e857a..4a6af7fe102a 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 3fd1eacbfc77..002eeacf0748 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; -- 2.21.0

2 1

[PATCH vkd3d 8/8] vkd3d: Return S_OK from memory residency functions.
by Józef Kucia 16 May '19

16 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index ae8893de11a4..5c1580808224 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2832,7 +2832,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_MakeResident(ID3D12Device *iface, FIXME("iface %p, object_count %u, objects %p stub!\n", iface, object_count, objects); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d12_device_Evict(ID3D12Device *iface, @@ -2841,7 +2841,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_Evict(ID3D12Device *iface, FIXME("iface %p, object_count %u, objects %p stub!\n", iface, object_count, objects); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d12_device_CreateFence(ID3D12Device *iface, -- 2.21.0

2 1

[PATCH vkd3d 2/8] vkd3d: Introduce helper to create render pass for pipeline state.
by Józef Kucia 16 May '19

16 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 bc59b0187294..b1f4ef9acac1 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 402ac0aaa791..4ae6afe128db 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; -- 2.21.0

2 1

[PATCH vkd3d 1/8] vkd3d: Update current framebuffer before pipeline.
by Józef Kucia 16 May '19

16 May '19

From: Józef Kucia <jkucia(a)codeweavers.com> 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> --- 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 e4221c937240..8c7057b36340 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); -- 2.21.0

2 1

[PATCH 5/5] wined3d: Use context_acquire() in wined3d_swapchain_cs_init().
by Henri Verbeet 16 May '19

16 May '19

Instead of calling context_create() directly. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 7 ++++--- dlls/wined3d/swapchain.c | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 38a4462b051..7cd16d5b7ea 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4264,7 +4264,8 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, { TRACE("Rendering onscreen.\n"); - context = swapchain_get_context(texture->swapchain); + if (!(context = swapchain_get_context(texture->swapchain))) + return NULL; } else { @@ -4274,8 +4275,8 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, * context for the primary swapchain. */ if (current_context && current_context->device == device) context = current_context; - else - context = swapchain_get_context(device->swapchains[0]); + else if (!(context = swapchain_get_context(device->swapchains[0]))) + return NULL; } context_activate(context, texture, sub_resource_idx); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f47c1a44297..fbedd7470df 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -720,20 +720,20 @@ static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_s static void wined3d_swapchain_cs_init(void *object) { struct wined3d_swapchain *swapchain = object; + struct wined3d_context *context; - if (!(swapchain->context[0] = context_create(swapchain))) + if (!(context = context_acquire(swapchain->device, swapchain->front_buffer, 0))) { - WARN("Failed to create context.\n"); + WARN("Failed to acquire context.\n"); return; } - swapchain->num_contexts = 1; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && (!swapchain->desc.enable_auto_depth_stencil || swapchain->desc.auto_depth_stencil_format != swapchain->ds_format->id)) FIXME("Add OpenGL context recreation support.\n"); - context_release(swapchain->context[0]); + context_release(context); } void swapchain_set_max_frame_latency(struct wined3d_swapchain *swapchain, const struct wined3d_device *device) -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to context_find_fbo_entry().
by Henri Verbeet 16 May '19

16 May '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 62927a3237d..38a4462b051 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -574,13 +574,12 @@ static void wined3d_context_gl_destroy_fbo_entry(struct wined3d_context_gl *cont } /* Context activation is done by the caller. */ -static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, GLenum target, +static struct fbo_entry *wined3d_context_gl_find_fbo_entry(struct wined3d_context_gl *context_gl, GLenum target, const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); static const struct wined3d_rendertarget_info ds_null = {{0}}; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_texture *rt_texture, *ds_texture; struct wined3d_fbo_entry_key fbo_key; unsigned int i, ds_level, rt_level; @@ -614,11 +613,11 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, else if (depth_stencil->resource->type == WINED3D_RTYPE_TEXTURE_2D) { wined3d_texture_gl_set_compatible_renderbuffer(wined3d_texture_gl(ds_texture), - context, ds_level, &render_targets[0]); + &context_gl->c, ds_level, &render_targets[0]); } } - context_generate_fbo_key(context, &fbo_key, render_targets, depth_stencil, color_location, ds_location); + context_generate_fbo_key(&context_gl->c, &fbo_key, render_targets, depth_stencil, color_location, ds_location); if (TRACE_ON(d3d)) { @@ -676,29 +675,29 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, } } - LIST_FOR_EACH_ENTRY(entry, &context->fbo_list, struct fbo_entry, entry) + LIST_FOR_EACH_ENTRY(entry, &context_gl->c.fbo_list, struct fbo_entry, entry) { if (memcmp(&fbo_key, &entry->key, sizeof(fbo_key))) continue; list_remove(&entry->entry); - list_add_head(&context->fbo_list, &entry->entry); + list_add_head(&context_gl->c.fbo_list, &entry->entry); return entry; } - if (context->fbo_entry_count < WINED3D_MAX_FBO_ENTRIES) + if (context_gl->c.fbo_entry_count < WINED3D_MAX_FBO_ENTRIES) { - entry = context_create_fbo_entry(context, render_targets, depth_stencil, color_location, ds_location); - list_add_head(&context->fbo_list, &entry->entry); - ++context->fbo_entry_count; + entry = context_create_fbo_entry(&context_gl->c, render_targets, depth_stencil, color_location, ds_location); + list_add_head(&context_gl->c.fbo_list, &entry->entry); + ++context_gl->c.fbo_entry_count; } else { - entry = LIST_ENTRY(list_tail(&context->fbo_list), struct fbo_entry, entry); + entry = LIST_ENTRY(list_tail(&context_gl->c.fbo_list), struct fbo_entry, entry); wined3d_context_gl_reuse_fbo_entry(context_gl, target, render_targets, depth_stencil, color_location, ds_location, entry); list_remove(&entry->entry); - list_add_head(&context->fbo_list, &entry->entry); + list_add_head(&context_gl->c.fbo_list, &entry->entry); } return entry; @@ -783,7 +782,7 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ } else { - context->current_fbo = context_find_fbo_entry(context, target, + context->current_fbo = wined3d_context_gl_find_fbo_entry(context_gl, target, render_targets, depth_stencil, color_location, ds_location); context_apply_fbo_entry(context, target, context->current_fbo); } -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to context_destroy_fbo_entry().
by Henri Verbeet 16 May '19

16 May '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2670b413cd0..62927a3237d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -561,14 +561,14 @@ static void wined3d_context_gl_reuse_fbo_entry(struct wined3d_context_gl *contex } /* Context activation is done by the caller. */ -static void context_destroy_fbo_entry(struct wined3d_context *context, struct fbo_entry *entry) +static void wined3d_context_gl_destroy_fbo_entry(struct wined3d_context_gl *context_gl, struct fbo_entry *entry) { if (entry->id) { TRACE("Destroy FBO %u.\n", entry->id); - wined3d_context_gl_destroy_fbo(wined3d_context_gl(context), entry->id); + wined3d_context_gl_destroy_fbo(context_gl, entry->id); } - --context->fbo_entry_count; + --context_gl->c.fbo_entry_count; list_remove(&entry->entry); heap_free(entry); } @@ -767,7 +767,7 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_destroy_list, struct fbo_entry, entry) { - context_destroy_fbo_entry(context, entry); + wined3d_context_gl_destroy_fbo_entry(context_gl, entry); } if (context->rebind_fbo) @@ -1341,13 +1341,13 @@ void wined3d_context_cleanup(struct wined3d_context *context) LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_destroy_list, struct fbo_entry, entry) { if (!context->valid) entry->id = 0; - context_destroy_fbo_entry(context, entry); + wined3d_context_gl_destroy_fbo_entry(wined3d_context_gl(context), entry); } LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) { if (!context->valid) entry->id = 0; - context_destroy_fbo_entry(context, entry); + wined3d_context_gl_destroy_fbo_entry(wined3d_context_gl(context), entry); } context_restore_pixel_format(context); -- 2.11.0

1 0