Fix treatment of array input/output variables in reflection

* Non-block arrays should not be ignored when exploding types.
* When not exploding, set the array size correctly on each item.

diff --git a/Test/baseResults/hlsl.automap.frag.out b/Test/baseResults/hlsl.automap.frag.out
index 48f232c..7691b89 100644 (file)
--- a/Test/baseResults/hlsl.automap.frag.out
+++ b/Test/baseResults/hlsl.automap.frag.out
@@ -32,5 +32,5 @@ Buffer block reflection:
 Pipeline input reflection:
 
 Pipeline output reflection:
-@entryPointOutput: offset 0, type 8b52, size 0, index 0, binding -1, stages 16
+@entryPointOutput: offset 0, type 8b52, size 1, index 0, binding -1, stages 16
 

diff --git a/Test/baseResults/hlsl.reflection.binding.frag.out b/Test/baseResults/hlsl.reflection.binding.frag.out
index 484cfc6..a13e575 100644 (file)
--- a/Test/baseResults/hlsl.reflection.binding.frag.out
+++ b/Test/baseResults/hlsl.reflection.binding.frag.out
@@ -22,5 +22,5 @@ Buffer block reflection:
 Pipeline input reflection:
 
 Pipeline output reflection:
-psout.Color: offset 0, type 8b52, size 0, index 0, binding -1, stages 16
+psout.Color: offset 0, type 8b52, size 1, index 0, binding -1, stages 16
 

diff --git a/Test/baseResults/hlsl.reflection.vert.out b/Test/baseResults/hlsl.reflection.vert.out
index 30c6c9f..535c7fb 100644 (file)
--- a/Test/baseResults/hlsl.reflection.vert.out
+++ b/Test/baseResults/hlsl.reflection.vert.out
@@ -72,11 +72,11 @@ Buffer variable reflection:
 Buffer block reflection:
 
 Pipeline input reflection:
-attributeFloat: offset 0, type 1406, size 0, index 0, binding -1, stages 1
-attributeFloat2: offset 0, type 8b50, size 0, index 0, binding -1, stages 1
-attributeFloat3: offset 0, type 8b51, size 0, index 0, binding -1, stages 1
-attributeFloat4: offset 0, type 8b52, size 0, index 0, binding -1, stages 1
-attributeMat4: offset 0, type 8b5c, size 0, index 0, binding -1, stages 1
+attributeFloat: offset 0, type 1406, size 1, index 0, binding -1, stages 1
+attributeFloat2: offset 0, type 8b50, size 1, index 0, binding -1, stages 1
+attributeFloat3: offset 0, type 8b51, size 1, index 0, binding -1, stages 1
+attributeFloat4: offset 0, type 8b52, size 1, index 0, binding -1, stages 1
+attributeMat4: offset 0, type 8b5c, size 1, index 0, binding -1, stages 1
 
 Pipeline output reflection:
 

diff --git a/Test/baseResults/hlsl.shift.per-set.frag.out b/Test/baseResults/hlsl.shift.per-set.frag.out
index da2e544..60e2ecc 100644 (file)
--- a/Test/baseResults/hlsl.shift.per-set.frag.out
+++ b/Test/baseResults/hlsl.shift.per-set.frag.out
@@ -233,5 +233,5 @@ Buffer block reflection:
 Pipeline input reflection:
 
 Pipeline output reflection:
-@entryPointOutput: offset 0, type 8b52, size 0, index 0, binding -1, stages 16
+@entryPointOutput: offset 0, type 8b52, size 1, index 0, binding -1, stages 16
 

diff --git a/Test/baseResults/reflection.linked.out b/Test/baseResults/reflection.linked.out
index bc61fad..b1b2b3c 100644 (file)
--- a/Test/baseResults/reflection.linked.out
+++ b/Test/baseResults/reflection.linked.out
@@ -13,8 +13,8 @@ Buffer variable reflection:
 Buffer block reflection:
 
 Pipeline input reflection:
-vertin: offset 0, type 1406, size 0, index 0, binding -1, stages 1
+vertin: offset 0, type 1406, size 1, index 0, binding -1, stages 1
 
 Pipeline output reflection:
-fragout: offset 0, type 1406, size 0, index 0, binding -1, stages 16
+fragout: offset 0, type 1406, size 1, index 0, binding -1, stages 16
 

diff --git a/Test/baseResults/reflection.options.vert.out b/Test/baseResults/reflection.options.vert.out
index 45a7a87..98bed6d 100644 (file)
--- a/Test/baseResults/reflection.options.vert.out
+++ b/Test/baseResults/reflection.options.vert.out
@@ -40,4 +40,5 @@ outval.val: offset 0, type 1406, size 1, index 0, binding -1, stages 1
 outval.a: offset 0, type 8b51, size 1, index 0, binding -1, stages 1
 outval.b[0]: offset 0, type 8b50, size 4, index 0, binding -1, stages 1
 outval.c: offset 0, type 8b5a, size 1, index 0, binding -1, stages 1
