From ebf55a0711b81ad1d0701d85c1c018b831243613 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 15 Jun 2020 14:39:43 +0200 Subject: [PATCH] HLSL: Fix incorrect case in name of DX9-style cube sampler type (#2265) --- Test/hlsl.sample.dx9.frag | 2 +- hlsl/hlslParseables.cpp | 2 +- hlsl/hlslScanContext.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Test/hlsl.sample.dx9.frag b/Test/hlsl.sample.dx9.frag index 26094193e..ed82c52a1 100644 --- a/Test/hlsl.sample.dx9.frag +++ b/Test/hlsl.sample.dx9.frag @@ -3,7 +3,7 @@ sampler g_sam : register(t0); sampler1D g_sam1D : register(t1); sampler2D g_sam2D : register(t2); sampler3D g_sam3D : register(t3); -samplerCube g_samCube : register(t4); +samplerCUBE g_samCube : register(t4); struct PS_OUTPUT { diff --git a/hlsl/hlslParseables.cpp b/hlsl/hlslParseables.cpp index a63ecb605..3becbf9ca 100644 --- a/hlsl/hlslParseables.cpp +++ b/hlsl/hlslParseables.cpp @@ -324,7 +324,7 @@ glslang::TString& AppendTypeName(glslang::TString& s, const char* argOrder, cons case 1: s += "1D"; break; case 2: s += (isMS ? "2DMS" : "2D"); break; case 3: s += "3D"; break; - case 4: s += "Cube"; break; + case 4: s += (type == 'S'? "CUBE" : "Cube"); break; default: s += "UNKNOWN_SAMPLER"; break; } } diff --git a/hlsl/hlslScanContext.cpp b/hlsl/hlslScanContext.cpp index 28a66bb47..5af321fa0 100644 --- a/hlsl/hlslScanContext.cpp +++ b/hlsl/hlslScanContext.cpp @@ -317,7 +317,7 @@ void HlslScanContext::fillInKeywordMap() (*KeywordMap)["sampler1D"] = EHTokSampler1d; (*KeywordMap)["sampler2D"] = EHTokSampler2d; (*KeywordMap)["sampler3D"] = EHTokSampler3d; - (*KeywordMap)["samplerCube"] = EHTokSamplerCube; + (*KeywordMap)["samplerCUBE"] = EHTokSamplerCube; (*KeywordMap)["sampler_state"] = EHTokSamplerState; (*KeywordMap)["SamplerState"] = EHTokSamplerState; (*KeywordMap)["SamplerComparisonState"] = EHTokSamplerComparisonState;