Skip outermost array when assigning locations to auto-array interfaces

When assigning a location to an interface whose stage automatically converts the interfaces to an array, it now strips off the outermost array from the type before calculating how many locations it consumes.

Skip outermost array when assigning locations to auto-array interfaces
22b71f9a · Neil Roberts · fd9d9ef4 · 22b71f9a
Commit 22b71f9a authored May 10, 2018 by Neil Roberts
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

iomapper.cpp glslang/MachineIndependent/iomapper.cpp +10 -1

No files found.
--- a/glslang/MachineIndependent/iomapper.cpp
+++ b/glslang/MachineIndependent/iomapper.cpp
@@ -478,7 +478,16 @@ struct TDefaultIoResolverBase : public glslang::TIoMapResolver
        // Placeholder. This does not do proper cross-stage lining up, nor
        // work with mixed location/no-location declarations.
        int location = nextLocation;
-        nextLocation += TIntermediate::computeTypeLocationSize(type, stage);
+        int typeLocationSize;
+        // Don’t take into account the outer-most array if the stage’s
+        // interface is automatically an array.
+        if (type.getQualifier().isArrayedIo(stage)) {
+                TType elementType(type, 0);
+                typeLocationSize = TIntermediate::computeTypeLocationSize(elementType, stage);
+        } else {
+                typeLocationSize = TIntermediate::computeTypeLocationSize(type, stage);
+        }
+        nextLocation += typeLocationSize;
        return location;
    }