nouveau: Drop mapping we were doing around glGetTexImage().
authorEric Anholt <eric@anholt.net>
Mon, 1 Aug 2011 04:07:00 +0000 (21:07 -0700)
committerEric Anholt <eric@anholt.net>
Tue, 27 Sep 2011 19:12:07 +0000 (12:12 -0700)
It's handled by MapTextureImage() now.

src/mesa/drivers/dri/nouveau/nouveau_texture.c

index 320bc8c855f133c746bef3ec6f20e591f651c9ba..9dc21869ca8dd8db4d74c55dced0f568d16afe3e 100644 (file)
@@ -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;