Mesa (renderbuffer-cleanups-v2): mesa: remove ctx->Driver.Map/UnmapTexture( ) hooks

Brian Paul brianp at kemper.freedesktop.org
Mon Jan 16 21:30:26 UTC 2012


Module: Mesa
Branch: renderbuffer-cleanups-v2
Commit: 496e7a2986a5abc82c982a3994b3e46d21e5a4b0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=496e7a2986a5abc82c982a3994b3e46d21e5a4b0

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Jan 16 13:06:03 2012 -0700

mesa: remove ctx->Driver.Map/UnmapTexture() hooks

No longer used anywhere.

---

 src/mesa/drivers/common/driverfuncs.c |    2 --
 src/mesa/main/dd.h                    |    5 -----
 src/mesa/swrast/s_context.c           |    3 ---
 3 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index c6b42a2..1df8381 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -119,8 +119,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->FreeTextureImageBuffer = _swrast_free_texture_image_buffer;
    driver->MapTextureImage = _swrast_map_teximage;
    driver->UnmapTextureImage = _swrast_unmap_teximage;
-   driver->MapTexture = NULL;
-   driver->UnmapTexture = NULL;
    driver->DrawTex = _mesa_meta_DrawTex;
 
    /* Vertex/fragment programs */
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 24f3d4c..399d57c 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -475,11 +475,6 @@ struct dd_function_table {
 			     struct gl_texture_image *texImage,
 			     GLuint slice);
 
-   /** Map texture image data into user space */
-   void (*MapTexture)( struct gl_context *ctx, struct gl_texture_object *tObj );
-   /** Unmap texture images from user space */
-   void (*UnmapTexture)( struct gl_context *ctx, struct gl_texture_object *tObj );
-
    /** For GL_ARB_texture_storage.  Allocate memory for whole mipmap stack.
     * All the gl_texture_images in the texture object will have their
     * dimensions, format, etc. initialized already.
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index 817f137..14cb9b1 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -752,9 +752,6 @@ _swrast_CreateContext( struct gl_context *ctx )
    swrast->Driver.SpanRenderStart = _swrast_span_render_start;
    swrast->Driver.SpanRenderFinish = _swrast_span_render_finish;
 
-   ctx->Driver.MapTexture = _swrast_map_texture;
-   ctx->Driver.UnmapTexture = _swrast_unmap_texture;
-
    for (i = 0; i < MAX_TEXTURE_IMAGE_UNITS; i++)
       swrast->TextureSample[i] = NULL;
 




More information about the mesa-commit mailing list