November 2018 - Wine-Devel - list.winehq.org

[PATCH vkd3d 3/5] vkd3d: Disallow creating shader visible RTV/DSV descriptor heaps.
by Józef Kucia Nov. 27, 2018

Nov. 27, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 7 +++++++ tests/d3d12.c | 20 ++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 36c5cb232f67..0c3d7e809806 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2522,6 +2522,13 @@ HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, return E_INVALIDARG; } + if ((desc->Flags & D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE) + && (desc->Type == D3D12_DESCRIPTOR_HEAP_TYPE_RTV || desc->Type == D3D12_DESCRIPTOR_HEAP_TYPE_DSV)) + { + WARN("RTV/DSV descriptors heap cannot be shader visible.\n"); + return E_INVALIDARG; + } + max_descriptor_count = (~(size_t)0 - sizeof(*object)) / descriptor_size; if (desc->NumDescriptors > max_descriptor_count) { diff --git a/tests/d3d12.c b/tests/d3d12.c index 1b3f04d47410..d0372454a8c3 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2207,12 +2207,12 @@ static void test_create_descriptor_heap(void) heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE; heap_desc.NodeMask = 0; hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap); - ok(SUCCEEDED(hr), "Failed to create descriptor heap, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr); refcount = get_refcount(device); ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); hr = ID3D12DescriptorHeap_GetDevice(heap, &IID_ID3D12Device, (void **)&tmp_device); - ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); refcount = get_refcount(device); ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); refcount = ID3D12Device_Release(tmp_device); @@ -2229,31 +2229,39 @@ static void test_create_descriptor_heap(void) heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV; heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE; hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap); - ok(SUCCEEDED(hr), "Failed to create descriptor heap, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr); refcount = ID3D12DescriptorHeap_Release(heap); ok(!refcount, "ID3D12DescriptorHeap has %u references left.\n", (unsigned int)refcount); heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER; heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE; hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap); - ok(SUCCEEDED(hr), "Failed to create descriptor heap, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr); refcount = ID3D12DescriptorHeap_Release(heap); ok(!refcount, "ID3D12DescriptorHeap has %u references left.\n", (unsigned int)refcount); heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_RTV; heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE; hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap); - ok(SUCCEEDED(hr), "Failed to create descriptor heap, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr); refcount = ID3D12DescriptorHeap_Release(heap); ok(!refcount, "ID3D12DescriptorHeap has %u references left.\n", (unsigned int)refcount); + heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE; + hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_DSV; heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE; hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap); - ok(SUCCEEDED(hr), "Failed to create descriptor heap, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr); refcount = ID3D12DescriptorHeap_Release(heap); ok(!refcount, "ID3D12DescriptorHeap has %u references left.\n", (unsigned int)refcount); + heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE; + hr = ID3D12Device_CreateDescriptorHeap(device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&heap); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } -- 2.18.1

3 2

[PATCH vkd3d 5/5] vkd3d: Skip uninitialized DSV and RTV descriptors.
by Józef Kucia Nov. 27, 2018

Nov. 27, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9e5921ef81e2..3d5e898b4adb 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3570,9 +3570,21 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi for (i = 0; i < render_target_descriptor_count; ++i) { if (single_descriptor_handle) - rtv_desc = d3d12_rtv_desc_from_cpu_handle(*render_target_descriptors) + i; + { + if ((rtv_desc = d3d12_rtv_desc_from_cpu_handle(*render_target_descriptors))) + rtv_desc += i; + } else + { rtv_desc = d3d12_rtv_desc_from_cpu_handle(render_target_descriptors[i]); + } + + if (!rtv_desc) + { + WARN("RTV descriptor %u is not initialized.\n", i); + list->views[i + 1] = VK_NULL_HANDLE; + continue; + } d3d12_command_list_track_resource_usage(list, rtv_desc->resource); @@ -3591,21 +3603,28 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi if (depth_stencil_descriptor) { - dsv_desc = d3d12_dsv_desc_from_cpu_handle(*depth_stencil_descriptor); + if ((dsv_desc = d3d12_dsv_desc_from_cpu_handle(*depth_stencil_descriptor))) + { + d3d12_command_list_track_resource_usage(list, dsv_desc->resource); - d3d12_command_list_track_resource_usage(list, dsv_desc->resource); + /* In D3D12 CPU descriptors are consumed when a command is recorded. */ + view = dsv_desc->view; + if (!d3d12_command_allocator_add_view(list->allocator, view)) + { + WARN("Failed to add view.\n"); + list->views[0] = VK_NULL_HANDLE; + } - /* In D3D12 CPU descriptors are consumed when a command is recorded. */ - view = dsv_desc->view; - if (!d3d12_command_allocator_add_view(list->allocator, view)) + list->views[0] = view->u.vk_image_view; + 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); + } + else { - WARN("Failed to add view.\n"); + WARN("DSV descriptor is not initialized.\n"); + list->views[0] = VK_NULL_HANDLE; } - - list->views[0] = view->u.vk_image_view; - 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); } d3d12_command_list_invalidate_current_framebuffer(list); -- 2.18.1

