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

Józef Kucia : build: Enable -Wimplicit-fallthrough.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: vkd3d Branch: master Commit: 8b49b6e057e6589e2898746b3f29dcaeb8620672 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8b49b6e057e6589e2898746… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 5 18:03:38 2019 +0200 build: Enable -Wimplicit-fallthrough. 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> --- configure.ac | 1 + libs/vkd3d/utils.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/configure.ac b/configure.ac index abd94b5..7b72d3e 100644 --- a/configure.ac +++ b/configure.ac @@ -44,6 +44,7 @@ AS_IF([test "x${GCC}" = "xyes"], [VKD3D_CFLAGS="-Wall -pipe" VKD3D_CHECK_CFLAGS([-std=c99]) VKD3D_CHECK_CFLAGS([-Wdeclaration-after-statement]) + VKD3D_CHECK_CFLAGS([-Wimplicit-fallthrough]) VKD3D_CHECK_CFLAGS([-Wmissing-prototypes]) VKD3D_CHECK_CFLAGS([-Wunused-but-set-parameter]) VKD3D_CHECK_CFLAGS([-Wvla]) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 0329499..6a910a7 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -702,10 +702,12 @@ HRESULT hresult_from_vk_result(VkResult vr) return S_OK; case VK_ERROR_OUT_OF_DEVICE_MEMORY: WARN("Out of device memory.\n"); + /* fall-through */ case VK_ERROR_OUT_OF_HOST_MEMORY: return E_OUTOFMEMORY; default: FIXME("Unhandled VkResult %d.\n", vr); + /* fall-through */ case VK_ERROR_DEVICE_LOST: case VK_ERROR_EXTENSION_NOT_PRESENT: return E_FAIL;

1 0

Józef Kucia : vkd3d: Prepend pNext chain structures.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: vkd3d Branch: master Commit: 8df3bfc5c294ee32354fa39c9743ad2fa6f861cf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8df3bfc5c294ee32354fa39… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 5 18:03:39 2019 +0200 vkd3d: Prepend pNext chain structures. Order of structures doesn't matter so we can simply prepend instead of apending. 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/device.c | 24 ++++++++++++------------ libs/vkd3d/state.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 11 +++++------ 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 18c7bf6..cb70578 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -714,19 +714,19 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i info->features2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; conditional_rendering_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT; - vk_append_struct(&info->features2, conditional_rendering_features); + vk_prepend_struct(&info->features2, conditional_rendering_features); depth_clip_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT; - vk_append_struct(&info->features2, depth_clip_features); + vk_prepend_struct(&info->features2, depth_clip_features); descriptor_indexing_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT; - vk_append_struct(&info->features2, descriptor_indexing_features); + vk_prepend_struct(&info->features2, descriptor_indexing_features); demote_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DEMOTE_TO_HELPER_INVOCATION_FEATURES_EXT; - vk_append_struct(&info->features2, demote_features); + vk_prepend_struct(&info->features2, demote_features); buffer_alignment_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_FEATURES_EXT; - vk_append_struct(&info->features2, buffer_alignment_features); + vk_prepend_struct(&info->features2, buffer_alignment_features); xfb_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT; - vk_append_struct(&info->features2, xfb_features); + vk_prepend_struct(&info->features2, xfb_features); vertex_divisor_features->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT; - vk_append_struct(&info->features2, vertex_divisor_features); + vk_prepend_struct(&info->features2, vertex_divisor_features); if (vulkan_info->KHR_get_physical_device_properties2) VK_CALL(vkGetPhysicalDeviceFeatures2KHR(physical_device, &info->features2)); @@ -736,15 +736,15 @@ static void vkd3d_physical_device_info_init(struct vkd3d_physical_device_info *i info->properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; maintenance3_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES; - vk_append_struct(&info->properties2, maintenance3_properties); + vk_prepend_struct(&info->properties2, maintenance3_properties); descriptor_indexing_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES_EXT; - vk_append_struct(&info->properties2, descriptor_indexing_properties); + vk_prepend_struct(&info->properties2, descriptor_indexing_properties); buffer_alignment_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXEL_BUFFER_ALIGNMENT_PROPERTIES_EXT; - vk_append_struct(&info->properties2, buffer_alignment_properties); + vk_prepend_struct(&info->properties2, buffer_alignment_properties); xfb_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_PROPERTIES_EXT; - vk_append_struct(&info->properties2, xfb_properties); + vk_prepend_struct(&info->properties2, xfb_properties); vertex_divisor_properties->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT; - vk_append_struct(&info->properties2, vertex_divisor_properties); + vk_prepend_struct(&info->properties2, vertex_divisor_properties); if (vulkan_info->KHR_get_physical_device_properties2) VK_CALL(vkGetPhysicalDeviceProperties2KHR(physical_device, &info->properties2)); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 45d5435..8ddbd4f 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1729,7 +1729,7 @@ static void rs_depth_clip_info_from_d3d12(VkPipelineRasterizationDepthClipStateC depth_clip_info->flags = 0; depth_clip_info->depthClipEnable = d3d12_desc->DepthClipEnable; - vk_append_struct(vk_rs_desc, depth_clip_info); + vk_prepend_struct(vk_rs_desc, depth_clip_info); } static void rs_stream_info_from_d3d12(VkPipelineRasterizationStateStreamCreateInfoEXT *stream_info, @@ -1750,7 +1750,7 @@ static void rs_stream_info_from_d3d12(VkPipelineRasterizationStateStreamCreateIn stream_info->flags = 0; stream_info->rasterizationStream = so_desc->RasterizedStream; - vk_append_struct(vk_rs_desc, stream_info); + vk_prepend_struct(vk_rs_desc, stream_info); } static enum VkStencilOp vk_stencil_op_from_d3d12(D3D12_STENCIL_OP op) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 4f2559c..51bfba9 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1233,14 +1233,13 @@ VkResult vkd3d_set_vk_object_name_utf8(struct d3d12_device *device, uint64_t vk_ HRESULT vkd3d_set_vk_object_name(struct d3d12_device *device, uint64_t vk_object, VkDebugReportObjectTypeEXT vk_object_type, const WCHAR *name) DECLSPEC_HIDDEN; -static inline void vk_append_struct(void *h, void *structure) +static inline void vk_prepend_struct(void *header, void *structure) { - VkBaseOutStructure *header = h; + VkBaseOutStructure *vk_header = header, *vk_structure = structure; - while (header->pNext) - header = header->pNext; - - header->pNext = structure; + assert(!vk_structure->pNext); + vk_structure->pNext = vk_header->pNext; + vk_header->pNext = vk_structure; } #endif /* __VKD3D_PRIVATE_H */

1 0

Józef Kucia : vkd3d: Remove old entries in GPU VA allocator.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: vkd3d Branch: master Commit: 9e997c6db6375766a058ae95727d0ae4eb469bdb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9e997c6db6375766a058ae9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 5 18:03:40 2019 +0200 vkd3d: Remove old entries in GPU VA allocator. The "allocations" array is filled with unused entries when D3D12 buffers are destroyed. The majority of entries might be unused after running for a while. Remove the entry when VA is freed in order to prevent accumulation of unused entries. This makes destroying D3D12 buffers more expensive. 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/device.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index cb70578..dc0fa0a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1895,6 +1895,7 @@ void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocato void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address) { struct vkd3d_gpu_va_allocation *allocation; + unsigned int index; int rc; if ((rc = pthread_mutex_lock(&allocator->mutex))) @@ -1906,7 +1907,15 @@ void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, D3D12 allocation = bsearch(&address, allocator->allocations, allocator->allocation_count, sizeof(*allocation), vkd3d_gpu_va_allocation_compare); if (allocation && allocation->base == address) - allocation->ptr = NULL; + { + index = allocation - allocator->allocations; + --allocator->allocation_count; + if (index != allocator->allocation_count) + { + memmove(&allocator->allocations[index], &allocator->allocations[index + 1], + (allocator->allocation_count - index) * sizeof(*allocation)); + } + } pthread_mutex_unlock(&allocator->mutex); }

1 0

Józef Kucia : vkd3d: Remove unused d3d12_root_signature_init_descriptor_pool_size().
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: vkd3d Branch: master Commit: 865fbea532b9c1fb01df8eb7f664adb898ce31fb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=865fbea532b9c1fb01df8eb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 5 18:03:41 2019 +0200 vkd3d: Remove unused d3d12_root_signature_init_descriptor_pool_size(). 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 +- libs/vkd3d/state.c | 80 ---------------------------------------------- libs/vkd3d/vkd3d_private.h | 3 -- 3 files changed, 1 insertion(+), 84 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index ac7e658..ae88910 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2821,7 +2821,7 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis struct d3d12_desc *base_descriptor; unsigned int i; - if (!rs || !rs->pool_size_count || !rs->vk_set_layout) + if (!rs || !rs->vk_set_layout) return; if (bindings->descriptor_table_dirty_mask || bindings->push_descriptor_dirty_mask) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 8ddbd4f..12a711b 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -64,8 +64,6 @@ static void d3d12_root_signature_cleanup(struct d3d12_root_signature *root_signa if (root_signature->vk_pipeline_layout) VK_CALL(vkDestroyPipelineLayout(device->vk_device, root_signature->vk_pipeline_layout, NULL)); - if (root_signature->pool_sizes) - vkd3d_free(root_signature->pool_sizes); if (root_signature->vk_set_layout) VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, root_signature->vk_set_layout, NULL)); if (root_signature->vk_push_set_layout) @@ -430,80 +428,6 @@ static HRESULT d3d12_root_signature_info_from_desc(struct d3d12_root_signature_i return S_OK; } -static HRESULT d3d12_root_signature_init_descriptor_pool_size(struct d3d12_root_signature *root_signature, - const struct d3d12_root_signature_info *info) -{ - unsigned int i; - - root_signature->pool_size_count = 0; - if (info->cbv_count) - ++root_signature->pool_size_count; - if (info->buffer_srv_count || info->srv_count) - ++root_signature->pool_size_count; - if (info->srv_count) - ++root_signature->pool_size_count; - if (info->buffer_uav_count || info->uav_count) - ++root_signature->pool_size_count; - if (info->uav_count) - ++root_signature->pool_size_count; - if (info->sampler_count) - ++root_signature->pool_size_count; - - if (root_signature->pool_size_count) - { - if (!(root_signature->pool_sizes = vkd3d_calloc(root_signature->pool_size_count, - sizeof(*root_signature->pool_sizes)))) - { - return E_OUTOFMEMORY; - } - - i = 0; - if (info->cbv_count) - { - root_signature->pool_sizes[i].type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER; - root_signature->pool_sizes[i++].descriptorCount = info->cbv_count; - } - /* Each D3D12_DESCRIPTOR_RANGE_TYPE_SRV descriptor can be either a - * buffer or a texture view. Allocate one buffer view and one image - * view Vulkan descriptor for each. */ - if (info->buffer_srv_count || info->srv_count) - { - root_signature->pool_sizes[i].type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; - root_signature->pool_sizes[i++].descriptorCount = info->buffer_srv_count + info->srv_count; - } - if (info->srv_count) - { - root_signature->pool_sizes[i].type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; - root_signature->pool_sizes[i++].descriptorCount = info->srv_count; - } - /* Each D3D12_DESCRIPTOR_RANGE_TYPE_UAV descriptor can be either a - * buffer or a texture view. Allocate one buffer view and one image - * view Vulkan descriptor for each. */ - if (info->buffer_uav_count || info->uav_count) - { - root_signature->pool_sizes[i].type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; - root_signature->pool_sizes[i++].descriptorCount = info->buffer_uav_count + info->uav_count; - } - if (info->uav_count) - { - root_signature->pool_sizes[i].type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; - root_signature->pool_sizes[i++].descriptorCount = info->uav_count; - } - if (info->sampler_count) - { - root_signature->pool_sizes[i].type = VK_DESCRIPTOR_TYPE_SAMPLER; - root_signature->pool_sizes[i++].descriptorCount = info->sampler_count; - } - } - else - { - root_signature->pool_sizes = NULL; - root_signature->pool_size_count = 0; - } - - return S_OK; -} - static HRESULT d3d12_root_signature_init_push_constants(struct d3d12_root_signature *root_signature, const D3D12_ROOT_SIGNATURE_DESC *desc, const struct d3d12_root_signature_info *info, struct VkPushConstantRange push_constants[D3D12_SHADER_VISIBILITY_PIXEL + 1], @@ -874,7 +798,6 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa root_signature->refcount = 1; root_signature->vk_pipeline_layout = VK_NULL_HANDLE; - root_signature->pool_sizes = NULL; root_signature->vk_push_set_layout = VK_NULL_HANDLE; root_signature->vk_set_layout = VK_NULL_HANDLE; root_signature->parameters = NULL; @@ -925,9 +848,6 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa goto fail; context.current_binding = binding_desc; - if (FAILED(hr = d3d12_root_signature_init_descriptor_pool_size(root_signature, &info))) - goto fail; - if (FAILED(hr = d3d12_root_signature_init_root_descriptors(root_signature, desc, &context))) goto fail; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 51bfba9..a8f42cf 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -661,9 +661,6 @@ struct d3d12_root_signature VkDescriptorSetLayout vk_push_set_layout; VkDescriptorSetLayout vk_set_layout; - VkDescriptorPoolSize *pool_sizes; - size_t pool_size_count; - struct d3d12_root_parameter *parameters; unsigned int parameter_count; uint32_t main_set;

1 0

Józef Kucia : vkd3d: Add support for VK_KHR_image_format_list.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: vkd3d Branch: master Commit: 0184917520af1034c403a49efa4d46c67a540698 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0184917520af1034c403a49… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 5 18:03:37 2019 +0200 vkd3d: Add support for VK_KHR_image_format_list. 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/device.c | 11 ++- libs/vkd3d/resource.c | 30 ++++++ libs/vkd3d/utils.c | 229 ++++++++++++++++++++++++++++++++++++++++++++- libs/vkd3d/vkd3d_private.h | 23 +++-- 4 files changed, 280 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=0184917520af1034c40…

1 0

Józef Kucia : tests: Add test case for UAV format compatibility.
by Alexandre Julliard 06 Aug '19

06 Aug '19

Module: vkd3d Branch: master Commit: 740db732fceb3387e034af17822fae5d77511e97 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=740db732fceb3387e034af1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 5 18:03:36 2019 +0200 tests: Add test case for UAV format compatibility. 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 | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2e83d16..95eb90d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2509,9 +2509,9 @@ static void test_create_unordered_access_view(void) { D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc; D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle; + ID3D12Resource *buffer, *texture; unsigned int descriptor_size; ID3D12DescriptorHeap *heap; - ID3D12Resource *resource; ID3D12Device *device; ULONG refcount; @@ -2528,7 +2528,7 @@ static void test_create_unordered_access_view(void) heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 16); - resource = create_default_buffer(device, 64 * sizeof(float), + buffer = create_default_buffer(device, 64 * sizeof(float), D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap); @@ -2539,15 +2539,26 @@ static void test_create_unordered_access_view(void) uav_desc.Buffer.StructureByteStride = 0; uav_desc.Buffer.CounterOffsetInBytes = 0; uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE; - ID3D12Device_CreateUnorderedAccessView(device, resource, NULL, &uav_desc, cpu_handle); + ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc, cpu_handle); cpu_handle.ptr += descriptor_size; /* The following call fails. Buffer views cannot be created for compressed formats. */ uav_desc.Format = DXGI_FORMAT_BC1_UNORM; - ID3D12Device_CreateUnorderedAccessView(device, resource, NULL, &uav_desc, cpu_handle); + ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc, cpu_handle); - ID3D12Resource_Release(resource); + /* DXGI_FORMAT_R32_UINT view for DXGI_FORMAT_R8G8B8A8_TYPELESS resources. */ + texture = create_default_texture(device, 8, 8, DXGI_FORMAT_R8G8B8A8_TYPELESS, + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + + uav_desc.Format = DXGI_FORMAT_R32_UINT; + uav_desc.ViewDimension = D3D12_UAV_DIMENSION_TEXTURE2D; + uav_desc.Texture2D.MipSlice = 0; + uav_desc.Texture2D.PlaneSlice = 0; + ID3D12Device_CreateUnorderedAccessView(device, texture, NULL, &uav_desc, cpu_handle); + + ID3D12Resource_Release(buffer); + ID3D12Resource_Release(texture); refcount = ID3D12DescriptorHeap_Release(heap); ok(!refcount, "ID3D12DescriptorHeap has %u references left.\n", (unsigned int)refcount); refcount = ID3D12Device_Release(device);

1 0

Henri Verbeet : wined3d: Return a wined3d_context_gl structure from context_get_current().
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 157440e3d30b536cdeb3309bd220d41d25337e93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=157440e3d30b536cdeb3309b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 5 17:57:55 2019 +0430 wined3d: Return a wined3d_context_gl structure from context_get_current(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 29 ++++++--- dlls/wined3d/arb_program_shader.c | 8 +-- dlls/wined3d/context.c | 57 +++++++++-------- dlls/wined3d/gl_compat.c | 126 +++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 123 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=157440e3d30b536cdeb3…

1 0

Henri Verbeet : wined3d: Use d3d_info to determine BGRA vertex support in context_update_stream_info ().
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 337dc8a272af7b27cbdecd28d1e8cf5f11e92c54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=337dc8a272af7b27cbdecd28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 5 17:57:56 2019 +0430 wined3d: Use d3d_info to determine BGRA vertex support in context_update_stream_info(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 998aaef..9ce883d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3675,7 +3675,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st else { WORD slow_mask = -!d3d_info->ffp_generic_attributes & (1u << WINED3D_FFP_PSIZE); - slow_mask |= -(!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] && !d3d_info->ffp_generic_attributes) + slow_mask |= -(!d3d_info->vertex_bgra && !d3d_info->ffp_generic_attributes) & ((1u << WINED3D_FFP_DIFFUSE) | (1u << WINED3D_FFP_SPECULAR) | (1u << WINED3D_FFP_BLENDWEIGHT)); if ((stream_info->position_transformed && !d3d_info->xyzrhw)

1 0

Henri Verbeet : wined3d: Get rid of the float16 fallback in context_update_stream_info().
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 1c41aac4a48b4d189cc19cab72797676d27cc263 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c41aac4a48b4d189cc19cab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 5 17:57:57 2019 +0430 wined3d: Get rid of the float16 fallback in context_update_stream_info(). This is never used, since we reject creation of vertex declarations that contain any elements with unsupported formats. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 11 +---------- dlls/wined3d/vertexdeclaration.c | 5 ----- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9ce883d..ea7eaf9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3601,7 +3601,6 @@ static void context_update_stream_info(struct wined3d_context *context, const st { struct wined3d_stream_info *stream_info = &context->stream_info; const struct wined3d_d3d_info *d3d_info = context->d3d_info; - const struct wined3d_gl_info *gl_info = context->gl_info; DWORD prev_all_vbo = stream_info->all_vbo; unsigned int i; WORD map; @@ -3664,15 +3663,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st if (stream_info->all_vbo) return; - if (use_vs(state)) - { - if (state->vertex_declaration->have_half_floats && !gl_info->supported[ARB_HALF_FLOAT_VERTEX]) - { - TRACE("Using immediate mode draw with vertex shaders for FLOAT16 conversion.\n"); - context->use_immediate_mode_draw = TRUE; - } - } - else + if (!use_vs(state)) { WORD slow_mask = -!d3d_info->ffp_generic_attributes & (1u << WINED3D_FFP_PSIZE); slow_mask |= -(!d3d_info->vertex_bgra && !d3d_info->ffp_generic_attributes) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index cd8bb5e..8103274 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -251,11 +251,6 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara heap_free(declaration->elements); return E_FAIL; } - - if (elements[i].format == WINED3DFMT_R16G16_FLOAT || elements[i].format == WINED3DFMT_R16G16B16A16_FLOAT) - { - declaration->have_half_floats = TRUE; - } } return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9f6f470..0394ba6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3744,7 +3744,6 @@ struct wined3d_vertex_declaration unsigned int element_count; BOOL position_transformed; - BOOL have_half_floats; }; struct wined3d_saved_states

1 0

Henri Verbeet : wined3d: Use d3d_info to determine whether shader outputs need interpolation qualifiers.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 4f86e35c53875d56e8ba69b6270dd4f638e9d3fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f86e35c53875d56e8ba69b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 5 17:57:58 2019 +0430 wined3d: Use d3d_info to determine whether shader outputs need interpolation qualifiers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/glsl_shader.c | 10 ++++++++++ dlls/wined3d/shader.c | 15 ++++++--------- dlls/wined3d/wined3d_private.h | 17 +++++------------ 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index a0167f0..5f6d673 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3770,6 +3770,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->limits.ps_uniform_count = shader_caps.ps_uniform_count; d3d_info->limits.varying_count = shader_caps.varying_count; d3d_info->shader_double_precision = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_DOUBLE_PRECISION); + d3d_info->shader_output_interpolation = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION); d3d_info->viewport_array_index_any_shader = !!gl_info->supported[ARB_SHADER_VIEWPORT_LAYER_ARRAY]; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1acb6c7..41cf157 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1979,6 +1979,14 @@ static void shader_glsl_declare_shader_inputs(const struct wined3d_gl_info *gl_i } } +static BOOL needs_interpolation_qualifiers_for_shader_outputs(const struct wined3d_gl_info *gl_info) +{ + /* In GLSL 4.40+ it is fine to specify interpolation qualifiers only in + * fragment shaders. In older GLSL versions interpolation qualifiers must + * match between shader stages. */ + return gl_info->glsl_version < MAKEDWORD_VERSION(4, 40); +} + static void shader_glsl_declare_shader_outputs(const struct wined3d_gl_info *gl_info, struct wined3d_string_buffer *buffer, unsigned int element_count, BOOL rasterizer_setup, const DWORD *interpolation_mode) @@ -11108,6 +11116,8 @@ static void shader_glsl_get_caps(const struct wined3d_adapter *adapter, struct s * shader_glsl_alloc(). */ caps->wined3d_caps = WINED3D_SHADER_CAP_VS_CLIPPING | WINED3D_SHADER_CAP_SRGB_WRITE; + if (needs_interpolation_qualifiers_for_shader_outputs(gl_info)) + caps->wined3d_caps |= WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION; } static BOOL shader_glsl_color_fixup_supported(struct color_fixup_desc fixup) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 973941b..1d8540e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3505,10 +3505,10 @@ HRESULT CDECL wined3d_shader_set_local_constants_float(struct wined3d_shader *sh } static void init_interpolation_compile_args(DWORD *interpolation_args, - const struct wined3d_shader *pixel_shader, const struct wined3d_gl_info *gl_info) + const struct wined3d_shader *pixel_shader, const struct wined3d_d3d_info *d3d_info) { - if (!needs_interpolation_qualifiers_for_shader_outputs(gl_info) - || !pixel_shader || pixel_shader->reg_maps.shader_version.major < 4) + if (!d3d_info->shader_output_interpolation || !pixel_shader + || pixel_shader->reg_maps.shader_version.major < 4) { memset(interpolation_args, 0, sizeof(pixel_shader->u.ps.interpolation_mode)); return; @@ -3525,7 +3525,6 @@ void find_vs_compile_args(const struct wined3d_state *state, const struct wined3 const struct wined3d_shader *pixel_shader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; const struct wined3d_shader *hull_shader = state->shader[WINED3D_SHADER_TYPE_HULL]; const struct wined3d_d3d_info *d3d_info = context->d3d_info; - const struct wined3d_gl_info *gl_info = context->gl_info; args->fog_src = state->render_states[WINED3D_RS_FOGTABLEMODE] == WINED3D_FOG_NONE ? VS_FOG_COORD : VS_FOG_Z; @@ -3548,7 +3547,7 @@ void find_vs_compile_args(const struct wined3d_state *state, const struct wined3 args->flatshading = 0; init_interpolation_compile_args(args->interpolation_mode, - args->next_shader_type == WINED3D_SHADER_TYPE_PIXEL ? pixel_shader : NULL, gl_info); + args->next_shader_type == WINED3D_SHADER_TYPE_PIXEL ? pixel_shader : NULL, d3d_info); } static BOOL match_usage(BYTE usage1, BYTE usage_idx1, BYTE usage2, BYTE usage_idx2) @@ -3865,7 +3864,6 @@ void find_ds_compile_args(const struct wined3d_state *state, const struct wined3 const struct wined3d_shader *geometry_shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; const struct wined3d_shader *pixel_shader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; const struct wined3d_shader *hull_shader = state->shader[WINED3D_SHADER_TYPE_HULL]; - const struct wined3d_gl_info *gl_info = context->gl_info; args->tessellator_output_primitive = hull_shader->u.hs.tessellator_output_primitive; args->tessellator_partitioning = hull_shader->u.hs.tessellator_partitioning; @@ -3877,7 +3875,7 @@ void find_ds_compile_args(const struct wined3d_state *state, const struct wined3 args->render_offscreen = context->render_offscreen; init_interpolation_compile_args(args->interpolation_mode, - args->next_shader_type == WINED3D_SHADER_TYPE_PIXEL ? pixel_shader : NULL, gl_info); + args->next_shader_type == WINED3D_SHADER_TYPE_PIXEL ? pixel_shader : NULL, context->d3d_info); args->padding = 0; } @@ -3886,14 +3884,13 @@ void find_gs_compile_args(const struct wined3d_state *state, const struct wined3 struct gs_compile_args *args, const struct wined3d_context *context) { const struct wined3d_shader *pixel_shader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; - const struct wined3d_gl_info *gl_info = context->gl_info; args->output_count = pixel_shader ? pixel_shader->limits->packed_input : shader->limits->packed_output; if (!(args->primitive_type = shader->u.gs.input_type)) args->primitive_type = d3d_primitive_type_from_gl(state->gl_primitive_type); - init_interpolation_compile_args(args->interpolation_mode, pixel_shader, gl_info); + init_interpolation_compile_args(args->interpolation_mode, pixel_shader, context->d3d_info); } void find_ps_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0394ba6..fd68cbd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -205,6 +205,7 @@ struct wined3d_d3d_info unsigned int vs_clipping : 1; unsigned int shader_color_key : 1; unsigned int shader_double_precision : 1; + unsigned int shader_output_interpolation : 1; unsigned int viewport_array_index_any_shader : 1; unsigned int texture_npot : 1; unsigned int texture_npot_conditional : 1; @@ -1298,9 +1299,10 @@ BOOL shader_get_stream_output_register_info(const struct wined3d_shader *shader, typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *); -#define WINED3D_SHADER_CAP_VS_CLIPPING 0x00000001 -#define WINED3D_SHADER_CAP_SRGB_WRITE 0x00000002 -#define WINED3D_SHADER_CAP_DOUBLE_PRECISION 0x00000004 +#define WINED3D_SHADER_CAP_VS_CLIPPING 0x00000001u +#define WINED3D_SHADER_CAP_SRGB_WRITE 0x00000002u +#define WINED3D_SHADER_CAP_DOUBLE_PRECISION 0x00000004u +#define WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION 0x00000008u struct shader_caps { @@ -4842,15 +4844,6 @@ static inline BOOL can_use_texture_swizzle(const struct wined3d_d3d_info *d3d_in return d3d_info->texture_swizzle && !is_complex_fixup(format->color_fixup) && !is_scaling_fixup(format->color_fixup); } -static inline BOOL needs_interpolation_qualifiers_for_shader_outputs(const struct wined3d_gl_info *gl_info) -{ - /* In GLSL 4.40+ it is fine to specify interpolation qualifiers only in - * fragment shaders. In older GLSL versions interpolation qualifiers must - * match between shader stages. - */ - return gl_info->glsl_version < MAKEDWORD_VERSION(4, 40); -} - static inline BOOL is_rasterization_disabled(const struct wined3d_shader *geometry_shader) { return geometry_shader

1 0