diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-10-05 04:07:50 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-10-05 04:07:50 +0000 |
| commit | 06f606ce5761e673fca3f6b1f7dd40dace8a9906 (patch) | |
| tree | ec9f713dd946aa264add2fb877d3dda7594b0a95 /src/mesa/main | |
| parent | 198a88923c185bb0530787cd80cb9e1d700f2c91 (diff) | |
Remove _IsPowerOfTwo from gl_texture_object, not really needed.
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 | ||||
| -rw-r--r-- | src/mesa/main/texobj.c | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 43cfe18532..0cab0ca3ec 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1299,7 +1299,6 @@ struct gl_texture_object GLint _MaxLevel; /**< actual max mipmap level (q in the spec) */ GLfloat _MaxLambda; /**< = _MaxLevel - BaseLevel (q - b in spec) */ GLboolean GenerateMipmap; /**< GL_SGIS_generate_mipmap */ - GLboolean _IsPowerOfTwo; /**< Are all image dimensions powers of two? */ GLboolean Complete; /**< Is texture object complete? */ /** Actual texture images, indexed by [cube face] and [mipmap level] */ diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index 7b61bfadd9..0f320fea6a 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -201,7 +201,6 @@ _mesa_copy_texture_object( struct gl_texture_object *dest, dest->GenerateMipmap = src->GenerateMipmap; dest->Palette = src->Palette; dest->Complete = src->Complete; - dest->_IsPowerOfTwo = src->_IsPowerOfTwo; } @@ -244,7 +243,6 @@ _mesa_test_texobj_completeness( const GLcontext *ctx, GLint maxLog2 = 0, maxLevels = 0; t->Complete = GL_TRUE; /* be optimistic */ - t->_IsPowerOfTwo = GL_TRUE; /* may be set FALSE below */ /* Always need the base level image */ if (!t->Image[0][baseLevel]) { @@ -320,11 +318,6 @@ _mesa_test_texobj_completeness( const GLcontext *ctx, } } - /* check for non power of two */ - if (!t->Image[0][baseLevel]->_IsPowerOfTwo) { - t->_IsPowerOfTwo = GL_FALSE; - } - /* extra checking for mipmaps */ if (t->MinFilter != GL_NEAREST && t->MinFilter != GL_LINEAR) { /* |