From 9e9a76eea17bc92c8ac74323c99e10b9480ee583 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 21 Sep 2011 18:54:53 -0600 Subject: [PATCH] mesa: remove support for GL_APPLE_client_storage extension AFAIK, there are few users of this extension and I can see a couple reasons why this is probably broken in Mesa anyway. Reviewed-by: Ian Romanick --- docs/relnotes-7.12.html | 1 + src/mesa/drivers/dri/intel/intel_extensions.c | 1 - src/mesa/main/attrib.c | 1 - src/mesa/main/extensions.c | 1 - src/mesa/main/get.c | 1 - src/mesa/main/mtypes.h | 3 --- src/mesa/main/pixelstore.c | 9 --------- src/mesa/main/teximage.c | 2 +- src/mesa/swrast/s_texture.c | 2 +- 9 files changed, 3 insertions(+), 18 deletions(-) diff --git a/docs/relnotes-7.12.html b/docs/relnotes-7.12.html index ac20788efce..3d3df594e13 100644 --- a/docs/relnotes-7.12.html +++ b/docs/relnotes-7.12.html @@ -57,6 +57,7 @@ tbd desktop OpenGL, GL_COLOR_INDEX data can still be uploaded to a color (e.g., RGBA) texture. However, the data cannot be stored internally as color-index. +
  • Removed support for GL_APPLE_client_storage extension. diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c index 3727b05dcdc..5c3442a2b7b 100644 --- a/src/mesa/drivers/dri/intel/intel_extensions.c +++ b/src/mesa/drivers/dri/intel/intel_extensions.c @@ -100,7 +100,6 @@ intelInitExtensions(struct gl_context *ctx) ctx->Extensions.EXT_texture_env_dot3 = true; ctx->Extensions.EXT_texture_filter_anisotropic = true; ctx->Extensions.EXT_texture_lod_bias = true; - ctx->Extensions.APPLE_client_storage = true; ctx->Extensions.APPLE_object_purgeable = true; ctx->Extensions.APPLE_vertex_array_object = true; ctx->Extensions.MESA_pack_invert = true; diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index d38a1a46696..2f391c5a810 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -1352,7 +1352,6 @@ copy_pixelstore(struct gl_context *ctx, dst->SkipImages = src->SkipImages; dst->SwapBytes = src->SwapBytes; dst->LsbFirst = src->LsbFirst; - dst->ClientStorage = src->ClientStorage; dst->Invert = src->Invert; _mesa_reference_buffer_object(ctx, &dst->BufferObj, src->BufferObj); } diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 81bbca240d1..57b51d85620 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -260,7 +260,6 @@ static const struct extension extension_table[] = { { "GL_AMD_draw_buffers_blend", o(ARB_draw_buffers_blend), GL, 2009 }, { "GL_AMD_seamless_cubemap_per_texture", o(AMD_seamless_cubemap_per_texture), GL, 2009 }, { "GL_AMD_shader_stencil_export", o(ARB_shader_stencil_export), GL, 2009 }, - { "GL_APPLE_client_storage", o(APPLE_client_storage), GL, 2002 }, { "GL_APPLE_object_purgeable", o(APPLE_object_purgeable), GL, 2006 }, { "GL_APPLE_packed_pixels", o(APPLE_packed_pixels), GL, 2002 }, { "GL_APPLE_vertex_array_object", o(APPLE_vertex_array_object), GL, 2002 }, diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index 45b27777a2b..82790690067 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -888,7 +888,6 @@ static const struct value_desc values[] = { { GL_UNPACK_SWAP_BYTES, CONTEXT_BOOL(Unpack.SwapBytes), NO_EXTRA }, { GL_UNPACK_SKIP_IMAGES_EXT, CONTEXT_INT(Unpack.SkipImages), NO_EXTRA }, { GL_UNPACK_IMAGE_HEIGHT_EXT, CONTEXT_INT(Unpack.ImageHeight), NO_EXTRA }, - { GL_UNPACK_CLIENT_STORAGE_APPLE, CONTEXT_BOOL(Unpack.ClientStorage), NO_EXTRA }, { GL_ZOOM_X, CONTEXT_FLOAT(Pixel.ZoomX), NO_EXTRA }, { GL_ZOOM_Y, CONTEXT_FLOAT(Pixel.ZoomY), NO_EXTRA }, diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index dc4dd07f19b..6efd9559651 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1254,7 +1254,6 @@ struct gl_texture_image GLuint HeightLog2; /**< = log2(Height2) */ GLuint DepthLog2; /**< = log2(Depth2) */ GLuint MaxLog2; /**< = MAX(WidthLog2, HeightLog2) */ - GLboolean IsClientData; /**< Data owned by client? */ struct gl_texture_object *TexObject; /**< Pointer back to parent object */ GLuint Level; /**< Which mipmap level am I? */ @@ -1555,7 +1554,6 @@ struct gl_pixelstore_attrib GLint SkipImages; GLboolean SwapBytes; GLboolean LsbFirst; - GLboolean ClientStorage; /**< GL_APPLE_client_storage */ GLboolean Invert; /**< GL_MESA_pack_invert */ struct gl_buffer_object *BufferObj; /**< GL_ARB_pixel_buffer_object */ }; @@ -2858,7 +2856,6 @@ struct gl_extensions /* vendor extensions */ GLboolean AMD_conservative_depth; GLboolean AMD_seamless_cubemap_per_texture; - GLboolean APPLE_client_storage; GLboolean APPLE_packed_pixels; GLboolean APPLE_vertex_array_object; GLboolean APPLE_object_purgeable; diff --git a/src/mesa/main/pixelstore.c b/src/mesa/main/pixelstore.c index 9d78eec7fea..d957950ed92 100644 --- a/src/mesa/main/pixelstore.c +++ b/src/mesa/main/pixelstore.c @@ -204,12 +204,6 @@ _mesa_PixelStorei( GLenum pname, GLint param ) FLUSH_VERTICES(ctx, _NEW_PACKUNPACK); ctx->Unpack.Alignment = param; break; - case GL_UNPACK_CLIENT_STORAGE_APPLE: - if (param == (GLint)ctx->Unpack.ClientStorage) - return; - FLUSH_VERTICES(ctx, _NEW_PACKUNPACK); - ctx->Unpack.ClientStorage = param ? GL_TRUE : GL_FALSE; - break; default: _mesa_error( ctx, GL_INVALID_ENUM, "glPixelStore" ); return; @@ -240,7 +234,6 @@ _mesa_init_pixelstore( struct gl_context *ctx ) ctx->Pack.SkipImages = 0; ctx->Pack.SwapBytes = GL_FALSE; ctx->Pack.LsbFirst = GL_FALSE; - ctx->Pack.ClientStorage = GL_FALSE; ctx->Pack.Invert = GL_FALSE; #if FEATURE_EXT_pixel_buffer_object _mesa_reference_buffer_object(ctx, &ctx->Pack.BufferObj, @@ -254,7 +247,6 @@ _mesa_init_pixelstore( struct gl_context *ctx ) ctx->Unpack.SkipImages = 0; ctx->Unpack.SwapBytes = GL_FALSE; ctx->Unpack.LsbFirst = GL_FALSE; - ctx->Unpack.ClientStorage = GL_FALSE; ctx->Unpack.Invert = GL_FALSE; #if FEATURE_EXT_pixel_buffer_object _mesa_reference_buffer_object(ctx, &ctx->Unpack.BufferObj, @@ -275,7 +267,6 @@ _mesa_init_pixelstore( struct gl_context *ctx ) ctx->DefaultPacking.SkipImages = 0; ctx->DefaultPacking.SwapBytes = GL_FALSE; ctx->DefaultPacking.LsbFirst = GL_FALSE; - ctx->DefaultPacking.ClientStorage = GL_FALSE; ctx->DefaultPacking.Invert = GL_FALSE; #if FEATURE_EXT_pixel_buffer_object _mesa_reference_buffer_object(ctx, &ctx->DefaultPacking.BufferObj, diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 4f7f2ed60de..65fe23cac0d 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -610,7 +610,7 @@ _mesa_free_texture_image_data(struct gl_context *ctx, { (void) ctx; - if (texImage->Data && !texImage->IsClientData) { + if (texImage->Data) { /* free the old texture data */ _mesa_free_texmemory(texImage->Data); } diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c index 1dcb08c0a1b..aa073753f43 100644 --- a/src/mesa/swrast/s_texture.c +++ b/src/mesa/swrast/s_texture.c @@ -109,7 +109,7 @@ void _swrast_free_texture_image_buffer(struct gl_context *ctx, struct gl_texture_image *texImage) { - if (texImage->Data && !texImage->IsClientData) { + if (texImage->Data) { _mesa_align_free(texImage->Data); } -- 2.11.0