- Changed version to 1.8.8-rc

- Fixed problem with thick lines shader: gl_ClipDistance was written
  by both vertex and geometry shaders, which is normally an error
  (not captured by Nvidia Linux driver, but captured by NVidia Windows
   driver)
- Now shader compiler writes all shader sources to files when
  gfx:GL_debug is set, so that one can inspect them and test them
  with glslangValidator

Author: BrunoLevy

CMakeLists.txt

@@ -6,10 +6,10 @@ cmake_minimum_required(VERSION 3.0)
 cmake_policy(SET CMP0048 NEW)
 
 ##############################################################################
-set(VORPALINE_VERSION_RC FALSE)
+set(VORPALINE_VERSION_RC TRUE)
 set(VORPALINE_VERSION_MAJOR 1)
 set(VORPALINE_VERSION_MINOR 8)
-set(VORPALINE_VERSION_PATCH 7)
+set(VORPALINE_VERSION_PATCH 8)
 
 set(VORPALINE_VERSION_PLAIN ${VORPALINE_VERSION_MAJOR}.${VORPALINE_VERSION_MINOR}.${VORPALINE_VERSION_PATCH})
 if(VORPALINE_VERSION_RC)

src/lib/geogram_gfx/GLUP/shaders/GLUPGLSL/vertex_shader.h

@@ -42,7 +42,11 @@ void main(void) {
 
 #if GLUP_PRIMITIVE_DIMENSION==1
 
-#ifndef GLUP_NO_GL_CLIPPING	
+#ifndef GLUP_NO_GL_CLIPPING
+// For GLUP_THICK_LINES, gl_ClipDistance is computed in
+// geometry shader (and it is an error to write to it
+// both in vertex and geometry shaders).    
+#if (GLUP_PRIMITIVE != GLUP_THICK_LINES) 
     if(glupIsEnabled(GLUP_CLIPPING)) {
         gl_ClipDistance[0] = dot(                           
             vertex_in, GLUP.world_clip_plane               
@@ -51,6 +55,7 @@ void main(void) {
         gl_ClipDistance[0] = 0.0;                            
     }                                                       
 #endif
+#endif
 
 #elif GLUP_PRIMITIVE_DIMENSION==2
 

src/lib/geogram_gfx/GLUP/shaders/embedded_shaders.cpp

@@ -1619,7 +1619,11 @@ namespace GLUP {
         " \n"
         "#if GLUP_PRIMITIVE_DIMENSION==1 \n"
         " \n"
-        "#ifndef GLUP_NO_GL_CLIPPING	 \n"
+        "#ifndef GLUP_NO_GL_CLIPPING \n"
+        "// For GLUP_THICK_LINES, gl_ClipDistance is computed in \n"
+        "// geometry shader (and it is an error to write to it \n"
+        "// both in vertex and geometry shaders). \n"
+        "#if (GLUP_PRIMITIVE != GLUP_THICK_LINES) \n"
         "    if(glupIsEnabled(GLUP_CLIPPING)) { \n"
         "        gl_ClipDistance[0] = dot( \n"
         "            vertex_in, GLUP.world_clip_plane \n"
@@ -1628,6 +1632,7 @@ namespace GLUP {
         "        gl_ClipDistance[0] = 0.0; \n"
         "    } \n"
         "#endif \n"
+        "#endif \n"
         " \n"
         "#elif GLUP_PRIMITIVE_DIMENSION==2 \n"
         " \n"

src/lib/geogram_gfx/basic/GLSL.cpp

@@ -1075,6 +1075,44 @@ namespace GEO {
                 sources_texts[i] = sources[i].text();
             }
 
+            // If GL_debug is set, save shaders to file
+            // It makes it easier testing and debugging
+            // them  with glslangValidator
+            if(CmdLine::get_arg_bool("gfx:GL_debug")) {
+                static int index = 0;
+                ++index;
+                std::string filename = String::format("shader_%03d",index);
+                switch(target) {
+                case GL_VERTEX_SHADER:
+                    filename += ".vert";
+                    break;
+                case GL_TESS_CONTROL_SHADER:
+                    filename += ".tesc";
+                    break;
+                case GL_TESS_EVALUATION_SHADER:
+                    filename += ".tese";
+                    break;
+                case GL_GEOMETRY_SHADER:
+                    filename += ".geom";
+                    break;
+                case GL_FRAGMENT_SHADER:
+                    filename += ".frag";
+                    break;
+                case GL_COMPUTE_SHADER:
+                    filename += ".comp";
+                    break;
+                default:
+                    filename += ".shader";
+                    break;
+                }
+                
+                std::ofstream out(filename.c_str());
+                Logger::out("GLSLdbg") << "Saving shader " << filename << std::endl;
+                for(index_t i=0; i<sources_texts.size(); ++i) {
+                        out << sources_texts[i];
+                }
+            }
+            
             return compile_shader(
                 target, &sources_texts[0], index_t(sources_texts.size())
             );