From 127224d816f867106da64605cb06994282d0d901 Mon Sep 17 00:00:00 2001
From: Mateusz Kielan <devsh.graphicsprogramming@gmail.com>
Date: Sat, 18 Apr 2020 21:21:43 +0200
Subject: [PATCH] Fix issue #1327

Drop the nonuniform_qualifier in GLSL downcompile NV_gpu_shader5 supports divergent indexing transparently, but obviously runtime sized descriptor arrays are not supported by anything in OpenGL.
---
 spirv_glsl.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/spirv_glsl.cpp b/spirv_glsl.cpp
index 0fe03f55..1d51b439 100644
--- a/spirv_glsl.cpp
+++ b/spirv_glsl.cpp
@@ -501,6 +501,11 @@ void CompilerGLSL::find_static_extensions()
 		switch (cap)
 		{
 		case CapabilityShaderNonUniformEXT:
+			if (!options.vulkan_semantics)
+				require_extension_internal("GL_NV_gpu_shader5");
+			else
+				require_extension_internal("GL_EXT_nonuniform_qualifier");
+			break;
 		case CapabilityRuntimeDescriptorArrayEXT:
 			if (!options.vulkan_semantics)
 				SPIRV_CROSS_THROW("GL_EXT_nonuniform_qualifier is only supported in Vulkan GLSL.");
@@ -525,6 +530,11 @@ string CompilerGLSL::compile()
 {
 	if (options.vulkan_semantics)
 		backend.allow_precision_qualifiers = true;
+	else
+	{
+		// only NV_gpu_shader5 supports divergent indexing on OpenGL, and it does so without extra qualifiers
+		backend.nonuniform_qualifier = "";
+	}
 	backend.force_gl_in_out_block = true;
 	backend.supports_extensions = true;
 	backend.use_array_constructor = true;