Mesa (master): mesa: Returns a GL_INVALID_VALUE error if num of texs in glDeleteTextures is negative

Iago Toral Quiroga itoral at kemper.freedesktop.org
Tue Jan 13 11:20:27 UTC 2015


Module: Mesa
Branch: master
Commit: 038894c7cb8fd71fc7e5b6e4b64a93cb8613adb3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=038894c7cb8fd71fc7e5b6e4b64a93cb8613adb3

Author: Eduardo Lima Mitev <elima at igalia.com>
Date:   Thu Dec 11 23:34:20 2014 +0100

mesa: Returns a GL_INVALID_VALUE error if num of texs in glDeleteTextures is negative

Per GLES3 manual for glDeleteTextures
<https://www.khronos.org/opengles/sdk/docs/man3/html/glDeleteTextures.xhtml>,
GL_INVALID_VALUE is generated if n is negative.

Fixes 1 dEQP test:
* dEQP-GLES3.functional.negative_api.texture.deletetextures

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/mesa/main/texobj.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 6e5eb73..a99dd7a 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -1406,6 +1406,11 @@ _mesa_DeleteTextures( GLsizei n, const GLuint *textures)
    if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
       _mesa_debug(ctx, "glDeleteTextures %d\n", n);
 
+   if (n < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteTextures(n < 0)");
+      return;
+   }
+
    FLUSH_VERTICES(ctx, 0); /* too complex */
 
    if (n < 0) {




More information about the mesa-commit mailing list