HLSL: phase 3b: Texture methods remember and return vector size.
Also makes a (correct) test change for global -> temp vars.
diff --git a/hlsl/hlslGrammar.cpp b/hlsl/hlslGrammar.cpp
index c9c4716..f064f1f 100755
--- a/hlsl/hlslGrammar.cpp
+++ b/hlsl/hlslGrammar.cpp
@@ -907,12 +907,6 @@
return false;
}
- // if (txType.getVectorSize() != 1 && txType.getVectorSize() != 4 && !image) {
- // // TODO: handle vec2/3 types
- // expected("vector size not yet supported in texture type");
- // return false;
- // }
-
if (ms && acceptTokenClass(EHTokComma)) {
// read sample count for multisample types, if given
if (! peekTokenClass(EHTokIntConstant)) {
@@ -957,6 +951,9 @@
sampler.setTexture(txType.getBasicType(), dim, array, shadow, ms);
}
}
+
+ // Remember the declared vector size.
+ sampler.vectorSize = txType.getVectorSize();
type.shallowCopy(TType(sampler, EvqUniform, arraySizes));
type.getQualifier().layoutFormat = format;