diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-26 14:37:05 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-26 14:37:05 +0200 |
| commit | fb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8 (patch) | |
| tree | d9b7345ddfe702b820c7020fb784f0e3dc2253bf /mesalib/src/mesa/main/texobj.c | |
| parent | 76bcc36ed305418a3ddc5752d287ede894243e1b (diff) | |
| parent | 1d6d472342aee7b9c68e9f1d92762ef808d35ac2 (diff) | |
| download | vcxsrv-fb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8.tar.gz vcxsrv-fb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8.tar.bz2 vcxsrv-fb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/texobj.c')
| -rw-r--r-- | mesalib/src/mesa/main/texobj.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c index cfaac64bf..97bef3543 100644 --- a/mesalib/src/mesa/main/texobj.c +++ b/mesalib/src/mesa/main/texobj.c @@ -567,7 +567,8 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx, GLint i; const GLint minLevel = baseLevel; const GLint maxLevel = t->_MaxLevel; - GLuint width, height, depth, face, numFaces = 1; + const GLuint numFaces = t->Target == GL_TEXTURE_CUBE_MAP ? 6 : 1; + GLuint width, height, depth, face; if (minLevel > maxLevel) { incomplete(t, BASE, "minLevel > maxLevel"); |