From f4571640b8b9d158e33cc536abb9eac037560a73 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Thu, 27 Jun 2013 18:20:25 -0700 Subject: [PATCH] mesa: Remove GL_MESA_resize_buffers Commit bab755a made the implementation a no-op, and it was only ever enabled by software rasterizers. v2: Move the spec into docs/specs/OLD since it's now obsolete (squashed patch from Andreas Boll) Signed-off-by: Ian Romanick Reviewed-by: Kenneth Graunke Reviewed-by: Brian Paul --- docs/extensions.html | 2 +- docs/relnotes/9.2.html | 2 ++ docs/specs/{ => OLD}/MESA_resize_buffers.spec | 2 +- src/mapi/glapi/gen/gl_API.xml | 2 +- src/mapi/glapi/gen/mesadef.py | 1 - src/mesa/drivers/windows/gdi/mesa.def | 1 - src/mesa/main/extensions.c | 2 -- src/mesa/main/framebuffer.c | 10 ---------- src/mesa/main/framebuffer.h | 4 ---- src/mesa/main/mtypes.h | 1 - src/mesa/main/tests/dispatch_sanity.cpp | 3 --- 11 files changed, 5 insertions(+), 25 deletions(-) rename docs/specs/{ => OLD}/MESA_resize_buffers.spec (97%) diff --git a/docs/extensions.html b/docs/extensions.html index 40f59d3b089..8191200d114 100644 --- a/docs/extensions.html +++ b/docs/extensions.html @@ -32,7 +32,7 @@ The specifications follow.
  • MESA_pixmap_colormap.spec
  • MESA_program_debug.spec (obsolete)
  • MESA_release_buffers.spec -
  • MESA_resize_buffers.spec +
  • MESA_resize_buffers.spec (obsolete)
  • MESA_set_3dfx_mode.spec
  • MESA_shader_debug.spec
  • MESA_sprite_point.spec (obsolete) diff --git a/docs/relnotes/9.2.html b/docs/relnotes/9.2.html index 08e82d092d8..2f2c39415d5 100644 --- a/docs/relnotes/9.2.html +++ b/docs/relnotes/9.2.html @@ -65,6 +65,8 @@ Note: some of the new features are only available with certain drivers.
  • Removed d3d1x state tracker (unused, unmaintained and broken)
  • Removed GL_EXT_clip_volume_hint because no driver had enabled it since 2007.
    • +
  • Removed GL_MESA_resize_buffers because it was only really implemented by +the (unsupported) GDI driver.
    • diff --git a/docs/specs/MESA_resize_buffers.spec b/docs/specs/OLD/MESA_resize_buffers.spec similarity index 97% rename from docs/specs/MESA_resize_buffers.spec rename to docs/specs/OLD/MESA_resize_buffers.spec index dabc7c421da..aed3caff36e 100644 --- a/docs/specs/MESA_resize_buffers.spec +++ b/docs/specs/OLD/MESA_resize_buffers.spec @@ -12,7 +12,7 @@ Contact Status - Shipping (since Mesa version 2.2) + Obsolete. Version diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index a066fe2d112..82b908f43d1 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -11032,7 +11032,7 @@ - + diff --git a/src/mapi/glapi/gen/mesadef.py b/src/mapi/glapi/gen/mesadef.py index f6d33cb8c43..77cc4a3506f 100644 --- a/src/mapi/glapi/gen/mesadef.py +++ b/src/mapi/glapi/gen/mesadef.py @@ -134,7 +134,6 @@ def PrintTail(): print '\t_mesa_new_buffer_object' print '\t_mesa_new_texture_object' print '\t_mesa_problem' - print '\t_mesa_ResizeBuffersMESA' print '\t_mesa_store_compressed_teximage1d' print '\t_mesa_store_compressed_teximage2d' print '\t_mesa_store_compressed_teximage3d' diff --git a/src/mesa/drivers/windows/gdi/mesa.def b/src/mesa/drivers/windows/gdi/mesa.def index fec7bbac016..92736b36877 100644 --- a/src/mesa/drivers/windows/gdi/mesa.def +++ b/src/mesa/drivers/windows/gdi/mesa.def @@ -556,7 +556,6 @@ EXPORTS glFogCoorddvEXT glFogCoordPointerEXT glBlendFuncSeparateEXT - glResizeBuffersMESA glWindowPos2dMESA glWindowPos2dvMESA glWindowPos2fMESA diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 8f96a77779a..9c90bbe7559 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -307,7 +307,6 @@ static const struct extension extension_table[] = { { "GL_IBM_texture_mirrored_repeat", o(dummy_true), GLL, 1998 }, { "GL_INGR_blend_func_separate", o(EXT_blend_func_separate), GLL, 1999 }, { "GL_MESA_pack_invert", o(MESA_pack_invert), GL, 2002 }, - { "GL_MESA_resize_buffers", o(MESA_resize_buffers), GL, 1999 }, { "GL_MESA_texture_array", o(MESA_texture_array), GLL, 2007 }, { "GL_MESA_texture_signed_rgba", o(EXT_texture_snorm), GL, 2009 }, { "GL_MESA_window_pos", o(dummy_true), GLL, 2000 }, @@ -445,7 +444,6 @@ _mesa_enable_sw_extensions(struct gl_context *ctx) /*ctx->Extensions.EXT_transform_feedback = GL_TRUE;*/ ctx->Extensions.EXT_vertex_array_bgra = GL_TRUE; ctx->Extensions.MESA_pack_invert = GL_TRUE; - ctx->Extensions.MESA_resize_buffers = GL_TRUE; ctx->Extensions.MESA_texture_array = GL_TRUE; ctx->Extensions.MESA_ycbcr_texture = GL_TRUE; ctx->Extensions.NV_blend_square = GL_TRUE; diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c index d28882ac448..4ec4118c5b7 100644 --- a/src/mesa/main/framebuffer.c +++ b/src/mesa/main/framebuffer.c @@ -319,16 +319,6 @@ _mesa_resize_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb, } } -/* - * XXX THIS IS OBSOLETE - */ -void GLAPIENTRY -_mesa_ResizeBuffersMESA( void ) -{ -} - - - /** * Examine all the framebuffer's renderbuffers to update the Width/Height * fields of the framebuffer. If we have renderbuffers with different diff --git a/src/mesa/main/framebuffer.h b/src/mesa/main/framebuffer.h index 1b1caab09f7..264566477dc 100644 --- a/src/mesa/main/framebuffer.h +++ b/src/mesa/main/framebuffer.h @@ -71,10 +71,6 @@ _mesa_resize_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb, extern void _mesa_resizebuffers( struct gl_context *ctx ); -extern void GLAPIENTRY -_mesa_ResizeBuffersMESA( void ); - - extern void _mesa_update_draw_buffer_bounds(struct gl_context *ctx); diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index df2d20b3a61..1edc917f869 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -3099,7 +3099,6 @@ struct gl_extensions GLboolean ATI_fragment_shader; GLboolean ATI_separate_stencil; GLboolean MESA_pack_invert; - GLboolean MESA_resize_buffers; GLboolean MESA_ycbcr_texture; GLboolean MESA_texture_array; GLboolean NV_blend_square; diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index 3efb195873c..8d3774775fc 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -501,9 +501,6 @@ const struct function gl_core_functions_possible[] = { /* GL_EXT_transform_feedback */ { "glBindBufferOffsetEXT", 31, -1 }, - /* GL_MESA_resize_buffers */ - { "glResizeBuffersMESA", 31, -1 }, - /* GL_IBM_multimode_draw_arrays */ { "glMultiModeDrawArraysIBM", 31, -1 }, { "glMultiModeDrawElementsIBM", 31, -1 }, -- 2.30.2