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

WIP: HLSL: force uncombined flag off for Buffer<>

Browse Source
This commit is contained in:
steve-lunarg
2017-03-31 17:40:09 -06:00
parent f36542f46d
commit bf1537f4b4
6 changed files with 391 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hlsl/hlslGrammar.cpp
View File

@@ -1145,9 +1145,10 @@ bool HlslGrammar::acceptTextureType(TType& type)
bool array = false;
bool ms = false;
bool image = false;
bool combined = true;
switch (textureType) {
case EHTokBuffer: dim = EsdBuffer; break;
case EHTokBuffer: dim = EsdBuffer; combined = false; break;
case EHTokTexture1d: dim = Esd1D; break;
case EHTokTexture1darray: dim = Esd1D; array = true; break;
case EHTokTexture2d: dim = Esd2D; break;
@@ -1252,6 +1253,10 @@ bool HlslGrammar::acceptTextureType(TType& type)
// Remember the declared vector size.
sampler.vectorSize = txType.getVectorSize();
// Force uncombined, if necessary
if (!combined)
sampler.combined = false;
type.shallowCopy(TType(sampler, EvqUniform, arraySizes));
type.getQualifier().layoutFormat = format;