[Bf-blender-cvs] [145617c] master: OpenSubdiv: More graceful handling of shader compile/linking errors

[Sergey Sharybin]

Commit: 145617c5ebe01f93b8af60f6e822f0a665ff881e
Author: Sergey Sharybin
Date:   Wed Sep 9 17:27:08 2015 +0500
Branches: master
https://developer.blender.org/rB145617c5ebe01f93b8af60f6e822f0a665ff881e

OpenSubdiv: More graceful handling of shader compile/linking errors

===================================================================

M       intern/opensubdiv/opensubdiv_capi.h
M       intern/opensubdiv/opensubdiv_gpu_capi.cc

===================================================================

diff --git a/intern/opensubdiv/opensubdiv_capi.h 
b/intern/opensubdiv/opensubdiv_capi.h
index 0103952..ef6db92 100644
--- a/intern/opensubdiv/opensubdiv_capi.h
+++ b/intern/opensubdiv/opensubdiv_capi.h
@@ -85,7 +85,7 @@ const struct OpenSubdiv_TopologyRefinerDescr 
*openSubdiv_getGLMeshTopologyRefine
         OpenSubdiv_GLMesh *gl_mesh);
 
 /* ** Initialize/Deinitialize global OpenGL drawing buffers/GLSL programs ** */
-void openSubdiv_osdGLDisplayInit(void);
+bool openSubdiv_osdGLDisplayInit(void);
 void openSubdiv_osdGLDisplayDeinit(void);
 
 /* ** Evaluator API ** */
diff --git a/intern/opensubdiv/opensubdiv_gpu_capi.cc 
b/intern/opensubdiv/opensubdiv_gpu_capi.cc
index f80ecce..31996a1 100644
--- a/intern/opensubdiv/opensubdiv_gpu_capi.cc
+++ b/intern/opensubdiv/opensubdiv_gpu_capi.cc
@@ -214,7 +214,7 @@ GLuint compileShader(GLenum shaderType,
                fprintf(stderr, "Section: %s\n", sdefine);
                fprintf(stderr, "Defines: %s\n", define);
                fprintf(stderr, "Source: %s\n", sources[2]);
-               exit(1);
+               return 0;
        }
 
        return shader;
@@ -225,12 +225,21 @@ GLuint linkProgram(const char *define)
        GLuint vertexShader = compileShader(GL_VERTEX_SHADER,
                                            "VERTEX_SHADER",
                                            define);
+       if (vertexShader == 0) {
+               return 0;
+       }
        GLuint geometryShader = compileShader(GL_GEOMETRY_SHADER,
                                              "GEOMETRY_SHADER",
                                              define);
+       if (geometryShader == 0) {
+               return 0;
+       }
        GLuint fragmentShader = compileShader(GL_FRAGMENT_SHADER,
                                              "FRAGMENT_SHADER",
                                              define);
+       if (fragmentShader == 0) {
+               return 0;
+       }
 
        GLuint program = glCreateProgram();
 
@@ -279,7 +288,8 @@ GLuint linkProgram(const char *define)
                glGetProgramInfoLog(program, sizeof(emsg), 0, emsg);
                fprintf(stderr, "Error linking GLSL program : %s\n", emsg);
                fprintf(stderr, "Defines: %s\n", define);
-               exit(1);
+               glDeleteProgram(program);
+               return 0;
        }
 
        glUniformBlockBinding(program,
@@ -363,9 +373,10 @@ void bindProgram(GLMeshInterface * /*mesh*/,
 
 }  /* namespace */
 
-void openSubdiv_osdGLDisplayInit(void)
+bool openSubdiv_osdGLDisplayInit(void)
 {
        static bool need_init = true;
+       static bool init_success = false;
        if (need_init) {
                g_flat_fill_solid_program = linkProgram("#define 
FLAT_SHADING\n");
                g_flat_fill_texture2d_program = linkProgram("#define 
USE_TEXTURE_2D\n#define FLAT_SHADING\n");
@@ -379,7 +390,13 @@ void openSubdiv_osdGLDisplayInit(void)
                             sizeof(g_lighting_data), NULL, GL_STATIC_DRAW);
 
                need_init = false;
+               init_success = g_flat_fill_solid_program != 0 &&
+                              g_flat_fill_texture2d_program != 0 &&
+                              g_smooth_fill_solid_program != 0 &&
+                              g_smooth_fill_texture2d_program != 0 &&
+                              g_wireframe_program;
        }
+       return init_success;
 }
 
 void openSubdiv_osdGLDisplayDeinit(void)
@@ -635,7 +652,9 @@ void openSubdiv_osdGLMeshDisplay(OpenSubdiv_GLMesh *gl_mesh,
                (GLMeshInterface *)(gl_mesh->descriptor);
 
        /* Make sure all global invariants are initialized. */
-       openSubdiv_osdGLDisplayInit();
+       if (!openSubdiv_osdGLDisplayInit()) {
+               return;
+       }
 
        /* Setup GLSL/OpenGL to draw patches in current context. */
        GLuint program = preapre_patchDraw(mesh, fill_quads != 0);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs