Mesa (10.4): mesa: Add missing error checks in _mesa_ProgramBinary

[Emil Velikov]

Module: Mesa
Branch: 10.4
Commit: e1b5bc9330fb1cc76e643fd6968dcee39d0d9d83
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e1b5bc9330fb1cc76e643fd6968dcee39d0d9d83

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Sun Dec 21 12:03:09 2014 -0800

mesa: Add missing error checks in _mesa_ProgramBinary

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87516
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Leight Bade <leith at mapbox.com>
(cherry picked from commit 201b9c181825551559f6d995007de8ff12d1a54c)

Conflicts:
	src/mesa/main/shaderapi.c

---

 src/mesa/main/shaderapi.c |   27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 6657820..3451ea2 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -1724,8 +1724,31 @@ _mesa_ProgramBinary(GLuint program, GLenum binaryFormat,
 
    (void) binaryFormat;
    (void) binary;
-   (void) length;
-   _mesa_error(ctx, GL_INVALID_OPERATION, __FUNCTION__);
+
+   /* Section 2.3.1 (Errors) of the OpenGL 4.5 spec says:
+    *
+    *     "If a negative number is provided where an argument of type sizei or
+    *     sizeiptr is specified, an INVALID_VALUE error is generated."
+    */
+   if (length < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glProgramBinary(length < 0)");
+      return;
+   }
+
+   /* The ARB_get_program_binary spec says:
+    *
+    *     "<binaryFormat> and <binary> must be those returned by a previous
+    *     call to GetProgramBinary, and <length> must be the length of the
+    *     program binary as returned by GetProgramBinary or GetProgramiv with
+    *     <pname> PROGRAM_BINARY_LENGTH. Loading the program binary will fail,
+    *     setting the LINK_STATUS of <program> to FALSE, if these conditions
+    *     are not met."
+    *
+    * Since any value of binaryFormat passed "is not one of those specified as
+    * allowable for [this] command, an INVALID_ENUM error is generated."
+    */
+   shProg->LinkStatus = GL_FALSE;
+   _mesa_error(ctx, GL_INVALID_ENUM, "glProgramBinary");
 }