wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-12-15 08:03:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

Updated vkd3d-latest

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2023-06-07 08:13:06 +10:00
parent 4625289771
commit d7bbcc7ad9
2 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
patches/vkd3d-latest/0004-Update-vkd3d-to-82ddc6b417b79919f3e730ef3f2e167ab846.patch Normal file
View File

@@ -0,0 +1,39 @@
From 0c66ff2fbfc263e55ebd008772f56e4f432e32a9 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 7 Jun 2023 08:12:13 +1000
Subject: [PATCH] Update vkd3d to 82ddc6b417b79919f3e730ef3f2e167ab8462010
---
libs/vkd3d/libs/vkd3d-shader/d3d_asm.c | 2 +-
libs/vkd3d/libs/vkd3d-shader/hlsl.y | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libs/vkd3d/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d/libs/vkd3d-shader/d3d_asm.c
index 3357b4505c0..0a821b5c878 100644
--- a/libs/vkd3d/libs/vkd3d-shader/d3d_asm.c
+++ b/libs/vkd3d/libs/vkd3d-shader/d3d_asm.c
@@ -646,7 +646,7 @@ static void shader_dump_decl_usage(struct vkd3d_d3d_asm_compiler *compiler,
break;
case VKD3D_SHADER_RESOURCE_TEXTURE_3D:
- shader_addline(buffer, "_3d");
+ shader_addline(buffer, "_volume");
break;
case VKD3D_SHADER_RESOURCE_TEXTURE_CUBE:
diff --git a/libs/vkd3d/libs/vkd3d-shader/hlsl.y b/libs/vkd3d/libs/vkd3d-shader/hlsl.y
index cf483d82c65..30d0975102f 100644
--- a/libs/vkd3d/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d/libs/vkd3d-shader/hlsl.y
@@ -5242,7 +5242,7 @@ type_no_void:
}
| KW_SAMPLERCUBE
{
- $$ = ctx->builtin_types.sampler[HLSL_SAMPLER_DIM_3D];
+ $$ = ctx->builtin_types.sampler[HLSL_SAMPLER_DIM_CUBE];
}
| KW_TEXTURE
{
--
2.40.1