From ecb7cc3319a74bda1edc226a1103f0e1a86d92a9 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 6 Dec 2010 15:11:41 -0700 Subject: mesa: test for cube map completeness in glGenerateMipmap() The texture is not cube complete if the base level images aren't of the same size and format. NOTE: This is a candidate for the 7.9 branch. --- src/mesa/main/texobj.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'src/mesa/main/texobj.c') diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index 72dbf10cc4..8d9c9794a1 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -687,6 +687,44 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx, } +/** + * Check if the given cube map texture is "cube complete" as defined in + * the OpenGL specification. + */ +GLboolean +_mesa_cube_complete(const struct gl_texture_object *texObj) +{ + const GLint baseLevel = texObj->BaseLevel; + const struct gl_texture_image *img0, *img; + GLuint face; + + if (texObj->Target != GL_TEXTURE_CUBE_MAP) + return GL_FALSE; + + if ((baseLevel < 0) || (baseLevel >= MAX_TEXTURE_LEVELS)) + return GL_FALSE; + + /* check first face */ + img0 = texObj->Image[0][baseLevel]; + if (!img0 || + img0->Width < 1 || + img0->Width != img0->Height) + return GL_FALSE; + + /* check remaining faces vs. first face */ + for (face = 1; face < 6; face++) { + img = texObj->Image[face][baseLevel]; + if (!img || + img->Width != img0->Width || + img->Height != img0->Height || + img->TexFormat != img0->TexFormat) + return GL_FALSE; + } + + return GL_TRUE; +} + + /** * Mark a texture object dirty. It forces the object to be incomplete * and optionally forces the context to re-validate its state. -- cgit v1.2.3