From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 6 Aug 2008 22:29:10 +0000 (-0600)
Subject: mesa: glsl: additional error checking
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=95d3642122f48439e356b781f62649553f97c7ee;p=mesa.git

mesa: glsl: additional error checking
---

diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 53de4232bea..8f07406ee49 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -445,6 +445,18 @@ _slang_link(GLcontext *ctx,
          _mesa_problem(ctx, "unexpected shader target in slang_link()");
    }
 
+#if FEATURE_es2_glsl
+   /* must have both a vertex and fragment program for ES2 */
+   if (!vertProg) {
+      link_error(shProg, "missing vertex shader\n");
+      return;
+   }
+   if (!fragProg) {
+      link_error(shProg, "missing fragment shader\n");
+      return;
+   }
+#endif
+
    /*
     * Make copies of the vertex/fragment programs now since we'll be
     * changing src/dst registers after merging the uniforms and varying vars.