Module: Mesa Branch: master Commit: 637f06dcdc2e5b29cbc39445b7141e6a496e1585 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=637f06dcdc2e5b29cbc39445b7141e6a496e1585
Author: Brian Paul <[email protected]> Date: Wed Dec 17 13:58:05 2008 -0700 util: check for frag/vertShader=0 before attaching --- progs/util/shaderutil.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/progs/util/shaderutil.c b/progs/util/shaderutil.c index 7458513..2f1c4e3 100644 --- a/progs/util/shaderutil.c +++ b/progs/util/shaderutil.c @@ -6,6 +6,7 @@ */ +#include <assert.h> #include <stdio.h> #include <stdlib.h> #include <GL/glut.h> @@ -106,8 +107,12 @@ LinkShaders(GLuint vertShader, GLuint fragShader) { GLuint program = glCreateProgram_func(); - glAttachShader_func(program, fragShader); - glAttachShader_func(program, vertShader); + assert(vertShader || fragShader); + + if (fragShader) + glAttachShader_func(program, fragShader); + if (vertShader) + glAttachShader_func(program, vertShader); glLinkProgram_func(program); /* check link */ _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
