- Wine-Commits - list.winehq.org

Stefan Dösinger : vkd3d: Implement opening and closing shader caches.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: f24005507c153d3b4c9d325e8c71650100fb3562 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f24005507c153d3b4c9d325e8c716… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 5 14:08:55 2024 +0300 vkd3d: Implement opening and closing shader caches. --- Makefile.am | 1 + libs/vkd3d/cache.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ libs/vkd3d/device.c | 14 +++++++++++ libs/vkd3d/vkd3d_private.h | 6 +++++ 4 files changed, 80 insertions(+) diff --git a/Makefile.am b/Makefile.am index 995f70b2..876b4f52 100644 --- a/Makefile.am +++ b/Makefile.am @@ -356,6 +356,7 @@ libvkd3d_la_SOURCES = \ include/vkd3d_d3d12.idl \ include/vkd3d_d3dcommon.idl \ include/vkd3d_unknown.idl \ + libs/vkd3d/cache.c \ libs/vkd3d/command.c \ libs/vkd3d/device.c \ libs/vkd3d/resource.c \ diff --git a/libs/vkd3d/cache.c b/libs/vkd3d/cache.c new file mode 100644 index 00000000..56ba6990 --- /dev/null +++ b/libs/vkd3d/cache.c @@ -0,0 +1,59 @@ +/* + * Copyright 2024 Stefan Dösinger for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "vkd3d_private.h" + +struct vkd3d_shader_cache +{ + unsigned int refcount; +}; + +int vkd3d_shader_open_cache(struct vkd3d_shader_cache **cache) +{ + struct vkd3d_shader_cache *object; + + TRACE("%p.\n", cache); + + object = vkd3d_malloc(sizeof(*object)); + if (!object) + return VKD3D_ERROR_OUT_OF_MEMORY; + + object->refcount = 1; + *cache = object; + + return VKD3D_OK; +} + +unsigned int vkd3d_shader_cache_incref(struct vkd3d_shader_cache *cache) +{ + unsigned int refcount = vkd3d_atomic_increment_u32(&cache->refcount); + TRACE("cache %p refcount %u.\n", cache, refcount); + return refcount; +} + +unsigned int vkd3d_shader_cache_decref(struct vkd3d_shader_cache *cache) +{ + unsigned int refcount = vkd3d_atomic_decrement_u32(&cache->refcount); + TRACE("cache %p refcount %u.\n", cache, refcount); + + if (refcount) + return refcount; + + vkd3d_free(cache); + return 0; +} diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 65db8b70..266465e0 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2532,6 +2532,7 @@ struct d3d12_cache_session struct d3d12_device *device; struct vkd3d_private_store private_store; D3D12_SHADER_CACHE_SESSION_DESC desc; + struct vkd3d_shader_cache *cache; }; static inline struct d3d12_cache_session *impl_from_ID3D12ShaderCacheSession(ID3D12ShaderCacheSession *iface) @@ -2582,6 +2583,7 @@ static void d3d12_cache_session_destroy(struct d3d12_cache_session *session) TRACE("Destroying cache session %p.\n", session); + vkd3d_shader_cache_decref(session->cache); vkd3d_private_store_destroy(&session->private_store); vkd3d_free(session); @@ -2707,6 +2709,7 @@ static const struct ID3D12ShaderCacheSessionVtbl d3d12_cache_session_vtbl = static HRESULT d3d12_cache_session_init(struct d3d12_cache_session *session, struct d3d12_device *device, const D3D12_SHADER_CACHE_SESSION_DESC *desc) { + enum vkd3d_result ret; HRESULT hr; session->ID3D12ShaderCacheSession_iface.lpVtbl = &d3d12_cache_session_vtbl; @@ -2723,6 +2726,17 @@ static HRESULT d3d12_cache_session_init(struct d3d12_cache_session *session, if (FAILED(hr = vkd3d_private_store_init(&session->private_store))) return hr; + if (session->desc.Mode == D3D12_SHADER_CACHE_MODE_DISK) + FIXME("Disk caches are not yet implemented.\n"); + + ret = vkd3d_shader_open_cache(&session->cache); + if (ret) + { + WARN("Failed to open shader cache.\n"); + vkd3d_private_store_destroy(&session->private_store); + return hresult_from_vkd3d_result(ret); + } + d3d12_device_add_ref(session->device = device); return S_OK; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index d5e12ee3..91ffa6e9 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1927,4 +1927,10 @@ static inline void vkd3d_prepend_struct(void *header, void *structure) vkd3d_header->next = vkd3d_structure; } +struct vkd3d_shader_cache; + +int vkd3d_shader_open_cache(struct vkd3d_shader_cache **cache); +unsigned int vkd3d_shader_cache_incref(struct vkd3d_shader_cache *cache); +unsigned int vkd3d_shader_cache_decref(struct vkd3d_shader_cache *cache); + #endif /* __VKD3D_PRIVATE_H */

