From: Eric Anholt <eric@anholt.net>
Date: Mon, 1 Aug 2011 04:07:00 +0000 (-0700)
Subject: nouveau: Drop mapping we were doing around glGetTexImage().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6731c6cfb1cd2f82b8b20c0f39a8fb13df87a55a;p=mesa.git

nouveau: Drop mapping we were doing around glGetTexImage().

It's handled by MapTextureImage() now.
---

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_texture.c b/src/mesa/drivers/dri/nouveau/nouveau_texture.c
index 320bc8c855f..9dc21869ca8 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_texture.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_texture.c
@@ -620,19 +620,6 @@ nouveau_texsubimage_1d(struct gl_context *ctx, GLenum target, GLint level,
 			    packing, t, ti);
 }
 
-static void
-nouveau_get_teximage(struct gl_context *ctx, GLenum target, GLint level,
-		     GLenum format, GLenum type, GLvoid *pixels,
-		     struct gl_texture_object *t,
-		     struct gl_texture_image *ti)
-{
-	nouveau_teximage_map(ctx, ti, GL_MAP_READ_BIT,
-			     0, 0, ti->Width, ti->Height);
-	_mesa_get_teximage(ctx, target, level, format, type, pixels,
-			   t, ti);
-	nouveau_teximage_unmap(ctx, ti);
-}
-
 static void
 nouveau_bind_texture(struct gl_context *ctx, GLenum target,
 		     struct gl_texture_object *t)
@@ -782,7 +769,6 @@ nouveau_texture_functions_init(struct dd_function_table *functions)
 	functions->TexSubImage1D = nouveau_texsubimage_1d;
 	functions->TexSubImage2D = nouveau_texsubimage_2d;
 	functions->TexSubImage3D = nouveau_texsubimage_3d;
-	functions->GetTexImage = nouveau_get_teximage;
 	functions->BindTexture = nouveau_bind_texture;
 	functions->MapTexture = nouveau_texture_map;
 	functions->UnmapTexture = nouveau_texture_unmap;