2 1

[PATCH vkd3d 4/5] vkd3d: Improve invalid format messages.
by Józef Kucia Nov. 27, 2018

Nov. 27, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 3ee602fafb4b..6f7373e996ef 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1809,7 +1809,7 @@ static HRESULT compute_input_layout_offsets(const D3D12_INPUT_LAYOUT_DESC *input if (!(format = vkd3d_get_format(e->Format, false))) { - WARN("Invalid DXGI format %#x.\n", e->Format); + WARN("Invalid input element format %#x.\n", e->Format); return E_INVALIDARG; } @@ -1956,7 +1956,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (!(format = vkd3d_get_format(desc->DSVFormat, true))) { - WARN("Invalid DXGI format %#x.\n", desc->DSVFormat); + WARN("Invalid DSV format %#x.\n", desc->DSVFormat); hr = E_INVALIDARG; goto fail; } @@ -2014,7 +2014,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (!(format = vkd3d_get_format(desc->RTVFormats[i], false))) { - WARN("Invalid DXGI format %#x.\n", desc->RTVFormats[i]); + WARN("Invalid RTV format %#x.\n", desc->RTVFormats[i]); hr = E_INVALIDARG; goto fail; } @@ -2148,7 +2148,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (!(format = vkd3d_get_format(e->Format, false))) { - WARN("Invalid DXGI format %#x.\n", e->Format); + WARN("Invalid input element format %#x.\n", e->Format); hr = E_INVALIDARG; goto fail; } -- 2.18.1

2 1

[PATCH vkd3d 1/5] tests: Add more test for clearing array textures.
by Józef Kucia Nov. 27, 2018

Nov. 27, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- More test for Anv bug... --- tests/d3d12.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 89 insertions(+), 4 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index aa35315f3e7a..09dc339c8084 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3630,8 +3630,16 @@ static void test_clear_depth_stencil_view(void) static void test_clear_render_target_view(void) { + static const unsigned int array_expected_colors[] = {0xff0000ff, 0xff00ff00, 0xffff0000}; + static const struct vec4 array_colors[] = + { + {1.0f, 0.0f, 0.0f, 1.0f}, + {0.0f, 1.0f, 0.0f, 1.0f}, + {0.0f, 0.0f, 1.0f, 1.0f}, + }; static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + ID3D12Resource *resource, *resolved_resource; ID3D12GraphicsCommandList *command_list; D3D12_CPU_DESCRIPTOR_HANDLE rtv_handle; D3D12_RENDER_TARGET_VIEW_DESC rtv_desc; @@ -3644,11 +3652,13 @@ static void test_clear_render_target_view(void) struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; - ID3D12Resource *resource; ID3D12Device *device; + unsigned int i; D3D12_BOX box; HRESULT hr; + STATIC_ASSERT(ARRAY_SIZE(array_colors) == ARRAY_SIZE(array_expected_colors)); + memset(&desc, 0, sizeof(desc)); desc.no_render_target = true; if (!init_test_context(&context, &desc)) @@ -3687,7 +3697,7 @@ static void test_clear_render_target_view(void) &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, &IID_ID3D12Resource, (void **)&resource); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); memset(&rtv_desc, 0, sizeof(rtv_desc)); rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; @@ -3720,12 +3730,88 @@ static void test_clear_render_target_view(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_uint(resource, 0, queue, command_list, 0xbf95bc59, 2); + /* 2D array texture */ + ID3D12Resource_Release(resource); + resource_desc.DepthOrArraySize = ARRAY_SIZE(array_colors); + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + reset_command_list(command_list, context.allocator); + for (i = 0; i < ARRAY_SIZE(array_colors); ++i) + { + memset(&rtv_desc, 0, sizeof(rtv_desc)); + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DARRAY; + rtv_desc.Texture2DArray.FirstArraySlice = i; + rtv_desc.Texture2DArray.ArraySize = 1; + + ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, &array_colors[i].x, 0, NULL); + } + + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + for (i = 0; i < ARRAY_SIZE(array_expected_colors); ++i) + { + check_sub_resource_uint(resource, i, queue, command_list, array_expected_colors[i], 2); + reset_command_list(command_list, context.allocator); + } + + /* 2D multisample array texture */ + ID3D12Resource_Release(resource); + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 4; + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + resource_desc.DepthOrArraySize = 1; + resource_desc.SampleDesc.Count = 1; + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_COPY_SOURCE, NULL, + &IID_ID3D12Resource, (void **)&resolved_resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(array_colors); ++i) + { + memset(&rtv_desc, 0, sizeof(rtv_desc)); + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DMSARRAY; + rtv_desc.Texture2DMSArray.FirstArraySlice = i; + rtv_desc.Texture2DMSArray.ArraySize = 1; + + ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, &array_colors[i].x, 0, NULL); + } + + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + for (i = 0; i < ARRAY_SIZE(array_expected_colors); ++i) + { + transition_resource_state(command_list, resolved_resource, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST); + ID3D12GraphicsCommandList_ResolveSubresource(command_list, + resolved_resource, 0, resource, i, DXGI_FORMAT_R8G8B8A8_UNORM); + transition_resource_state(command_list, resolved_resource, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(resolved_resource, 0, queue, command_list, array_expected_colors[i], 2); + reset_command_list(command_list, context.allocator); + } + + ID3D12Resource_Release(resolved_resource); + /* 3D texture */ ID3D12Resource_Release(resource); resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE3D; resource_desc.DepthOrArraySize = 32; resource_desc.MipLevels = 1; - resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, @@ -3734,7 +3820,6 @@ static void test_clear_render_target_view(void) ID3D12Device_CreateRenderTargetView(device, resource, NULL, rtv_handle); - reset_command_list(command_list, context.allocator); ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, color, 0, NULL); transition_resource_state(command_list, resource, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); -- 2.18.1