1 0

Giovanni Mascellani : ci: Build Mesa for release.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: 42f07352a071924d4ddf82a5f05741878b55ee8e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/42f07352a071924d4ddf82a5f0574… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Apr 8 15:49:00 2024 +0200 ci: Build Mesa for release. Otherwise it trips on a few failed assertions in d3d12.c. --- gitlab/image.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab/image.docker b/gitlab/image.docker index fb3ed626..9807e306 100644 --- a/gitlab/image.docker +++ b/gitlab/image.docker @@ -75,7 +75,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ cd mesa && \ mkdir build && \ cd build && \ - meson setup -Dprefix=/opt/mesa24 -Dplatforms= -Dvideo-codecs= -Dvulkan-drivers=swrast -Dgallium-drivers=swrast -Dopengl=true -Degl=enabled -Dglvnd=true -Dshared-glapi=enabled -Dglx=disabled -Dgles1=disabled -Dgles2=disabled .. && \ + meson setup --buildtype release -Dprefix=/opt/mesa24 -Dplatforms= -Dvideo-codecs= -Dvulkan-drivers=swrast -Dgallium-drivers=swrast -Dopengl=true -Degl=enabled -Dglvnd=true -Dshared-glapi=enabled -Dglx=disabled -Dgles1=disabled -Dgles2=disabled .. && \ meson install && \ cd ../.. && \ rm -fr mesa && \

1 0

Giovanni Mascellani : tests: Add llvmpipe among the Mesa drivers.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: 59a5d8f852966713979060b901eaf362874c4994 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/59a5d8f852966713979060b901eaf… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 5 23:08:35 2024 +0200 tests: Add llvmpipe among the Mesa drivers. --- tests/d3d12_crosstest.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 6b532bda..99641425 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -654,6 +654,7 @@ static inline bool is_mesa_device(ID3D12Device *device) get_driver_properties(device, NULL, &properties); return properties.driverID == VK_DRIVER_ID_MESA_RADV_KHR + || properties.driverID == VK_DRIVER_ID_MESA_LLVMPIPE || properties.driverID == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR; }

1 0

