Offset layout qualifiers are only allowed on uniform block members

Same goes for the alignment qualifier.

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index 54451bcd4714f337ec114a39f016b1930ef16fa0..7e5f295f165ac3eda0993a7767b2b29fa9b6bbc5 100644 (file)
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -114,7 +114,9 @@ void DeclarationValidator::visit(Layout &layout)
                        }
                }
                else if(i->name=="offset")
                        }
                }
                else if(i->name=="offset")

-                       allowed = (variable && scope==INTERFACE_BLOCK);
+                       allowed = (variable && scope==INTERFACE_BLOCK && iface_block->interface=="uniform");
+               else if(i->name=="align")
+                       allowed = (scope==INTERFACE_BLOCK && iface_block->interface=="uniform");

                else if(i->name=="points")
                {
                        allowed = (stage->type==Stage::GEOMETRY && iface_layout && (iface_layout->interface=="in" || iface_layout->interface=="out"));
                else if(i->name=="points")
                {
                        allowed = (stage->type==Stage::GEOMETRY && iface_layout && (iface_layout->interface=="in" || iface_layout->interface=="out"));