blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

GPUShader: Fix linking working even if one shader compilation failed 

Linking without valid shaders works on some drivers. Avoid this case by
forcing linking step to return false.
This commit is contained in:
Clément Foucault 2020-08-21 14:25:58 +02:00
parent 3a6e981bcd
commit 2e630297af
Notes: blender-bot 2023-02-14 02:27:56 +01:00 
Referenced by issue #80168, Crash if shader compilation fails
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/gpu/opengl/gl_shader.cc
View File

@ -151,6 +151,7 @@ GLuint GLShader::create_shader_stage(GLenum gl_stage, MutableSpan<const char *>
}
if (!status) {
glDeleteShader(shader);
compilation_failed_ = true;
return 0;
}
@ -193,6 +194,10 @@ void GLShader::fragment_shader_from_glsl(MutableSpan<const char *> sources)
bool GLShader::finalize(void)
{
if (compilation_failed_) {
return false;
}
glLinkProgram(shader_program_);
GLint status;

4
source/blender/gpu/opengl/gl_shader.hh
View File

@ -39,10 +39,12 @@ class GLShader : public Shader {
private:
/** Handle for full program (links shader stages below). */
GLuint shader_program_ = 0;
/** Individual shader stages. */
GLuint vert_shader_ = 0;
GLuint geom_shader_ = 0;
GLuint frag_shader_ = 0;
/** True if any shader failed to compile. */
bool compilation_failed_ = false;
eGPUShaderTFBType transform_feedback_type_ = GPU_SHADER_TFB_NONE;