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>
This commit is contained in:
parent
980f6f1b37
commit
9e9a76eea1
|
@ -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>
|
||||
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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 },
|
||||
|
|
|
@ -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 },
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue