From 27384e04f60add37a6da961d05caf4b6b7ec6b2a Mon Sep 17 00:00:00 2001
From: Greg Fischer <greg@lunarg.com>
Date: Fri, 30 Jul 2021 11:11:16 -0600
Subject: [PATCH] Allow layout(std430) uniform with GL_EXT_scalar_block_layout

---
 Test/spv.scalarlayout.frag                 | 2 ++
 glslang/MachineIndependent/ParseHelper.cpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Test/spv.scalarlayout.frag b/Test/spv.scalarlayout.frag
index c7ecf502..e0e1b18d 100644
--- a/Test/spv.scalarlayout.frag
+++ b/Test/spv.scalarlayout.frag
@@ -27,6 +27,8 @@ layout(column_major, scalar) uniform B1
     S          i[2];  // offset = 160 (aligned to multiple of 8) stride = 48
 };
 
+layout (std430) uniform;
+
 void main()
 {
 }
diff --git a/glslang/MachineIndependent/ParseHelper.cpp b/glslang/MachineIndependent/ParseHelper.cpp
index d2ad355f..d84bc8da 100644
--- a/glslang/MachineIndependent/ParseHelper.cpp
+++ b/glslang/MachineIndependent/ParseHelper.cpp
@@ -3675,7 +3675,7 @@ void TParseContext::globalQualifierFixCheck(const TSourceLoc& loc, TQualifier& q
         if (blockName == nullptr &&
             qualifier.layoutPacking == ElpStd430)
         {
-            error(loc, "it is invalid to declare std430 qualifier on uniform", "", "");
+            requireExtensions(loc, 1, &E_GL_EXT_scalar_block_layout, "default std430 layout for uniform");
         }
         break;
     default: