Mesa (master): nouveau: remove unused code, unused var

Brian Paul brianp at kemper.freedesktop.org
Mon Oct 3 17:21:46 PDT 2011


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

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Oct  3 18:20:59 2011 -0600

nouveau: remove unused code, unused var

---

 src/mesa/drivers/dri/nouveau/nouveau_texture.c |   29 ------------------------
 1 files changed, 0 insertions(+), 29 deletions(-)

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c
index 508c8a5..17fa6f5 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_texture.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_texture.c
@@ -706,39 +706,10 @@ nouveau_texture_unmap(struct gl_context *ctx, struct gl_texture_object *t)
 }
 
 static void
-store_mipmap(struct gl_context *ctx, GLenum target, int first, int last,
-	     struct gl_texture_object *t)
-{
-	struct gl_pixelstore_attrib packing = {
-		.BufferObj = ctx->Shared->NullBufferObj,
-		.Alignment = 1
-	};
-	GLenum format = t->Image[0][t->BaseLevel]->TexFormat;
-	unsigned base_format, type, comps;
-	int i;
-
-	base_format = _mesa_get_format_base_format(format);
-	_mesa_format_to_type_and_comps(format, &type, &comps);
-
-	for (i = first; i <= last; i++) {
-		struct gl_texture_image *ti = t->Image[0][i];
-		void *data = ti->Data;
-
-		nouveau_teximage(ctx, 3, target, i, ti->InternalFormat,
-				 ti->Width, ti->Height, ti->Depth,
-				 ti->Border, base_format, type, data,
-				 &packing, t, ti);
-
-		_mesa_free_texmemory(data);
-	}
-}
-
-static void
 nouveau_generate_mipmap(struct gl_context *ctx, GLenum target,
 			struct gl_texture_object *t)
 {
 	if (_mesa_meta_check_generate_mipmap_fallback(ctx, target, t)) {
-		struct gl_texture_image *base = t->Image[0][t->BaseLevel];
 		_mesa_generate_mipmap(ctx, target, t);
 	} else {
 		_mesa_meta_GenerateMipmap(ctx, target, t);



More information about the mesa-commit mailing list