diff options
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/dlist.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/extensions_table.h | 3 | ||||
| -rw-r--r-- | src/mesa/main/get.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/get_hash_params.py | 4 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/polygon.c | 9 | ||||
| -rw-r--r-- | src/mesa/main/version.c | 2 |
7 files changed, 11 insertions, 13 deletions
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 208471aca73..b7d1406eb74 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -10062,7 +10062,7 @@ _mesa_initialize_save_table(const struct gl_context *ctx) SET_ProgramUniformMatrix3x4fv(table, save_ProgramUniformMatrix3x4fv); SET_ProgramUniformMatrix4x3fv(table, save_ProgramUniformMatrix4x3fv); - /* GL_EXT_polygon_offset_clamp */ + /* GL_{ARB,EXT}_polygon_offset_clamp */ SET_PolygonOffsetClampEXT(table, save_PolygonOffsetClampEXT); /* GL_EXT_window_rectangles */ diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index d096260891c..9475c1b69d9 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -94,6 +94,7 @@ EXT(ARB_pipeline_statistics_query , ARB_pipeline_statistics_query EXT(ARB_pixel_buffer_object , EXT_pixel_buffer_object , GLL, GLC, x , x , 2004) EXT(ARB_point_parameters , EXT_point_parameters , GLL, x , x , x , 1997) EXT(ARB_point_sprite , ARB_point_sprite , GLL, GLC, x , x , 2003) +EXT(ARB_polygon_offset_clamp , ARB_polygon_offset_clamp , GLL, GLC, x , x , 2017) EXT(ARB_post_depth_coverage , ARB_post_depth_coverage , x , GLC, x , x, 2015) EXT(ARB_program_interface_query , dummy_true , GLL, GLC, x , x , 2012) EXT(ARB_provoking_vertex , EXT_provoking_vertex , GLL, GLC, x , x , 2009) @@ -236,7 +237,7 @@ EXT(EXT_packed_pixels , dummy_true 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 , EXT_polygon_offset_clamp , GLL, GLC, ES1, ES2, 2014) +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) EXT(EXT_read_format_bgra , dummy_true , x , x , ES1, ES2, 2009) diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index 8c3958b0965..4c4a4a79c07 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -489,7 +489,7 @@ EXTRA_EXT2(ARB_transform_feedback3, ARB_gpu_shader5); EXTRA_EXT(INTEL_performance_query); EXTRA_EXT(ARB_explicit_uniform_location); EXTRA_EXT(ARB_clip_control); -EXTRA_EXT(EXT_polygon_offset_clamp); +EXTRA_EXT(ARB_polygon_offset_clamp); EXTRA_EXT(ARB_framebuffer_no_attachments); EXTRA_EXT(ARB_tessellation_shader); EXTRA_EXT(ARB_shader_storage_buffer_object); diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py index 9d67ca49f8e..acd5cd1f011 100644 --- a/src/mesa/main/get_hash_params.py +++ b/src/mesa/main/get_hash_params.py @@ -136,8 +136,8 @@ descriptor=[ [ "MAX_DEBUG_GROUP_STACK_DEPTH", "CONST(MAX_DEBUG_GROUP_STACK_DEPTH), NO_EXTRA" ], [ "DEBUG_GROUP_STACK_DEPTH", "LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA" ], -# GL_EXT_polygon_offset_clamp - [ "POLYGON_OFFSET_CLAMP_EXT", "CONTEXT_FLOAT(Polygon.OffsetClamp), extra_EXT_polygon_offset_clamp" ], +# GL_ARB_polygon_offset_clamp / GL_EXT_polygon_offset_clamp + [ "POLYGON_OFFSET_CLAMP_EXT", "CONTEXT_FLOAT(Polygon.OffsetClamp), extra_ARB_polygon_offset_clamp" ], ]}, # Enums in OpenGL and GLES1 diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 99b6dfa6113..19135673dcb 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -4055,6 +4055,7 @@ struct gl_extensions GLboolean ARB_occlusion_query2; GLboolean ARB_pipeline_statistics_query; GLboolean ARB_point_sprite; + GLboolean ARB_polygon_offset_clamp; GLboolean ARB_post_depth_coverage; GLboolean ARB_query_buffer_object; GLboolean ARB_robust_buffer_access_behavior; @@ -4133,7 +4134,6 @@ struct gl_extensions GLboolean EXT_packed_float; GLboolean EXT_pixel_buffer_object; GLboolean EXT_point_parameters; - GLboolean EXT_polygon_offset_clamp; GLboolean EXT_provoking_vertex; GLboolean EXT_shader_integer_mix; GLboolean EXT_shader_samples_identical; diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c index 44d943e930b..effd4d27fbd 100644 --- a/src/mesa/main/polygon.c +++ b/src/mesa/main/polygon.c @@ -328,7 +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 ) { @@ -342,20 +341,18 @@ _mesa_PolygonOffsetClampEXT( GLfloat factor, GLfloat units, GLfloat clamp ) { GET_CURRENT_CONTEXT(ctx); - if (!ctx->Extensions.EXT_polygon_offset_clamp) { + if (!ctx->Extensions.ARB_polygon_offset_clamp) { _mesa_error(ctx, GL_INVALID_OPERATION, - "unsupported function (glPolygonOffsetClampEXT) called"); + "unsupported function (%s) called", "glPolygonOffsetClamp"); return; } if (MESA_VERBOSE&VERBOSE_API) - _mesa_debug(ctx, "glPolygonOffsetClampEXT %f %f %f\n", factor, units, clamp); + _mesa_debug(ctx, "glPolygonOffsetClamp %f %f %f\n", factor, units, clamp); _mesa_polygon_offset_clamp(ctx, factor, units, clamp); } - - /**********************************************************************/ /** \name Initialization */ /*@{*/ diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c index 59e7b89ff6e..90c5c5f84e0 100644 --- a/src/mesa/main/version.c +++ b/src/mesa/main/version.c @@ -391,7 +391,7 @@ compute_version(const struct gl_extensions *extensions, /* extensions->ARB_spirv_extensions */ 0 && extensions->ARB_indirect_parameters && extensions->ARB_pipeline_statistics_query && - /* extensions->ARB_polygon_offset_clamp */ 0 && + extensions->ARB_polygon_offset_clamp && extensions->ARB_shader_atomic_counter_ops && extensions->ARB_shader_draw_parameters && extensions->ARB_shader_group_vote && |