mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

HLSL: Fix incorrect case in name of DX9-style cube sampler type (#2265)

Browse Source
This commit is contained in:
rdb 2020-06-15 14:39:43 +02:00 committed by GitHub
parent b919bc889e
commit ebf55a0711
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Test/hlsl.sample.dx9.frag
View File

@ -3,7 +3,7 @@ sampler g_sam : register(t0);
sampler1D g_sam1D : register(t1); sampler1D g_sam1D : register(t1);
sampler2D g_sam2D : register(t2); sampler2D g_sam2D : register(t2);
sampler3D g_sam3D : register(t3); sampler3D g_sam3D : register(t3);
samplerCube g_samCube : register(t4); samplerCUBE g_samCube : register(t4);
struct PS_OUTPUT struct PS_OUTPUT
{ {

2
hlsl/hlslParseables.cpp
View File

@ -324,7 +324,7 @@ glslang::TString& AppendTypeName(glslang::TString& s, const char* argOrder, cons
case 1: s += "1D"; break; case 1: s += "1D"; break;
case 2: s += (isMS ? "2DMS" : "2D"); break; case 2: s += (isMS ? "2DMS" : "2D"); break;
case 3: s += "3D"; break; case 3: s += "3D"; break;
case 4: s += "Cube"; break; case 4: s += (type == 'S'? "CUBE" : "Cube"); break;
default: s += "UNKNOWN_SAMPLER"; break; default: s += "UNKNOWN_SAMPLER"; break;
} }
} }

2
hlsl/hlslScanContext.cpp
View File

@ -317,7 +317,7 @@ void HlslScanContext::fillInKeywordMap()
(*KeywordMap)["sampler1D"] = EHTokSampler1d; (*KeywordMap)["sampler1D"] = EHTokSampler1d;
(*KeywordMap)["sampler2D"] = EHTokSampler2d; (*KeywordMap)["sampler2D"] = EHTokSampler2d;
(*KeywordMap)["sampler3D"] = EHTokSampler3d; (*KeywordMap)["sampler3D"] = EHTokSampler3d;
(*KeywordMap)["samplerCube"] = EHTokSamplerCube; (*KeywordMap)["samplerCUBE"] = EHTokSamplerCube;
(*KeywordMap)["sampler_state"] = EHTokSamplerState; (*KeywordMap)["sampler_state"] = EHTokSamplerState;
(*KeywordMap)["SamplerState"] = EHTokSamplerState; (*KeywordMap)["SamplerState"] = EHTokSamplerState;
(*KeywordMap)["SamplerComparisonState"] = EHTokSamplerComparisonState; (*KeywordMap)["SamplerComparisonState"] = EHTokSamplerComparisonState;