+outarr[0]: offset 0, type 1406, size 3, index 0, binding -1, stages 1
 

diff --git a/Test/baseResults/reflection.vert.out b/Test/baseResults/reflection.vert.out
index f1219ef..e480e79 100644 (file)
--- a/Test/baseResults/reflection.vert.out
+++ b/Test/baseResults/reflection.vert.out
@@ -151,12 +151,13 @@ Buffer variable reflection:
 Buffer block reflection:
 
 Pipeline input reflection:
-attributeFloat: offset 0, type 1406, size 0, index 0, binding -1, stages 1
-attributeFloat2: offset 0, type 8b50, size 0, index 0, binding -1, stages 1
-attributeFloat3: offset 0, type 8b51, size 0, index 0, binding -1, stages 1
-attributeFloat4: offset 0, type 8b52, size 0, index 0, binding -1, stages 1
-attributeMat4: offset 0, type 8b5c, size 0, index 0, binding -1, stages 1
-gl_InstanceID: offset 0, type 1404, size 0, index 0, binding -1, stages 1
+attributeFloat: offset 0, type 1406, size 1, index 0, binding -1, stages 1
+attributeFloat2: offset 0, type 8b50, size 1, index 0, binding -1, stages 1
+attributeFloat3: offset 0, type 8b51, size 1, index 0, binding -1, stages 1
+attributeFloat4: offset 0, type 8b52, size 1, index 0, binding -1, stages 1
+attributeMat4: offset 0, type 8b5c, size 1, index 0, binding -1, stages 1
+attributeFloatArray: offset 0, type 1406, size 3, index 0, binding -1, stages 1
+gl_InstanceID: offset 0, type 1404, size 1, index 0, binding -1, stages 1
 
 Pipeline output reflection:
 

diff --git a/Test/reflection.options.vert b/Test/reflection.options.vert
index 38c82ba..0832c44 100644 (file)
--- a/Test/reflection.options.vert
+++ b/Test/reflection.options.vert
@@ -34,6 +34,7 @@ struct OutputStruct {
 };\r
 \r
 out OutputStruct outval;\r
+out float outarr[3];\r
 \r
 void main()\r
 {\r
@@ -48,4 +49,5 @@ void main()
     f += ubo.flt[gl_InstanceID];\r
     TriangleInfo tlocal[5] = t;\r
     outval.val = f;\r
+    outarr[2] = f;\r
 }\r

diff --git a/Test/reflection.vert b/Test/reflection.vert
index 0f14c82..e7ced20 100644 (file)
--- a/Test/reflection.vert
+++ b/Test/reflection.vert
@@ -107,6 +107,7 @@ layout(location = 2) in vec2 attributeFloat2;
 in vec3 attributeFloat3;\r
 in vec4 attributeFloat4;\r
 in mat4 attributeMat4;\r
+in float attributeFloatArray[3];\r
 \r
 uniform deep3 deepA[2], deepB[2], deepC[3], deepD[2];\r
 \r
@@ -223,6 +224,7 @@ void main()
     f += attributeFloat3.x;\r
     f += attributeFloat4.x;\r
     f += attributeMat4[0][1];\r
+    f += attributeFloatArray[2];\r
     f += buf1i.runtimeArray[3];\r
     f += buf2i.runtimeArray[3].c;\r
     f += buf3i.runtimeArray[gl_InstanceID];\r

diff --git a/glslang/MachineIndependent/reflection.cpp b/glslang/MachineIndependent/reflection.cpp
index 92fa968..54fc8ed 100644 (file)
--- a/glslang/MachineIndependent/reflection.cpp
+++ b/glslang/MachineIndependent/reflection.cpp
@@ -121,7 +121,7 @@ public:
                 }
 
                 // by convention if this is an arrayed block we ignore the array in the reflection
-                if (type.isArray()) {
+                if (type.isArray() && type.getBasicType() == EbtBlock) {
                     blowUpIOAggregate(input, baseName, TType(type, 0));
                 } else {               
                     blowUpIOAggregate(input, baseName, type);
@@ -130,7 +130,8 @@ public:
                 TReflection::TNameToIndex::const_iterator it = reflection.nameToIndex.find(name.c_str());
                 if (it == reflection.nameToIndex.end()) {
                     reflection.nameToIndex[name.c_str()] = (int)ioItems.size();
-                    ioItems.push_back(TObjectReflection(name.c_str(), type, 0, mapToGlType(type), 0, 0));
+                    ioItems.push_back(
+                        TObjectReflection(name.c_str(), type, 0, mapToGlType(type), mapToGlArraySize(type), 0));
 
                     EShLanguageMask& stages = ioItems.back().stages;
                     stages = static_cast<EShLanguageMask>(stages | 1 << intermediate.getStage());