Add a fast preset switching test flag to check for shader compilation issues

Author: deltaoscarmike

src/libprojectM/Renderer/Renderer.cpp

@@ -184,11 +184,15 @@ Renderer::Renderer(int width, int height, int gx, int gy, BeatDetect *_beatDetec
     glBindBuffer(GL_ARRAY_BUFFER, 0);
 }
 
-void Renderer::SetPipeline(Pipeline &pipeline)
+std::string Renderer::SetPipeline(Pipeline &pipeline)
 {
     currentPipe = &pipeline;
     shaderEngine.reset();
-    shaderEngine.loadPresetShaders(pipeline);
+    if (!shaderEngine.loadPresetShaders(pipeline)) {
+        return "Shader compilation error";
+    }
+
+    return std::string();
 }
 
 void Renderer::ResetTextures()

src/libprojectM/Renderer/Renderer.hpp

@@ -76,7 +76,7 @@ class Renderer
   GLuint initRenderToTexture();
 
 
-  void SetPipeline(Pipeline &pipeline);
+  std::string SetPipeline(Pipeline &pipeline);
 
   void setPresetName(const std::string& theValue)
   {

src/libprojectM/Renderer/ShaderEngine.cpp

@@ -1083,24 +1083,38 @@ bool ShaderEngine::linkProgram(GLuint programID) {
 }
 
 
-void ShaderEngine::loadPresetShaders(Pipeline &pipeline) {
+bool ShaderEngine::loadPresetShaders(Pipeline &pipeline) {
 
-    // compile and link warp and composite shaders from pipeline
-    if (!pipeline.compositeShader.programSource.empty()) {
-        programID_presetComp = loadPresetShader(PresentCompositeShader, pipeline.compositeShader, pipeline.compositeShaderFilename);
-        if (programID_presetComp != GL_FALSE)
-            presetCompShaderLoaded = true;
-    }
+    bool ok = true;
+
+    // blur programs
+    blur1_enabled = false;
+    blur2_enabled = false;
+    blur3_enabled = false;
 
+    // compile and link warp and composite shaders from pipeline
     if (!pipeline.warpShader.programSource.empty()) {
         programID_presetWarp = loadPresetShader(PresentWarpShader, pipeline.warpShader, pipeline.warpShaderFilename);
         if (programID_presetWarp != GL_FALSE) {
             uniform_vertex_transf_warp_shader = glGetUniformLocation(programID_presetWarp, "vertex_transformation");
             presetWarpShaderLoaded = true;
+        } else {
+            ok = false;
         }
     }
 
-    std::cout << "Preset composite shader active: " << presetCompShaderLoaded << ", preset warp shader active: " << presetWarpShaderLoaded << std::endl;
+    if (!pipeline.compositeShader.programSource.empty()) {
+        programID_presetComp = loadPresetShader(PresentCompositeShader, pipeline.compositeShader, pipeline.compositeShaderFilename);
+        if (programID_presetComp != GL_FALSE) {
+            presetCompShaderLoaded = true;
+        } else {
+            ok = false;
+        }
+    }
+
+//    std::cout << "Preset composite shader active: " << presetCompShaderLoaded << ", preset warp shader active: " << presetWarpShaderLoaded << std::endl;
+
+    return ok;
 }
 
 GLuint ShaderEngine::loadPresetShader(const ShaderEngine::PresentShaderType shaderType, Shader &presetShader, std::string &shaderFilename) {
@@ -1187,13 +1201,20 @@ GLuint ShaderEngine::CompileShaderProgram(const std::string & VertexShaderCode,
     glAttachShader(programID, FragmentShaderID);
     bool linkOK = linkProgram(programID);
 
-    GLuint m_temp_vao;
-    glGenVertexArrays(1, &m_temp_vao);
-    glBindVertexArray(m_temp_vao);
+    glDetachShader(programID, VertexShaderID);
+    glDetachShader(programID, FragmentShaderID);
 
-    glValidateProgram(programID);
+    glDeleteShader(VertexShaderID);
+    glDeleteShader(FragmentShaderID);
 
-    glDeleteVertexArrays(1, &m_temp_vao);
+    return linkOK ? programID : GL_FALSE;
+}
+
+void ShaderEngine::validateProgram(const GLuint programID) {
+    GLint Result = GL_FALSE;
+    int InfoLogLength;
+
+    glValidateProgram(programID);
 
     // Check the program
     glGetProgramiv(programID, GL_VALIDATE_STATUS, &Result);
@@ -1203,15 +1224,6 @@ GLuint ShaderEngine::CompileShaderProgram(const std::string & VertexShaderCode,
         glGetProgramInfoLog(programID, InfoLogLength, NULL, &ProgramErrorMessage[0]);
         fprintf(stderr, "%s\n", &ProgramErrorMessage[0]);
     }
-
-
-    glDetachShader(programID, VertexShaderID);
-    glDetachShader(programID, FragmentShaderID);
-
-    glDeleteShader(VertexShaderID);
-    glDeleteShader(FragmentShaderID);
-
-    return linkOK ? programID : GL_FALSE;
 }
 
 // use the appropriate shader program for rendering the interpolation.
@@ -1226,6 +1238,10 @@ bool ShaderEngine::enableWarpShader(Shader &shader, const Pipeline &pipeline, co
 
         glUniformMatrix4fv(uniform_vertex_transf_warp_shader, 1, GL_FALSE, glm::value_ptr(mat_ortho));
 
+#if OGL_DEBUG
+        validateProgram(programID_presetWarp);
+#endif
+
         return true;
     }
 
@@ -1245,6 +1261,10 @@ bool ShaderEngine::enableCompositeShader(Shader &shader, const Pipeline &pipelin
 
         SetupShaderVariables(programID_presetComp, pipeline, pipelineContext);
 
+#if OGL_DEBUG
+        validateProgram(programID_presetComp);
+#endif
+
         return true;
     }
 

src/libprojectM/Renderer/ShaderEngine.hpp

@@ -38,7 +38,7 @@ class ShaderEngine
 
     ShaderEngine();
     virtual ~ShaderEngine();
-    void loadPresetShaders(Pipeline &pipeline);
+    bool loadPresetShaders(Pipeline &pipeline);
     bool enableWarpShader(Shader &shader, const Pipeline &pipeline, const PipelineContext &pipelineContext, const glm::mat4 & mat_ortho);
     bool enableCompositeShader(Shader &shader, const Pipeline &pipeline, const PipelineContext &pipelineContext);
     void RenderBlurTextures(const Pipeline  &pipeline, const PipelineContext &pipelineContext);
@@ -107,6 +107,7 @@ class ShaderEngine
     GLuint loadPresetShader(const PresentShaderType shaderType, Shader &shader, std::string &shaderFilename);
 
     void deletePresetShader(Shader &shader);
+    void validateProgram(const GLuint programID);
 
 
     // programs generated from preset shader code

src/libprojectM/projectM.cpp

@@ -740,10 +740,14 @@ static void *thread_callback(void *prjm) {
             timeKeeper->StartSmoothing();
 		}
 
-		if (result.empty())
+        if (result.empty()) {
 			presetSwitchedEvent(hardCut, **m_presetPos);
-		else
+            errorLoadingCurrentPreset = false;
+        } else {
 			presetSwitchFailedEvent(hardCut, **m_presetPos, result);
+            errorLoadingCurrentPreset = true;
+
+        }
 }
 
 
@@ -786,6 +790,8 @@ void projectM::selectNext(const bool hardCut) {
 */
 std::string projectM::switchPreset(std::auto_ptr<Preset> & targetPreset) {
 
+    std::string result;
+
 	#ifdef SYNC_PRESET_SWITCHES
 	pthread_mutex_lock(&preset_mutex);
 	#endif
@@ -798,15 +804,16 @@ std::string projectM::switchPreset(std::auto_ptr<Preset> & targetPreset) {
 		std::cerr << "problem allocating target preset: " << e.message() << std::endl;
 		return e.message();
 	}
-        // Set preset name here- event is not done because at the moment this function is oblivious to smooth/hard switches
-        renderer->setPresetName(targetPreset->name());
-        renderer->SetPipeline(targetPreset->pipeline());
+
+    // Set preset name here- event is not done because at the moment this function is oblivious to smooth/hard switches
+    renderer->setPresetName(targetPreset->name());
+    result = renderer->SetPipeline(targetPreset->pipeline());
 
 	#ifdef SYNC_PRESET_SWITCHES
 	pthread_mutex_unlock(&preset_mutex);
 	#endif
 
-	return std::string();
+    return result;
   }
 
     void projectM::setPresetLock ( bool isLocked )

src/libprojectM/projectM.hpp

@@ -265,6 +265,7 @@ class DLLEXPORT projectM
 
   int getWindowWidth() { return _settings.windowWidth; }
   int getWindowHeight() { return _settings.windowHeight; }
+  bool getErrorLoadingCurrentPreset() const { return errorLoadingCurrentPreset; }
 
 private:
   PCM * _pcm;
@@ -324,6 +325,7 @@ class DLLEXPORT projectM
   MasterRenderItemMerge * _merger;
 
   bool running;
+  bool errorLoadingCurrentPreset;
 
   Pipeline* currentPipe;
 

src/projectM-sdl/projectM_SDL_main.cpp

@@ -11,6 +11,7 @@
 #define OGL_DEBUG	0
 #define UNLOCK_FPS	0
 #define FAKE_AUDIO	0
+#define TEST_ALL_PRESETS	0
 
 #if OGL_DEBUG
 void DebugLog(GLenum source,
@@ -159,6 +160,20 @@ int main(int argc, char *argv[]) {
 	    app->beginAudioCapture();
 #endif
 
+#if TEST_ALL_PRESETS
+    uint buildErrors = 0;
+    for(int i = 0; i < app->getPlaylistSize(); i++) {
+        std::cout << i << "\t" << app->getPresetName(i) << std::endl;
+        app->selectPreset(i);
+        if (app->getErrorLoadingCurrentPreset()) {
+            buildErrors++;
+        }
+    }
+
+    fprintf(stdout, "Preset loading errors: %d/%d [%d%%]\n", buildErrors, app->getPlaylistSize(), (buildErrors*100) / app->getPlaylistSize());
+
+    return PROJECTM_SUCCESS;
+#endif
 
 #if UNLOCK_FPS
     int32_t frame_count = 0;