diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2002-09-15 17:35:05 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2002-09-15 17:35:05 +0000 |
| commit | c383ce0e0feeb5809795657ffaffc325feae5a91 (patch) | |
| tree | 2bdee8caf20c66ed4b8b539cc20b0719cb19bde0 | |
| parent | a10727eedc989bef01548e9a16c89fd4f031c423 (diff) | |
removed unused teximage Width/Height/DepthScale
| -rw-r--r-- | src/mesa/main/mtypes.h | 5 | ||||
| -rw-r--r-- | src/mesa/main/teximage.c | 14 |
2 files changed, 2 insertions, 17 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 8d354689dc..46fea70f0c 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1,4 +1,4 @@ -/* $Id: mtypes.h,v 1.51.2.9 2002/09/13 19:34:39 brianp Exp $ */ +/* $Id: mtypes.h,v 1.51.2.10 2002/09/15 17:35:05 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -808,9 +808,6 @@ struct gl_texture_image { GLuint HeightLog2; /* = log2(Height2) */ GLuint DepthLog2; /* = log2(Depth2) */ GLuint MaxLog2; /* = MAX(WidthLog2, HeightLog2) */ - GLfloat WidthScale; /* used for mipmap lod computation */ - GLfloat HeightScale; /* used for mipmap lod computation */ - GLfloat DepthScale; /* used for mipmap lod computation */ GLvoid *Data; /* Image data, accessed via FetchTexel() */ const struct gl_texture_format *TexFormat; diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index c8d5fa774f..e735648a17 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -1,4 +1,4 @@ -/* $Id: teximage.c,v 1.104.2.9 2002/09/14 16:50:08 brianp Exp $ */ +/* $Id: teximage.c,v 1.104.2.10 2002/09/15 17:35:05 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -657,18 +657,6 @@ _mesa_init_teximage_fields(GLcontext *ctx, GLenum target, img->Depth2 = 1 << img->DepthLog2; img->MaxLog2 = MAX2(img->WidthLog2, img->HeightLog2); img->IsCompressed = is_compressed_format(ctx, internalFormat); - /* Compute Width/Height/DepthScale for mipmap lod computation */ - if (target == GL_TEXTURE_RECTANGLE_NV) { - /* scale = 1.0 since texture coords directly map to texels */ - img->WidthScale = 1.0; - img->HeightScale = 1.0; - img->DepthScale = 1.0; - } - else { - img->WidthScale = (GLfloat) img->Width; - img->HeightScale = (GLfloat) img->Height; - img->DepthScale = (GLfloat) img->Depth; - } } |