mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
80 lines
3.7 KiB
Diff
80 lines
3.7 KiB
Diff
From 112fd3af5d768c38517cfd4462ae586cf40f13c2 Mon Sep 17 00:00:00 2001
|
|
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
|
Date: Tue, 28 May 2024 07:40:44 +1000
|
|
Subject: [PATCH] Updated vkd3d to 9693271dcfb96e9cd8d44c181cf70044edbf6861.
|
|
|
|
---
|
|
libs/vkd3d/include/vkd3d_shader.h | 6 +++++-
|
|
libs/vkd3d/include/vkd3d_types.h | 2 +-
|
|
libs/vkd3d/libs/vkd3d-shader/ir.c | 1 +
|
|
libs/vkd3d/libs/vkd3d/resource.c | 6 ++++--
|
|
4 files changed, 11 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/libs/vkd3d/include/vkd3d_shader.h b/libs/vkd3d/include/vkd3d_shader.h
|
|
index 2b32b8a3e98..082f34179a3 100644
|
|
--- a/libs/vkd3d/include/vkd3d_shader.h
|
|
+++ b/libs/vkd3d/include/vkd3d_shader.h
|
|
@@ -2059,8 +2059,12 @@ VKD3D_SHADER_API const enum vkd3d_shader_target_type *vkd3d_shader_get_supported
|
|
* - VKD3D_SHADER_SOURCE_D3D_BYTECODE to VKD3D_SHADER_TARGET_SPIRV_TEXT
|
|
* (if vkd3d was compiled with SPIRV-Tools)
|
|
* - VKD3D_SHADER_SOURCE_D3D_BYTECODE to VKD3D_SHADER_TARGET_D3D_ASM
|
|
- * - VKD3D_SHADER_SOURCE_HLSL to VKD3D_SHADER_TARGET_DXBC_TPF
|
|
+ * - VKD3D_SHADER_SOURCE_HLSL to VKD3D_SHADER_TARGET_SPIRV_BINARY
|
|
+ * - VKD3D_SHADER_SOURCE_HLSL to VKD3D_SHADER_TARGET_SPIRV_TEXT
|
|
+ * (if vkd3d was compiled with SPIRV-Tools)
|
|
+ * - VKD3D_SHADER_SOURCE_HLSL to VKD3D_SHADER_TARGET_D3D_ASM
|
|
* - VKD3D_SHADER_SOURCE_HLSL to VKD3D_SHADER_TARGET_D3D_BYTECODE
|
|
+ * - VKD3D_SHADER_SOURCE_HLSL to VKD3D_SHADER_TARGET_DXBC_TPF
|
|
* - VKD3D_SHADER_SOURCE_HLSL to VKD3D_SHADER_TARGET_FX
|
|
*
|
|
* Supported transformations can also be detected at runtime with the functions
|
|
diff --git a/libs/vkd3d/include/vkd3d_types.h b/libs/vkd3d/include/vkd3d_types.h
|
|
index dc5a7c064ae..f5a10117c12 100644
|
|
--- a/libs/vkd3d/include/vkd3d_types.h
|
|
+++ b/libs/vkd3d/include/vkd3d_types.h
|
|
@@ -41,7 +41,7 @@ enum vkd3d_result
|
|
{
|
|
/** Success. */
|
|
VKD3D_OK = 0,
|
|
- /** Success as a result of there being nothing to do. */
|
|
+ /** Success as a result of there being nothing to do. \since 1.12 */
|
|
VKD3D_FALSE = 1,
|
|
/** An unspecified failure occurred. */
|
|
VKD3D_ERROR = -1,
|
|
diff --git a/libs/vkd3d/libs/vkd3d-shader/ir.c b/libs/vkd3d/libs/vkd3d-shader/ir.c
|
|
index 37818d4dfad..b3b745fc1b2 100644
|
|
--- a/libs/vkd3d/libs/vkd3d-shader/ir.c
|
|
+++ b/libs/vkd3d/libs/vkd3d-shader/ir.c
|
|
@@ -1886,6 +1886,7 @@ static enum vkd3d_result vsir_program_normalise_combined_samplers(struct vsir_pr
|
|
srcs[1].reg.idx[1] = ins->src[1].reg.idx[0];
|
|
srcs[1].reg.idx_count = 2;
|
|
srcs[1].reg.data_type = VKD3D_DATA_RESOURCE;
|
|
+ srcs[1].reg.dimension = VSIR_DIMENSION_VEC4;
|
|
srcs[1].swizzle = VKD3D_SHADER_NO_SWIZZLE;
|
|
|
|
srcs[2].reg.type = VKD3DSPR_SAMPLER;
|
|
diff --git a/libs/vkd3d/libs/vkd3d/resource.c b/libs/vkd3d/libs/vkd3d/resource.c
|
|
index 7a2f464c98e..c897d9f2c5a 100644
|
|
--- a/libs/vkd3d/libs/vkd3d/resource.c
|
|
+++ b/libs/vkd3d/libs/vkd3d/resource.c
|
|
@@ -4284,12 +4284,14 @@ static HRESULT d3d12_descriptor_heap_create_descriptor_set(struct d3d12_descript
|
|
VkDescriptorSetVariableDescriptorCountAllocateInfoEXT set_size;
|
|
VkDescriptorSetAllocateInfo set_desc;
|
|
VkResult vr;
|
|
+ HRESULT hr;
|
|
|
|
if (!device->vk_descriptor_heap_layouts[set].vk_set_layout)
|
|
{
|
|
/* Set 0 uses mutable descriptors, and this set is unused. */
|
|
- if (!descriptor_heap->vk_descriptor_sets[0].vk_set)
|
|
- d3d12_descriptor_heap_create_descriptor_set(descriptor_heap, device, 0);
|
|
+ if (!descriptor_heap->vk_descriptor_sets[0].vk_set
|
|
+ && FAILED(hr = d3d12_descriptor_heap_create_descriptor_set(descriptor_heap, device, 0)))
|
|
+ return hr;
|
|
descriptor_set->vk_set = descriptor_heap->vk_descriptor_sets[0].vk_set;
|
|
descriptor_set->vk_type = device->vk_descriptor_heap_layouts[set].type;
|
|
return S_OK;
|
|
--
|
|
2.43.0
|
|
|