From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 17 Dec 2008 20:58:05 +0000 (-0700)
Subject: util: check for frag/vertShader=0 before attaching
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=637f06dcdc2e5b29cbc39445b7141e6a496e1585;p=mesa.git

util: check for frag/vertShader=0 before attaching
---

diff --git a/progs/util/shaderutil.c b/progs/util/shaderutil.c
index 745851395a7..2f1c4e38b30 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 */