commit 4f2da27aec3e862b7d761dc66ea72bbeac980de1
author steve-lunarg <steve_gh@khasekhemwy.net> Mon Oct 10 15:24:57 2016 -0600
committer steve-lunarg <steve_gh@khasekhemwy.net> Fri Oct 14 18:44:32 2016 -0600
tree 8d1bb852f01ba61d0ca44250855018918a39a590
parent f042e407a9dfa803f493143f4665c4bbd3a3b5f1

HLSL: phase 3a: Add sub-vec4 rwtexture formats (qualifier.layoutFormat)

This PR sets the TQualifier layoutFormat according to the HLSL image type.
For instance:

  RWTexture1D <float2> g_tTex1df2;

becomes ElfRg32f.  Similar on Buffers, e.g, Buffer<float4> mybuffer;

The return type for image and buffer loads is now taken from the storage format.
Also, the qualifier for the return type is now (properly) a temp, not a global.

hlsl/hlslGrammar.cpp

diff --git a/hlsl/hlslGrammar.cpp b/hlsl/hlslGrammar.cpp
index 5f9ec26..c9c4716 100755
--- a/hlsl/hlslGrammar.cpp
+++ b/hlsl/hlslGrammar.cpp
@@ -907,11 +907,11 @@
             return false;
         }
 
-        if (txType.getVectorSize() != 1 && txType.getVectorSize() != 4) {
-            // TODO: handle vec2/3 types
-            expected("vector size not yet supported in texture type");
-            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
@@ -937,24 +937,14 @@
     }
 
     TArraySizes* arraySizes = nullptr;
-    const bool shadow = !image && (txType.isScalar() || (txType.isVector() && txType.getVectorSize() == 1));
+    const bool shadow = false; // declared on the sampler
 
     TSampler sampler;
     TLayoutFormat format = ElfNone;
 
-    // RWBuffer and RWTexture (images) require a TLayoutFormat.  We handle only a limit set.
-    if (image) {
-        if (txType.getVectorSize() != 4)
-            expected("4 component image");
-
-        switch (txType.getBasicType()) {
-        case EbtFloat: format = ElfRgba32f;  break;
-        case EbtInt:   format = ElfRgba32i;  break;
-        case EbtUint:  format = ElfRgba32ui; break;
-        default:
-            expected("unknown basic type in image format");
-        }
-    }
+    // Buffer, RWBuffer and RWTexture (images) require a TLayoutFormat.  We handle only a limit set.
+    if (image || dim == EsdBuffer)
+        format = parseContext.getLayoutFromTxType(token.loc, txType);
 
     // Non-image Buffers are combined
     if (dim == EsdBuffer && !image) {