From c0c69bd8ddf384379863d8b4bcbc670e86984ae5 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Fri, 11 May 2018 15:33:22 +1000 Subject: [PATCH] mesa: drop GL_EXT_polygon_offset support MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit glPolygonOffset() has been part of the GL standard since 1.1. Also niether AMD or Nvidia support this in their binary drivers. Reviewed-by: Marek Olšák Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=61761 --- docs/relnotes/18.2.0.html | 64 +++++++++++++++++++++++++ src/mapi/glapi/gen/gl_API.xml | 10 ---- src/mapi/glapi/tests/check_table.cpp | 1 - src/mesa/main/dlist.c | 11 ----- src/mesa/main/extensions_table.h | 1 - src/mesa/main/get_hash_params.py | 1 - src/mesa/main/polygon.c | 8 ---- src/mesa/main/polygon.h | 3 -- src/mesa/main/tests/dispatch_sanity.cpp | 1 - 9 files changed, 64 insertions(+), 36 deletions(-) create mode 100644 docs/relnotes/18.2.0.html diff --git a/docs/relnotes/18.2.0.html b/docs/relnotes/18.2.0.html new file mode 100644 index 00000000000..f3bdb6605c4 --- /dev/null +++ b/docs/relnotes/18.2.0.html @@ -0,0 +1,64 @@ + + + + + Mesa Release Notes + + + + +
+

The Mesa 3D Graphics Library

+
+ + +
+ +

Mesa 18.2.0 Release Notes / TBD

+ +

+Mesa 18.2.0 is a new development release. People who are concerned +with stability and reliability should stick with a previous release or +wait for Mesa 18.2.1. +

+

+Mesa 18.2.0 implements the OpenGL 4.5 API, but the version reported by +glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) / +glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used. +Some drivers don't support all the features required in OpenGL 4.5. OpenGL +4.5 is only available if requested at context creation. +Compatibility contexts may report a lower version depending on each driver. +

+ + +

SHA256 checksums

+
+TBD.
+
+ + +

New features

+ +

+Note: some of the new features are only available with certain drivers. +

+ +
    +
  • TBD
    • +
+ +

Bug fixes

+ +
    +TBD +
+ +

Changes

+ +
    +
  • Removed GL_EXT_polygon_offset applications should use glPolygonOffset instead.
    • +
