Make minimum GLSL version for compute shaders GLSL 430

Compute shaders were added to the core OpenGL spec in version 4.3. Also don't output GL_ARB_explicit_attrib_location extension directive for compute shaders. This extension is only relevant for vertex and fragment shaders. BUG=angleproject:1442 TEST=angle_end2end_tests Change-Id: I92021ac048b38ffbc5a61af408b37c387193389b Reviewed-on: https://chromium-review.googlesource.com/418657Reviewed-by: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

Make minimum GLSL version for compute shaders GLSL 430
8c04d077 · Olli Etuaho · Commit Bot · 56a2f95f · 8c04d077 · 8c04d077
Commit 8c04d077 authored Dec 09, 2016 by Olli Etuaho Committed by Commit Bot Dec 09, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

TranslatorGLSL.cpp src/compiler/translator/TranslatorGLSL.cpp +2 -1

VersionGLSL.cpp src/compiler/translator/VersionGLSL.cpp +6 -0

No files found.
--- a/src/compiler/translator/TranslatorGLSL.cpp
+++ b/src/compiler/translator/TranslatorGLSL.cpp
@@ -253,7 +253,8 @@ void TranslatorGLSL::writeExtensionBehavior(TIntermNode *root)
    }

    // GLSL ES 3 explicit location qualifiers need to use an extension before GLSL 330
-    if (getShaderVersion() >= 300 && getOutputType() < SH_GLSL_330_CORE_OUTPUT)
+    if (getShaderVersion() >= 300 && getOutputType() < SH_GLSL_330_CORE_OUTPUT &&
+        getShaderType() != GL_COMPUTE_SHADER)
    {
        sink << "#extension GL_ARB_explicit_attrib_location : require\n";
    }

--- a/src/compiler/translator/VersionGLSL.cpp
+++ b/src/compiler/translator/VersionGLSL.cpp
@@ -6,6 +6,8 @@

 #include "compiler/translator/VersionGLSL.h"

+#include "angle_gl.h"
+
 namespace sh
 {

@@ -55,6 +57,10 @@ TVersionGLSL::TVersionGLSL(sh::GLenum type,
    {
        ensureVersionIsAtLeast(GLSL_VERSION_120);
    }
+    if (type == GL_COMPUTE_SHADER)
+    {
+        ensureVersionIsAtLeast(GLSL_VERSION_430);
+    }
 }

 void TVersionGLSL::visitSymbol(TIntermSymbol *node)