2 1

[PATCH vkd3d 2/5] tests: Implement readback for multisample textures.
by Józef Kucia Nov. 27, 2018

Nov. 27, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 24 +++-------- tests/vkd3d_d3d12_test.h | 86 ++++++++++++++++++++++++++-------------- 2 files changed, 62 insertions(+), 48 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 09dc339c8084..1b3f04d47410 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3630,16 +3630,15 @@ static void test_clear_depth_stencil_view(void) static void test_clear_render_target_view(void) { - static const unsigned int array_expected_colors[] = {0xff0000ff, 0xff00ff00, 0xffff0000}; + static const unsigned int array_expected_colors[] = {0xff00ff00, 0xff0000ff, 0xffff0000}; static const struct vec4 array_colors[] = { - {1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 1.0f, 0.0f, 1.0f}, + {1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 1.0f, 1.0f}, }; static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; - ID3D12Resource *resource, *resolved_resource; ID3D12GraphicsCommandList *command_list; D3D12_CPU_DESCRIPTOR_HANDLE rtv_handle; D3D12_RENDER_TARGET_VIEW_DESC rtv_desc; @@ -3652,6 +3651,7 @@ static void test_clear_render_target_view(void) struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; + ID3D12Resource *resource; ID3D12Device *device; unsigned int i; D3D12_BOX box; @@ -3770,13 +3770,6 @@ static void test_clear_render_target_view(void) D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, &IID_ID3D12Resource, (void **)&resource); ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); - resource_desc.DepthOrArraySize = 1; - resource_desc.SampleDesc.Count = 1; - hr = ID3D12Device_CreateCommittedResource(device, - &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, - D3D12_RESOURCE_STATE_COPY_SOURCE, NULL, - &IID_ID3D12Resource, (void **)&resolved_resource); - ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); for (i = 0; i < ARRAY_SIZE(array_colors); ++i) { @@ -3795,23 +3788,16 @@ static void test_clear_render_target_view(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); for (i = 0; i < ARRAY_SIZE(array_expected_colors); ++i) { - transition_resource_state(command_list, resolved_resource, - D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_COPY_DEST); - ID3D12GraphicsCommandList_ResolveSubresource(command_list, - resolved_resource, 0, resource, i, DXGI_FORMAT_R8G8B8A8_UNORM); - transition_resource_state(command_list, resolved_resource, - D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_uint(resolved_resource, 0, queue, command_list, array_expected_colors[i], 2); + check_sub_resource_uint(resource, i, queue, command_list, array_expected_colors[i], 2); reset_command_list(command_list, context.allocator); } - ID3D12Resource_Release(resolved_resource); - /* 3D texture */ ID3D12Resource_Release(resource); resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE3D; resource_desc.DepthOrArraySize = 32; resource_desc.MipLevels = 1; + resource_desc.SampleDesc.Count = 1; hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, diff --git a/tests/vkd3d_d3d12_test.h b/tests/vkd3d_d3d12_test.h index 28225e1749d2..fc07af78ffb4 100644 --- a/tests/vkd3d_d3d12_test.h +++ b/tests/vkd3d_d3d12_test.h @@ -159,6 +159,28 @@ static inline ID3D12DescriptorHeap *create_gpu_descriptor_heap_(unsigned int lin return descriptor_heap; } +static void transition_sub_resource_state(ID3D12GraphicsCommandList *list, ID3D12Resource *resource, + unsigned int sub_resource_idx, D3D12_RESOURCE_STATES state_before, D3D12_RESOURCE_STATES state_after) +{ + D3D12_RESOURCE_BARRIER barrier; + + barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION; + barrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; + barrier.Transition.pResource = resource; + barrier.Transition.Subresource = sub_resource_idx; + barrier.Transition.StateBefore = state_before; + barrier.Transition.StateAfter = state_after; + + ID3D12GraphicsCommandList_ResourceBarrier(list, 1, &barrier); +} + +static void transition_resource_state(ID3D12GraphicsCommandList *list, ID3D12Resource *resource, + D3D12_RESOURCE_STATES state_before, D3D12_RESOURCE_STATES state_after) +{ + transition_sub_resource_state(list, resource, D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES, + state_before, state_after); +} + static unsigned int format_size(DXGI_FORMAT format) { switch (format) @@ -218,15 +240,16 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi struct resource_readback *rb, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) { D3D12_TEXTURE_COPY_LOCATION dst_location, src_location; + D3D12_HEAP_PROPERTIES heap_properties; D3D12_RESOURCE_DESC resource_desc; + ID3D12Resource *src_resource; D3D12_RANGE read_range; unsigned int miplevel; ID3D12Device *device; - DXGI_FORMAT format; HRESULT hr; hr = ID3D12Resource_GetDevice(texture, &IID_ID3D12Device, (void **)&device); - ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); resource_desc = ID3D12Resource_GetDesc(texture); ok(resource_desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER, @@ -240,35 +263,62 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi rb->row_pitch = align(rb->width * format_size(resource_desc.Format), D3D12_TEXTURE_DATA_PITCH_ALIGNMENT); rb->data = NULL; - format = resource_desc.Format; + if (resource_desc.SampleDesc.Count > 1) + { + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; + + resource_desc.Alignment = 0; + resource_desc.DepthOrArraySize = 1; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_COPY_DEST, NULL, + &IID_ID3D12Resource, (void **)&src_resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + ID3D12GraphicsCommandList_ResolveSubresource(command_list, + src_resource, 0, texture, sub_resource, resource_desc.Format); + transition_resource_state(command_list, src_resource, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + sub_resource = 0; + } + else + { + src_resource = texture; + } rb->resource = create_readback_buffer(device, rb->row_pitch * rb->height * rb->depth); dst_location.pResource = rb->resource; dst_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT; dst_location.PlacedFootprint.Offset = 0; - dst_location.PlacedFootprint.Footprint.Format = format; + dst_location.PlacedFootprint.Footprint.Format = resource_desc.Format; dst_location.PlacedFootprint.Footprint.Width = rb->width; dst_location.PlacedFootprint.Footprint.Height = rb->height; dst_location.PlacedFootprint.Footprint.Depth = rb->depth; dst_location.PlacedFootprint.Footprint.RowPitch = rb->row_pitch; - src_location.pResource = texture; + src_location.pResource = src_resource; src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; src_location.SubresourceIndex = sub_resource; ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 0, 0, 0, &src_location, NULL); hr = ID3D12GraphicsCommandList_Close(command_list); - ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); exec_command_list(queue, command_list); wait_queue_idle(device, queue); ID3D12Device_Release(device); + if (src_resource != texture) + ID3D12Resource_Release(src_resource); + read_range.Begin = 0; read_range.End = resource_desc.Width; hr = ID3D12Resource_Map(rb->resource, 0, &read_range, &rb->data); - ok(SUCCEEDED(hr), "Failed to map readback buffer, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to map readback buffer, hr %#x.\n", hr); } static void *get_readback_data(struct resource_readback *rb, @@ -367,28 +417,6 @@ static ID3D12Resource *create_default_texture2d_(unsigned int line, ID3D12Device return texture; } -static void transition_sub_resource_state(ID3D12GraphicsCommandList *list, ID3D12Resource *resource, - unsigned int sub_resource_idx, D3D12_RESOURCE_STATES state_before, D3D12_RESOURCE_STATES state_after) -{ - D3D12_RESOURCE_BARRIER barrier; - - barrier.Type = D3D12_RESOURCE_BARRIER_TYPE_TRANSITION; - barrier.Flags = D3D12_RESOURCE_BARRIER_FLAG_NONE; - barrier.Transition.pResource = resource; - barrier.Transition.Subresource = sub_resource_idx; - barrier.Transition.StateBefore = state_before; - barrier.Transition.StateAfter = state_after; - - ID3D12GraphicsCommandList_ResourceBarrier(list, 1, &barrier); -} - -static void transition_resource_state(ID3D12GraphicsCommandList *list, ID3D12Resource *resource, - D3D12_RESOURCE_STATES state_before, D3D12_RESOURCE_STATES state_after) -{ - transition_sub_resource_state(list, resource, D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES, - state_before, state_after); -} - static HRESULT create_root_signature(ID3D12Device *device, const D3D12_ROOT_SIGNATURE_DESC *desc, ID3D12RootSignature **root_signature) { -- 2.18.1

2 1

[PATCH 1/5] wined3d: Simplify "glsl_generate_ffp" texture projection
by Daniel Ansorregui Nov. 27, 2018

Nov. 27, 2018

* This is to simplify the code before adding the FETCH4 modifications No change is intended in the shader generation Signed-off-by: Daniel Ansorregui <mailszeros(a)gmail.com> --- dlls/wined3d/glsl_shader.c | 63 ++++++++++---------------------------- 1 file changed, 16 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 545e1bff9f..4b2dfaf34a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9863,65 +9863,34 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * switch (settings->op[stage].tex_type) { case WINED3D_GL_RES_TYPE_TEX_1D: - if (proj) - { - texture_function = "texture1DProj"; - coord_mask = "xw"; - } - else - { - texture_function = "texture1D"; - coord_mask = "x"; - } + texture_function = "texture1D"; + coord_mask = "x"; break; case WINED3D_GL_RES_TYPE_TEX_2D: - if (proj) - { - texture_function = "texture2DProj"; - coord_mask = "xyw"; - } - else - { - texture_function = "texture2D"; - coord_mask = "xy"; - } + texture_function = "texture2D"; + coord_mask = "xy"; break; case WINED3D_GL_RES_TYPE_TEX_3D: - if (proj) - { - texture_function = "texture3DProj"; - coord_mask = "xyzw"; - } - else - { - texture_function = "texture3D"; - coord_mask = "xyz"; - } + texture_function = "texture3D"; + coord_mask = "xyz"; break; case WINED3D_GL_RES_TYPE_TEX_CUBE: texture_function = "textureCube"; coord_mask = "xyz"; break; case WINED3D_GL_RES_TYPE_TEX_RECT: - if (proj) - { - texture_function = "texture2DRectProj"; - coord_mask = "xyw"; - } - else - { - texture_function = "texture2DRect"; - coord_mask = "xy"; - } + texture_function = "texture2DRect"; + coord_mask = "xy"; break; default: FIXME("Unhandled texture type %#x.\n", settings->op[stage].tex_type); texture_function = ""; coord_mask = "xyzw"; + proj = FALSE; break; } if (!legacy_syntax) - texture_function = proj ? "textureProj" : "texture"; + texture_function = "texture"; if (stage > 0 && (settings->op[stage - 1].cop == WINED3D_TOP_BUMPENVMAP @@ -9953,8 +9922,8 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * shader_addline(buffer, "ret = ffp_texcoord[%u] + ret.xyxy;\n", stage); } - shader_addline(buffer, "tex%u = %s(ps_sampler%u, ret.%s);\n", - stage, texture_function, stage, coord_mask); + shader_addline(buffer, "tex%u = %s%s(ps_sampler%u, ret.%s%c);\n", + stage, texture_function, proj ? "Proj" : "", stage, coord_mask, proj ? 'w' : ' '); if (settings->op[stage - 1].cop == WINED3D_TOP_BUMPENVMAP_LUMINANCE) shader_addline(buffer, "tex%u *= clamp(tex%u.z * bumpenv_lum_scale%u + bumpenv_lum_offset%u, 0.0, 1.0);\n", @@ -9962,13 +9931,13 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * } else if (settings->op[stage].projected == WINED3D_PROJECTION_COUNT3) { - shader_addline(buffer, "tex%u = %s(ps_sampler%u, ffp_texcoord[%u].xyz);\n", - stage, texture_function, stage, stage); + shader_addline(buffer, "tex%u = %s%s(ps_sampler%u, ffp_texcoord[%u].xyz);\n", + stage, texture_function, proj ? "Proj" : "", stage, stage); } else { - shader_addline(buffer, "tex%u = %s(ps_sampler%u, ffp_texcoord[%u].%s);\n", - stage, texture_function, stage, stage, coord_mask); + shader_addline(buffer, "tex%u = %s%s(ps_sampler%u, ffp_texcoord[%u].%s%c);\n", + stage, texture_function, proj ? "Proj" : "", stage, stage, coord_mask, proj ? 'w' : ' '); } string_buffer_sprintf(tex_reg_name, "tex%u", stage); -- 2.17.1

6 26

[PATCH v3 2/3] mpr: Implement support for making connections persistent.
by Pierre Schweitzer Nov. 27, 2018

Nov. 27, 2018

-- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

1 0

[PATCH 1/6] ntoskrnl.exe: Implement KeInitializeSemaphore().
by Zebediah Figura Nov. 27, 2018

Nov. 27, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 --------- dlls/ntoskrnl.exe/sync.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c1cfb032dd..07e9104498 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2307,15 +2307,6 @@ LONG WINAPI KeReleaseMutex(PRKMUTEX Mutex, BOOLEAN Wait) } -/*********************************************************************** - * KeInitializeSemaphore (NTOSKRNL.EXE.@) - */ -void WINAPI KeInitializeSemaphore( PRKSEMAPHORE Semaphore, LONG Count, LONG Limit ) -{ - FIXME( "(%p %d %d) stub\n", Semaphore , Count, Limit ); -} - - /*********************************************************************** * KeInitializeSpinLock (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 8011b56754..2190faa81f 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -36,6 +36,7 @@ enum object_type { TYPE_MANUAL_EVENT = 0, TYPE_AUTO_EVENT = 1, + TYPE_SEMAPHORE = 5, }; static CRITICAL_SECTION sync_cs; @@ -172,3 +173,17 @@ LONG WINAPI KeResetEvent( PRKEVENT event ) return ret; } + +/*********************************************************************** + * KeInitializeSemaphore (NTOSKRNL.EXE.@) + */ +void WINAPI KeInitializeSemaphore( PRKSEMAPHORE semaphore, LONG count, LONG limit ) +{ + TRACE("semaphore %p, count %d, limit %d.\n", semaphore, count, limit); + + semaphore->Header.Type = TYPE_SEMAPHORE; + semaphore->Header.SignalState = count; + semaphore->Header.WaitListHead.Blink = NULL; + semaphore->Header.WaitListHead.Flink = NULL; + semaphore->Limit = limit; +} -- 2.14.1

2 7

[PATCH v5] server: Release of related atoms when destroying a window class
by Ralf Habacker Nov. 27, 2018

Nov. 27, 2018

1 0

[PATCH] testbot: Provide the missions list to the Reconfig scripts.
by Francois Gouget Nov. 27, 2018

Nov. 27, 2018

The scripts need it to know which builds to update. A Wine VM may only need to update the win32 build for instance, but may have to recreate wineprefixes for multiple locales. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 4d50a3789a..2a8b1d625d 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -46,6 +46,7 @@ use WineTestBot::Jobs; use WineTestBot::VMs; use WineTestBot::Log; use WineTestBot::LogUtils; +use WineTestBot::Missions; use WineTestBot::Engine::Notify; @@ -345,7 +346,7 @@ my $Script = $VM->Type eq "wine" ? "WineReconfig.pl" : "Reconfig.pl"; $Script = "#!/bin/sh\n". "( set -x\n". " echo git pull &&\n". - " ../bin/build/$Script\n". + " ../bin/build/$Script ". MergeMissionStatementTasks($Task->Missions) ."\n". ") >Reconfig.log 2>&1\n"; my $TA = $VM->GetAgent(); Debug(Elapsed($Start), " Sending the script: [$Script]\n"); -- 2.19.1

2 2