mirror of
https://github.com/KhronosGroup/glslang
synced 2024-09-18 19:59:54 +00:00
HLSL: Fix incorrect case in name of DX9-style cube sampler type (#2265)
This commit is contained in:
parent
b919bc889e
commit
ebf55a0711
@ -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
|
||||
{
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user