Giovanni Mascellani : tests: Pop the test context when leaving its scope.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: 0be29f78c0b0d321665b12d2458c06a168c763f9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0be29f78c0b0d321665b12d2458c0… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 5 23:16:38 2024 +0200 tests: Pop the test context when leaving its scope. --- tests/d3d12.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 0a55cddb..7108068b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -32472,7 +32472,10 @@ static void test_resource_allocation_info(void) ok(infos1[i].SizeInBytes == sizes[i], "Got unexpected size %"PRIu64".\n", infos1[i].SizeInBytes); if (!i) + { + vkd3d_test_pop_context(); continue; + } ok(infos1[i].Offset - infos1[i - 1].Offset >= infos1[i - 1].SizeInBytes, "Got unexpected prev size %"PRIu64", prev offset %"PRIu64", offset %"PRIu64".\n",

1 0

Giovanni Mascellani : tests: Skip some tests that crash on llvmpipe.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: 7cfb02cfd365d59d7af3aa6c3113a04dc9e3cc91 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7cfb02cfd365d59d7af3aa6c3113a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 5 23:08:35 2024 +0200 tests: Skip some tests that crash on llvmpipe. --- tests/d3d12.c | 18 +++++++++++++++++ tests/d3d12_crosstest.h | 52 +++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 62 insertions(+), 8 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1222ed05..0a55cddb 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -19588,6 +19588,15 @@ static void test_null_srv(void) queue = context.queue; device = context.device; + if (is_llvmpipe_device_gte(device, 23, 2, 1)) + { + /* llvmpipe crashes when mutable descriptors are used. I don't + * know yet whether this is a bug in vkd3d or Mesa. */ + skip("Test crashes on llvmpipe, skipping.\n"); + destroy_test_context(&context); + return; + } + context.root_signature = create_texture_root_signature(context.device, D3D12_SHADER_VISIBILITY_PIXEL, 4, 0); @@ -19803,6 +19812,15 @@ static void test_null_uav(void) command_list = context.list; queue = context.queue; + if (is_llvmpipe_device_gte(device, 23, 2, 1)) + { + /* llvmpipe crashes when mutable descriptors are used. I don't + * know yet whether this is a bug in vkd3d or Mesa. */ + skip("Test crashes on llvmpipe, skipping.\n"); + destroy_test_context(&context); + return; + } + descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV; descriptor_ranges[0].NumDescriptors = 1; descriptor_ranges[0].BaseShaderRegister = 1; diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index e2401645..a27b62e7 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -406,6 +406,12 @@ static inline bool is_llvmpipe_device(ID3D12Device *device) return false; } +static inline bool is_llvmpipe_device_gte(ID3D12Device *device, + uint32_t major, uint32_t minor, uint32_t patch) +{ + return false; +} + static inline bool is_nvidia_device(ID3D12Device *device) { return false; @@ -564,7 +570,8 @@ static ID3D12Device *create_device(void) return SUCCEEDED(hr) ? device : NULL; } -static bool get_driver_properties(ID3D12Device *device, VkPhysicalDeviceDriverPropertiesKHR *driver_properties) +static bool get_driver_properties(ID3D12Device *device, VkPhysicalDeviceProperties *device_properties, + VkPhysicalDeviceDriverPropertiesKHR *driver_properties) { PFN_vkGetPhysicalDeviceProperties2KHR pfn_vkGetPhysicalDeviceProperties2KHR; VkPhysicalDeviceProperties2 device_properties2; @@ -588,6 +595,8 @@ static bool get_driver_properties(ID3D12Device *device, VkPhysicalDeviceDriverPr device_properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; device_properties2.pNext = driver_properties; pfn_vkGetPhysicalDeviceProperties2KHR(vk_physical_device, &device_properties2); + if (device_properties) + *device_properties = device_properties2.properties; return true; } @@ -618,7 +627,7 @@ LOAD_VK_PFN(vkGetInstanceProcAddr) if (SUCCEEDED(hr = create_vkd3d_device(instance, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device))) { - if (get_driver_properties(device, &driver_properties)) + if (get_driver_properties(device, NULL, &driver_properties)) trace("Driver name: %s, driver info: %s.\n", driver_properties.driverName, driver_properties.driverInfo); ID3D12Device_Release(device); @@ -641,7 +650,7 @@ static inline bool is_mesa_device(ID3D12Device *device) { VkPhysicalDeviceDriverPropertiesKHR properties; - get_driver_properties(device, &properties); + get_driver_properties(device, NULL, &properties); return properties.driverID == VK_DRIVER_ID_MESA_RADV_KHR || properties.driverID == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR; } @@ -650,7 +659,7 @@ static inline bool is_mesa_intel_device(ID3D12Device *device) { VkPhysicalDeviceDriverPropertiesKHR properties; - get_driver_properties(device, &properties); + get_driver_properties(device, NULL, &properties); return properties.driverID == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR; } @@ -658,15 +667,42 @@ static inline bool is_llvmpipe_device(ID3D12Device *device) { VkPhysicalDeviceDriverPropertiesKHR properties; - get_driver_properties(device, &properties); + get_driver_properties(device, NULL, &properties); return properties.driverID == VK_DRIVER_ID_MESA_LLVMPIPE; } +static inline bool is_llvmpipe_device_gte(ID3D12Device *device, + uint32_t major, uint32_t minor, uint32_t patch) +{ + VkPhysicalDeviceDriverPropertiesKHR driver_properties; + VkPhysicalDeviceProperties device_properties; + + get_driver_properties(device, &device_properties, &driver_properties); + if (driver_properties.driverID != VK_DRIVER_ID_MESA_LLVMPIPE) + return false; + + if (device_properties.driverVersion == 1) + { + uint32_t driver_major, driver_minor, driver_patch; + + /* llvmpipe doesn't provide a valid driverVersion value, so we resort to parsing the + * driverInfo string. */ + if (sscanf(driver_properties.driverInfo, "Mesa %u.%u.%u", + &driver_major, &driver_minor, &driver_patch) == 3) + { + device_properties.driverVersion = VK_MAKE_API_VERSION(0, + driver_major, driver_minor, driver_patch); + } + } + + return device_properties.driverVersion >= VK_MAKE_API_VERSION(0, major, minor, patch); +} + static inline bool is_nvidia_device(ID3D12Device *device) { VkPhysicalDeviceDriverPropertiesKHR properties; - get_driver_properties(device, &properties); + get_driver_properties(device, NULL, &properties); return properties.driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY_KHR; } @@ -674,7 +710,7 @@ static inline bool is_radv_device(ID3D12Device *device) { VkPhysicalDeviceDriverPropertiesKHR properties; - get_driver_properties(device, &properties); + get_driver_properties(device, NULL, &properties); return properties.driverID == VK_DRIVER_ID_MESA_RADV_KHR; } @@ -682,7 +718,7 @@ static inline bool is_mvk_device(ID3D12Device *device) { VkPhysicalDeviceDriverPropertiesKHR properties; - get_driver_properties(device, &properties); + get_driver_properties(device, NULL, &properties); return properties.driverID == VK_DRIVER_ID_MOLTENVK; }

1 0

Conor McCarthy : tests/hlsl: Add tests for CalculateLevelOfDetail().
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: bdfa14d219c68aab54a3a8a5ddcb8a99698332e7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bdfa14d219c68aab54a3a8a5ddcb8… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Mar 21 11:21:12 2024 +1000 tests/hlsl: Add tests for CalculateLevelOfDetail(). Includes improvements made by Giovanni Mascellani. --- Makefile.am | 1 + tests/hlsl/calculate-lod.shader_test | 84 ++++++++++++++++++++++++++++++++++++ tests/shader_runner_d3d11.c | 2 +- tests/shader_runner_d3d12.c | 2 +- 4 files changed, 87 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index ead3c1f5..995f70b2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,6 +65,7 @@ vkd3d_shader_tests = \ tests/hlsl/bitwise.shader_test \ tests/hlsl/bool-cast.shader_test \ tests/hlsl/bool-semantics.shader_test \ + tests/hlsl/calculate-lod.shader_test \ tests/hlsl/cast-64-bit.shader_test \ tests/hlsl/cast-broadcast.shader_test \ tests/hlsl/cast-componentwise-compatible.shader_test \ diff --git a/tests/hlsl/calculate-lod.shader_test b/tests/hlsl/calculate-lod.shader_test new file mode 100644 index 00000000..807776ee --- /dev/null +++ b/tests/hlsl/calculate-lod.shader_test @@ -0,0 +1,84 @@ +[require] +shader model >= 4.1 + + +[sampler 0] +filter linear linear linear +address clamp clamp clamp + +[srv 0] +size (2d, 4, 4) +levels 3 + +0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 +0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 +0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 +0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 + + +[pixel shader todo] +sampler s; +Texture2D t; + +float4 main(float4 pos : sv_position) : sv_target +{ + return float4(t.CalculateLevelOfDetail(s, pos.xy), + t.CalculateLevelOfDetail(s, float2(0.5 * pos.x, 0.5 * pos.y)), + t.CalculateLevelOfDetail(s, float2(0.25 * pos.x, 0.25 * pos.y)), + floor(10.0 * t.CalculateLevelOfDetail(s, float2(0.1 * pos.x, 0.7 * pos.y)))); +} + +[test] +todo draw quad +probe all rgba (2.0, 1.0, 0.0, 14.0) + + +[pixel shader todo] +sampler s; +Texture2D t; + +float4 main(float4 pos : sv_position) : sv_target +{ + return float4(t.CalculateLevelOfDetail(s, float2(3.0 * pos.x, 5.0 * pos.y)), + t.CalculateLevelOfDetail(s, float2(10.0 * pos.x, 10.0 * pos.y)), + t.CalculateLevelOfDetail(s, float2(0.1 * pos.x, 0.02 * pos.y)), + t.CalculateLevelOfDetail(s, float2(0.01 * pos.x, 0.01 * pos.y))); +} + +[test] +todo draw quad +probe all rgba (2.0, 2.0, 0.0, 0.0) + + +[pixel shader todo] +sampler s; +Texture2D t; + +float4 main(float4 pos : sv_position) : sv_target +{ + return float4(t.CalculateLevelOfDetailUnclamped(s, pos.xy), + t.CalculateLevelOfDetailUnclamped(s, float2(0.5 * pos.x, 0.5 * pos.y)), + t.CalculateLevelOfDetailUnclamped(s, float2(0.25 * pos.x, 0.25 * pos.y)), + floor(10.0 * t.CalculateLevelOfDetailUnclamped(s, float2(0.1 * pos.x, 0.7 * pos.y)))); +} + +[test] +todo draw quad +probe all rgba (2.0, 1.0, 0.0, 14.0) + + +[pixel shader todo] +sampler s; +Texture2D t; + +float4 main(float4 pos : sv_position) : sv_target +{ + return float4(floor(10.0 * t.CalculateLevelOfDetailUnclamped(s, float2(3.0 * pos.x, 6.0 * pos.y))), + floor(10.0 * t.CalculateLevelOfDetailUnclamped(s, float2(8.0 * pos.x, 8.0 * pos.y))), + floor(10.0 * t.CalculateLevelOfDetailUnclamped(s, float2(0.1 * pos.x, 0.02 * pos.y))), + floor(10.0 * t.CalculateLevelOfDetailUnclamped(s, float2(0.01 * pos.x, 0.01 * pos.y)))); +} + +[test] +todo draw quad +probe all rgba (45.0, 50.0, -14.0, -47.0) diff --git a/tests/shader_runner_d3d11.c b/tests/shader_runner_d3d11.c index 1285ca41..b26d6a36 100644 --- a/tests/shader_runner_d3d11.c +++ b/tests/shader_runner_d3d11.c @@ -358,7 +358,7 @@ static ID3D11Buffer *create_buffer(ID3D11Device *device, unsigned int bind_flags static void init_resource_2d(struct d3d11_shader_runner *runner, struct d3d11_resource *resource, const struct resource_params *params) { - D3D11_SUBRESOURCE_DATA resource_data[2]; + D3D11_SUBRESOURCE_DATA resource_data[3]; ID3D11Device *device = runner->device; D3D11_TEXTURE2D_DESC desc = {0}; HRESULT hr; diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 9bf7bb24..56844ae3 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -104,7 +104,7 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co struct d3d12_shader_runner *runner = d3d12_shader_runner(r); struct test_context *test_context = &runner->test_context; ID3D12Device *device = test_context->device; - D3D12_SUBRESOURCE_DATA resource_data[2] = {0}; + D3D12_SUBRESOURCE_DATA resource_data[3] = {0}; struct d3d12_resource *resource; unsigned int buffer_offset = 0; D3D12_RESOURCE_STATES state;

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic CalculateLOD.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: cb5411408a1399e6bb27c6cf104edc5381ef6742 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cb5411408a1399e6bb27c6cf104ed… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 15 00:11:56 2023 +1000 vkd3d-shader/dxil: Implement DX intrinsic CalculateLOD. --- libs/vkd3d-shader/dxil.c | 36 ++++++++++++++++++++++++++++++++++++ tests/hlsl/calculate-lod.shader_test | 8 ++++---- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 03c5458b..da8ba662 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -404,6 +404,7 @@ enum dx_intrinsic_opcode DX_ATOMIC_BINOP = 78, DX_ATOMIC_CMP_XCHG = 79, DX_BARRIER = 80, + DX_CALCULATE_LOD = 81, DX_DISCARD = 82, DX_DERIV_COARSEX = 83, DX_DERIV_COARSEY = 84, @@ -4486,6 +4487,40 @@ static void sm6_parser_emit_dx_buffer_update_counter(struct sm6_parser *sm6, enu instruction_dst_param_init_ssa_scalar(ins, sm6); } +static void sm6_parser_emit_dx_calculate_lod(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + const struct sm6_value *resource, *sampler; + struct vkd3d_shader_src_param *src_params; + struct vkd3d_shader_instruction *ins; + struct vkd3d_shader_register coord; + unsigned int clamp; + + resource = operands[0]; + sampler = operands[1]; + if (!sm6_value_validate_is_texture_handle(resource, op, sm6) + || !sm6_value_validate_is_sampler_handle(sampler, op, sm6)) + { + return; + } + + if (!sm6_parser_emit_coordinate_construct(sm6, &operands[2], 3, NULL, state, &coord)) + return; + + clamp = sm6_value_get_constant_uint(operands[5]); + + ins = state->ins; + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_LOD); + if (!(src_params = instruction_src_params_alloc(ins, 3, sm6))) + return; + src_param_init_vector_from_reg(&src_params[0], &coord); + src_params[1].reg = resource->u.handle.reg; + src_param_init_scalar(&src_params[1], !clamp); + src_param_init_vector_from_reg(&src_params[2], &sampler->u.handle.reg); + + instruction_dst_param_init_ssa_scalar(ins, sm6); +} + static void sm6_parser_emit_dx_cbuffer_load(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { @@ -5514,6 +5549,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_BUFFER_LOAD ] = {"o", "Hii", sm6_parser_emit_dx_buffer_load}, [DX_BUFFER_STORE ] = {"v", "Hiiooooc", sm6_parser_emit_dx_buffer_store}, [DX_BUFFER_UPDATE_COUNTER ] = {"i", "H8", sm6_parser_emit_dx_buffer_update_counter}, + [DX_CALCULATE_LOD ] = {"f", "HHfffb", sm6_parser_emit_dx_calculate_lod}, [DX_CBUFFER_LOAD_LEGACY ] = {"o", "Hi", sm6_parser_emit_dx_cbuffer_load}, [DX_COS ] = {"g", "R", sm6_parser_emit_dx_sincos}, [DX_COUNT_BITS ] = {"i", "m", sm6_parser_emit_dx_unary}, diff --git a/tests/hlsl/calculate-lod.shader_test b/tests/hlsl/calculate-lod.shader_test index 807776ee..88325af6 100644 --- a/tests/hlsl/calculate-lod.shader_test +++ b/tests/hlsl/calculate-lod.shader_test @@ -29,7 +29,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +todo(sm<6 | glsl) draw quad probe all rgba (2.0, 1.0, 0.0, 14.0) @@ -46,7 +46,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +todo(sm<6 | glsl) draw quad probe all rgba (2.0, 2.0, 0.0, 0.0) @@ -63,7 +63,7 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +todo(sm<6 | glsl) draw quad probe all rgba (2.0, 1.0, 0.0, 14.0) @@ -80,5 +80,5 @@ float4 main(float4 pos : sv_position) : sv_target } [test] -todo draw quad +todo(sm<6 | glsl) draw quad probe all rgba (45.0, 50.0, -14.0, -47.0)

1 0

Giovanni Mascellani : tests: Print the device name.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: ecd38f3d1bbd0330fb9b6bd866361dcde14f9c4d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ecd38f3d1bbd0330fb9b6bd866361… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Apr 5 23:08:35 2024 +0200 tests: Print the device name. --- tests/d3d12_crosstest.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index a27b62e7..6b532bda 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -606,6 +606,7 @@ static bool get_driver_properties(ID3D12Device *device, VkPhysicalDeviceProperti static void init_adapter_info(void) { VkPhysicalDeviceDriverPropertiesKHR driver_properties; + VkPhysicalDeviceProperties device_properties; struct vkd3d_instance *instance; ID3D12Device *device; void *libvulkan; @@ -627,8 +628,9 @@ LOAD_VK_PFN(vkGetInstanceProcAddr) if (SUCCEEDED(hr = create_vkd3d_device(instance, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device))) { - if (get_driver_properties(device, NULL, &driver_properties)) - trace("Driver name: %s, driver info: %s.\n", driver_properties.driverName, driver_properties.driverInfo); + if (get_driver_properties(device, &device_properties, &driver_properties)) + trace("Driver name: %s, driver info: %s, device name: %s.\n", driver_properties.driverName, + driver_properties.driverInfo, device_properties.deviceName); ID3D12Device_Release(device); }

1 0

Giovanni Mascellani : vkd3d-shader/d3d-asm: Reset indent level on HS phases.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: a2bb4ef3014088cd5d5c285555640979cf431ee8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a2bb4ef3014088cd5d5c285555640… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Apr 8 23:45:11 2024 +0200 vkd3d-shader/d3d-asm: Reset indent level on HS phases. --- libs/vkd3d-shader/d3d_asm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 2b5feb94..b65b2fe2 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -2354,6 +2354,10 @@ enum vkd3d_result d3d_asm_compile(const struct vsir_program *program, break; case VKD3DSIH_LABEL: + case VKD3DSIH_HS_DECLS: + case VKD3DSIH_HS_CONTROL_POINT_PHASE: + case VKD3DSIH_HS_FORK_PHASE: + case VKD3DSIH_HS_JOIN_PHASE: indent = 0; break;

1 0

Giovanni Mascellani : tests: Mark some test failures as todo on llvmpipe.
by Alexandre Julliard April 11, 2024

April 11, 2024

Module: vkd3d Branch: master Commit: 0b2ce5c13a1d967bfaffe7db9407262af27a0623 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0b2ce5c13a1d967bfaffe7db94072… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Mar 12 11:37:00 2024 +0100 tests: Mark some test failures as todo on llvmpipe. --- tests/d3d12.c | 16 ++++++++++++++++ tests/d3d12_crosstest.h | 13 +++++++++++++ 2 files changed, 29 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index ccebf510..1222ed05 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -19214,8 +19214,16 @@ static void test_descriptors_visibility(void) root_signature_desc.NumStaticSamplers = 2; root_signature_desc.pStaticSamplers = sampler_desc; hr = create_root_signature(device, &root_signature_desc, &context.root_signature); + /* llvmpipe (from Mesa 24.0.4) has maxBoundDescriptorSet == 8, which is less than we need. */ + todo_if(is_llvmpipe_device(device)) ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); + if (FAILED(hr)) + { + destroy_test_context(&context); + return; + } + context.pipeline_state = create_pipeline_state(device, context.root_signature, context.render_target_desc.Format, &vs, &ps, NULL); @@ -20858,8 +20866,16 @@ static void test_depth_stencil_sampling(void) root_signature_desc.NumStaticSamplers = 2; root_signature_desc.pStaticSamplers = sampler_desc; hr = create_root_signature(device, &root_signature_desc, &context.root_signature); + /* llvmpipe (from Mesa 24.0.4) has maxBoundDescriptorSet == 8, which is less than we need. */ + todo_if(is_llvmpipe_device(device)) ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); + if (FAILED(hr)) + { + destroy_test_context(&context); + return; + } + pso_compare = create_pipeline_state(device, context.root_signature, context.render_target_desc.Format, NULL, &ps_compare, NULL); pso_depth = create_pipeline_state(device, diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 6c0a4ef1..e2401645 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -401,6 +401,11 @@ static inline bool is_mesa_intel_device(ID3D12Device *device) return false; } +static inline bool is_llvmpipe_device(ID3D12Device *device) +{ + return false; +} + static inline bool is_nvidia_device(ID3D12Device *device) { return false; @@ -649,6 +654,14 @@ static inline bool is_mesa_intel_device(ID3D12Device *device) return properties.driverID == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR; } +static inline bool is_llvmpipe_device(ID3D12Device *device) +{ + VkPhysicalDeviceDriverPropertiesKHR properties; + + get_driver_properties(device, &properties); + return properties.driverID == VK_DRIVER_ID_MESA_LLVMPIPE; +} + static inline bool is_nvidia_device(ID3D12Device *device) { VkPhysicalDeviceDriverPropertiesKHR properties;

1 0