Mesa (master): glsl/linker: Change the format of spec quotation

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue Oct 16 06:08:04 UTC 2018


Module: Mesa
Branch: master
Commit: d2ea3d4a76770e6c605490a991a4136469da6d35
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d2ea3d4a76770e6c605490a991a4136469da6d35

Author: Vadym Shovkoplias <vadim.shovkoplias at gmail.com>
Date:   Wed Oct 10 13:51:28 2018 +0300

glsl/linker: Change the format of spec quotation

Also there is no "OpenGL ES Shading Language 4.00" spec,
so change it to GLSL 4.00 spec.

Signed-off-by: Vadym Shovkoplias <vadym.shovkoplias at globallogic.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

---

 src/compiler/glsl/linker.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index 2f4c886054..7db34ebf95 100644
--- a/src/compiler/glsl/linker.cpp
+++ b/src/compiler/glsl/linker.cpp
@@ -4648,12 +4648,11 @@ verify_subroutine_associated_funcs(struct gl_shader_program *prog)
       gl_program *p = prog->_LinkedShaders[i]->Program;
       glsl_symbol_table *symbols = prog->_LinkedShaders[i]->symbols;
 
-      /*
-       * From OpenGL ES Shading Language 4.00 specification
-       * (6.1.2 Subroutines):
-       *     "A program will fail to compile or link if any shader
-       *     or stage contains two or more functions with the same
-       *     name if the name is associated with a subroutine type."
+      /* Section 6.1.2 (Subroutines) of the GLSL 4.00 spec says:
+       *
+       *   "A program will fail to compile or link if any shader
+       *    or stage contains two or more functions with the same
+       *    name if the name is associated with a subroutine type."
        */
       for (unsigned j = 0; j < p->sh.NumSubroutineFunctions; j++) {
          unsigned definitions = 0;




More information about the mesa-commit mailing list