mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
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
|
|
|