Mesa (master): main: _mesa_cube_level_complete checks NumLayers.

Laura Ekstrand ldeks at kemper.freedesktop.org
Mon Mar 9 20:34:45 UTC 2015


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

Author: Laura Ekstrand <laura at jlekstrand.net>
Date:   Wed Mar  4 10:49:55 2015 -0800

main: _mesa_cube_level_complete checks NumLayers.

_mesa_cube_level_complete now verifies that a cube map texture object actually
has six texture images before proceeding.

Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>

---

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

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index e018ab9..a99b108 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -879,6 +879,10 @@ _mesa_cube_level_complete(const struct gl_texture_object *texObj,
    if (texObj->Target != GL_TEXTURE_CUBE_MAP)
       return GL_FALSE;
 
+   /* Make sure we have enough image planes for a cube map. */
+   if (texObj->NumLayers < 6)
+      return GL_FALSE;
+
    if ((level < 0) || (level >= MAX_TEXTURE_LEVELS))
       return GL_FALSE;
 




More information about the mesa-commit mailing list