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 <ian.d.romanick@intel.com>

diff --git a/docs/relnotes-7.12.html b/docs/relnotes-7.12.html
index ac20788efce8bf96b3cf07a86ba652aa5732e5cf..3d3df594e1349bbb71e7cc7d6e6037ccf8af5159 100644 (file)
--- a/docs/relnotes-7.12.html
+++ b/docs/relnotes-7.12.html
@@ -57,6 +57,7 @@ tbd
   desktop OpenGL, <tt>GL_COLOR_INDEX</tt> data can still be uploaded
   to a color (e.g., RGBA) texture.  However, the data cannot be stored
   internally as color-index.</li>
+<li>Removed support for GL_APPLE_client_storage extension.
 </ul>
 
 

diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
index 3727b05dcdc65f95659b0900d2535e1aa54da15d..5c3442a2b7b4ac8f388a0810a53f0c4a19f751e8 100644 (file)
--- 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 d38a1a46696d59188eaa2f8d1a55e0f71d6964bb..2f391c5a810e19779f516eb6833ea353eb54d5ea 100644 (file)
--- 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 81bbca240d13b6d3851a293257b10889cf2c2b2c..57b51d8562013b12541cb4804eeb3c3ed626850d 100644 (file)
--- 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 45b27777a2badc9961d8f8adbb86b01689dc9ded..827906900670c5b3243e5a5c8bd8055079577652 100644 (file)
--- 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 dc4dd07f19bddff2120a3e929d9af44a95325bf6..6efd95596518bbdb70dac16295965add36db6393 100644 (file)
--- 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 9d78eec7fead4ff1f6b2c0fecf3a322b7052f4d9..d957950ed92aeeaefd7ca83b50d7fd9d1f8aa32e 100644 (file)
--- 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 4f7f2ed60de36ec5b1fd9316f2937fcfd42c80cd..65fe23cac0dbd3701fb1215f1a438b7e29768b0e 100644 (file)
--- 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 1dcb08c0a1b4a28ddb6fc622484d812756e8c684..aa073753f4344f0eb4ac96bcfdc55b86198a261b 100644 (file)
--- 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);
    }