+ +
+ + diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index db312370b1d..8ad45970c9c 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -8423,16 +8423,6 @@ - - - - - - - - - - diff --git a/src/mapi/glapi/tests/check_table.cpp b/src/mapi/glapi/tests/check_table.cpp index 6230f1273f3..761f2a24e09 100644 --- a/src/mapi/glapi/tests/check_table.cpp +++ b/src/mapi/glapi/tests/check_table.cpp @@ -1260,7 +1260,6 @@ const struct name_offset known_dispatch[] = { { "glTextureStorage1DEXT", _O(TextureStorage1DEXT) }, { "glTextureStorage2DEXT", _O(TextureStorage2DEXT) }, { "glTextureStorage3DEXT", _O(TextureStorage3DEXT) }, - { "glPolygonOffsetEXT", _O(PolygonOffsetEXT) }, { "glSampleMaskSGIS", _O(SampleMaskSGIS) }, { "glSamplePatternSGIS", _O(SamplePatternSGIS) }, { "glColorPointerEXT", _O(ColorPointerEXT) }, diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 9e6cb725f54..8be223559ab 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -3485,14 +3485,6 @@ save_PolygonOffset(GLfloat factor, GLfloat units) } -static void GLAPIENTRY -save_PolygonOffsetEXT(GLfloat factor, GLfloat bias) -{ - GET_CURRENT_CONTEXT(ctx); - /* XXX mult by DepthMaxF here??? */ - save_PolygonOffset(factor, ctx->DrawBuffer->_DepthMaxF * bias); -} - static void GLAPIENTRY save_PolygonOffsetClampEXT(GLfloat factor, GLfloat units, GLfloat clamp) { @@ -9839,9 +9831,6 @@ _mesa_initialize_save_table(const struct gl_context *ctx) SET_BlendColorEXT(table, save_BlendColorEXT); #endif - /* 3. GL_EXT_polygon_offset */ - SET_PolygonOffsetEXT(table, save_PolygonOffsetEXT); - /* 6. GL_EXT_texture3d */ #if 0 SET_CopyTexSubImage3DEXT(table, save_CopyTexSubImage3D); diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index 945b462122c..38d241db529 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -240,7 +240,6 @@ EXT(EXT_packed_float , EXT_packed_float EXT(EXT_packed_pixels , dummy_true , GLL, x , x , x , 1997) EXT(EXT_pixel_buffer_object , EXT_pixel_buffer_object , GLL, GLC, x , x , 2004) EXT(EXT_point_parameters , EXT_point_parameters , GLL, x , x , x , 1997) -EXT(EXT_polygon_offset , dummy_true , GLL, x , x , x , 1995) EXT(EXT_polygon_offset_clamp , ARB_polygon_offset_clamp , GLL, GLC, ES1, ES2, 2014) EXT(EXT_primitive_bounding_box , OES_primitive_bounding_box , x , x , x , 31, 2014) EXT(EXT_provoking_vertex , EXT_provoking_vertex , GLL, GLC, x , x , 2009) diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py index a97b948a791..4bbda93b31d 100644 --- a/src/mesa/main/get_hash_params.py +++ b/src/mesa/main/get_hash_params.py @@ -759,7 +759,6 @@ descriptor=[ [ "PIXEL_MAP_S_TO_S_SIZE", "CONTEXT_INT(PixelMaps.StoS.Size), NO_EXTRA" ], [ "POINT_SIZE_GRANULARITY", "CONTEXT_FLOAT(Const.PointSizeGranularity), NO_EXTRA" ], [ "POLYGON_MODE", "CONTEXT_ENUM2(Polygon.FrontMode), NO_EXTRA" ], - [ "POLYGON_OFFSET_BIAS_EXT", "CONTEXT_FLOAT(Polygon.OffsetUnits), NO_EXTRA" ], [ "POLYGON_OFFSET_POINT", "CONTEXT_BOOL(Polygon.OffsetPoint), NO_EXTRA" ], [ "POLYGON_OFFSET_LINE", "CONTEXT_BOOL(Polygon.OffsetLine), NO_EXTRA" ], [ "POLYGON_SMOOTH", "CONTEXT_BOOL(Polygon.SmoothFlag), NO_EXTRA" ], diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c index effd4d27fbd..ae8f2a85645 100644 --- a/src/mesa/main/polygon.c +++ b/src/mesa/main/polygon.c @@ -328,14 +328,6 @@ _mesa_PolygonOffset( GLfloat factor, GLfloat units ) _mesa_polygon_offset_clamp(ctx, factor, units, 0.0); } -void GLAPIENTRY -_mesa_PolygonOffsetEXT( GLfloat factor, GLfloat bias ) -{ - GET_CURRENT_CONTEXT(ctx); - /* XXX mult by DepthMaxF here??? */ - _mesa_PolygonOffset(factor, bias * ctx->DrawBuffer->_DepthMaxF ); -} - void GLAPIENTRY _mesa_PolygonOffsetClampEXT( GLfloat factor, GLfloat units, GLfloat clamp ) { diff --git a/src/mesa/main/polygon.h b/src/mesa/main/polygon.h index 1b8186892a3..a7e383da034 100644 --- a/src/mesa/main/polygon.h +++ b/src/mesa/main/polygon.h @@ -60,9 +60,6 @@ _mesa_PolygonMode( GLenum face, GLenum mode ); extern void GLAPIENTRY _mesa_PolygonOffset( GLfloat factor, GLfloat units ); -extern void GLAPIENTRY -_mesa_PolygonOffsetEXT( GLfloat factor, GLfloat bias ); - extern void GLAPIENTRY _mesa_PolygonOffsetClampEXT( GLfloat factor, GLfloat units, GLfloat clamp ); diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index b1413907de2..b9de084ccfb 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -1437,7 +1437,6 @@ const struct function gl_compatibility_functions_possible[] = { { "glGetProgramLocalParameterfvARB", 10, -1 }, { "glGetProgramivARB", 10, -1 }, { "glGetProgramStringARB", 10, -1 }, - { "glPolygonOffsetEXT", 10, -1 }, { "glColorPointerEXT", 10, -1 }, { "glEdgeFlagPointerEXT", 10, -1 }, { "glIndexPointerEXT", 10, -1 }, -- 2.30.2