Re: [Mesa-dev] [PATCH 2/2] mesa: Implement GL_ARB_polygon_offset_clamp

[Ilia Mirkin]

On Thu, Aug 24, 2017 at 2:40 PM, Adam Jackson  wrote:
> Semantically identical to the EXT version (whose string is still valid
> for GLES), so rename the bit but expose both extension strings.
> (Suggested by Ilia Mirkin and Ian Romanick.)
>
> Signed-off-by: Adam Jackson 
> ---
>  docs/features.txt|  2 +-
>  docs/relnotes/17.3.0.html|  1 +
>  src/mapi/glapi/gen/GL4x.xml  |  9 +
>  src/mesa/drivers/dri/i965/intel_extensions.c |  2 +-
>  src/mesa/main/dlist.c| 10 +-
>  src/mesa/main/extensions_table.h |  3 ++-
>  src/mesa/main/get.c  |  2 +-
>  src/mesa/main/get_hash_params.py |  4 ++--
>  src/mesa/main/mtypes.h   |  2 +-
>  src/mesa/main/polygon.c  | 15 +--
>  src/mesa/main/polygon.h  |  3 +++
>  src/mesa/main/version.c  |  2 +-
>  src/mesa/state_tracker/st_extensions.c   |  2 +-
>  13 files changed, 37 insertions(+), 20 deletions(-)
>
> diff --git a/docs/features.txt b/docs/features.txt
> index 3f91c2daae..0435ce61ff 100644
> --- a/docs/features.txt
> +++ b/docs/features.txt
> @@ -226,7 +226,7 @@ GL 4.6, GLSL 4.60
>GL_ARB_gl_spirv   in progress (Nicolai 
> Hähnle, Ian Romanick)
>GL_ARB_indirect_parametersDONE (nvc0, radeonsi)
>GL_ARB_pipeline_statistics_query  DONE (i965, nvc0, 
> radeonsi, softpipe, swr)
> -  GL_ARB_polygon_offset_clamp   not started
> +  GL_ARB_polygon_offset_clamp   DONE (i965, nv50, 
> nvc0, r600, radeonsi, llvmpipe, swr)
>GL_ARB_shader_atomic_counter_ops  DONE (i965/gen7+, 
> nvc0, radeonsi, softpipe)
>GL_ARB_shader_draw_parameters DONE (i965, nvc0, 
> radeonsi)
>GL_ARB_shader_group_vote  DONE (i965, nvc0, 
> radeonsi)
> diff --git a/docs/relnotes/17.3.0.html b/docs/relnotes/17.3.0.html
> index 8da43f22f0..4a74284632 100644
> --- a/docs/relnotes/17.3.0.html
> +++ b/docs/relnotes/17.3.0.html
> @@ -44,6 +44,7 @@ Note: some of the new features are only available with 
> certain drivers.
>  
>
>  
> +GL_ARB_polygon_offset_clamp on i965, nv50, nvc0, r600, radeonsi, 
> llvmpipe, swr
>  GL_ARB_transform_feedback_overflow_query on radeonsi
>  GL_ARB_texture_filter_anisotropic on i965, nv50, nvc0, r600, 
> radeonsi
>  GL_EXT_memory_object on radeonsi
> diff --git a/src/mapi/glapi/gen/GL4x.xml b/src/mapi/glapi/gen/GL4x.xml
> index e958ee70c7..9e7685e5fd 100644
> --- a/src/mapi/glapi/gen/GL4x.xml
> +++ b/src/mapi/glapi/gen/GL4x.xml
> @@ -66,4 +66,13 @@
>
>  
>
> +
> +  
> +
> +
> +
> +  
> +  
> +
> +
>  
> diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c 
> b/src/mesa/drivers/dri/i965/intel_extensions.c
> index c3cd8004a1..deacd0d9df 100644
> --- a/src/mesa/drivers/dri/i965/intel_extensions.c
> +++ b/src/mesa/drivers/dri/i965/intel_extensions.c
> @@ -66,6 +66,7 @@ intelInitExtensions(struct gl_context *ctx)
> ctx->Extensions.ARB_occlusion_query = true;
> ctx->Extensions.ARB_occlusion_query2 = true;
> ctx->Extensions.ARB_point_sprite = true;
> +   ctx->Extensions.ARB_polygon_offset_clamp = true;
> ctx->Extensions.ARB_seamless_cube_map = true;
> ctx->Extensions.ARB_shader_bit_encoding = true;
> ctx->Extensions.ARB_shader_draw_parameters = true;
> @@ -100,7 +101,6 @@ intelInitExtensions(struct gl_context *ctx)
> ctx->Extensions.EXT_packed_float = true;
> ctx->Extensions.EXT_pixel_buffer_object = true;
> ctx->Extensions.EXT_point_parameters = true;
> -   ctx->Extensions.EXT_polygon_offset_clamp = true;
> ctx->Extensions.EXT_provoking_vertex = true;
> ctx->Extensions.EXT_stencil_two_side = true;
> ctx->Extensions.EXT_texture_array = true;
> diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
> index 208471aca7..b710e1b263 100644
> --- a/src/mesa/main/dlist.c
> +++ b/src/mesa/main/dlist.c
> @@ -3504,7 +3504,7 @@ save_PolygonOffsetEXT(GLfloat factor, GLfloat bias)
>  }
>
>  static void GLAPIENTRY
> -save_PolygonOffsetClampEXT(GLfloat factor, GLfloat units, GLfloat clamp)
> +save_PolygonOffsetClamp(GLfloat factor, GLfloat units, GLfloat clamp)
>  {
> GET_CURRENT_CONTEXT(ctx);
> Node *n;
> @@ -3516,7 +3516,7 @@ save_PolygonOffsetClampEXT(GLfloat factor, GLfloat 
> units, GLfloat clamp)
>n[3].f = clamp;
> }
> if (ctx->ExecuteFlag) {
> -  CALL_PolygonOffsetClampEXT(ctx->Exec, (factor, units, clamp));
> +  CALL_PolygonOffsetClamp(ctx->Exec, (factor, units, clamp));
> }
>  }
>
> @@ -10062,11 +10062,11 @@ _mesa_initialize_save_table(const struct gl_context 
> *ctx)
> SET_ProgramUniformMatrix3x4fv(table, save_ProgramUniformMatrix3x4fv);
> SET_ProgramUniformMatrix4x3fv(table, 

[Mesa-dev] [PATCH 2/2] mesa: Implement GL_ARB_polygon_offset_clamp

[Adam Jackson]

Semantically identical to the EXT version (whose string is still valid
for GLES), so rename the bit but expose both extension strings.
(Suggested by Ilia Mirkin and Ian Romanick.)

Signed-off-by: Adam Jackson 
---
 docs/features.txt|  2 +-
 docs/relnotes/17.3.0.html|  1 +
 src/mapi/glapi/gen/GL4x.xml  |  9 +
 src/mesa/drivers/dri/i965/intel_extensions.c |  2 +-
 src/mesa/main/dlist.c| 10 +-
 src/mesa/main/extensions_table.h |  3 ++-
 src/mesa/main/get.c  |  2 +-
 src/mesa/main/get_hash_params.py |  4 ++--
 src/mesa/main/mtypes.h   |  2 +-
 src/mesa/main/polygon.c  | 15 +--
 src/mesa/main/polygon.h  |  3 +++
 src/mesa/main/version.c  |  2 +-
 src/mesa/state_tracker/st_extensions.c   |  2 +-
 13 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/docs/features.txt b/docs/features.txt
index 3f91c2daae..0435ce61ff 100644
--- a/docs/features.txt
+++ b/docs/features.txt
@@ -226,7 +226,7 @@ GL 4.6, GLSL 4.60
   GL_ARB_gl_spirv   in progress (Nicolai 
Hähnle, Ian Romanick)
   GL_ARB_indirect_parametersDONE (nvc0, radeonsi)
   GL_ARB_pipeline_statistics_query  DONE (i965, nvc0, 
radeonsi, softpipe, swr)
-  GL_ARB_polygon_offset_clamp   not started
+  GL_ARB_polygon_offset_clamp   DONE (i965, nv50, 
nvc0, r600, radeonsi, llvmpipe, swr)
   GL_ARB_shader_atomic_counter_ops  DONE (i965/gen7+, 
nvc0, radeonsi, softpipe)
   GL_ARB_shader_draw_parameters DONE (i965, nvc0, 
radeonsi)
   GL_ARB_shader_group_vote  DONE (i965, nvc0, 
radeonsi)
diff --git a/docs/relnotes/17.3.0.html b/docs/relnotes/17.3.0.html
index 8da43f22f0..4a74284632 100644
--- a/docs/relnotes/17.3.0.html
+++ b/docs/relnotes/17.3.0.html
@@ -44,6 +44,7 @@ Note: some of the new features are only available with 
certain drivers.
 
 
 
+GL_ARB_polygon_offset_clamp on i965, nv50, nvc0, r600, radeonsi, llvmpipe, 
swr
 GL_ARB_transform_feedback_overflow_query on radeonsi
 GL_ARB_texture_filter_anisotropic on i965, nv50, nvc0, r600, radeonsi
 GL_EXT_memory_object on radeonsi
diff --git a/src/mapi/glapi/gen/GL4x.xml b/src/mapi/glapi/gen/GL4x.xml
index e958ee70c7..9e7685e5fd 100644
--- a/src/mapi/glapi/gen/GL4x.xml
+++ b/src/mapi/glapi/gen/GL4x.xml
@@ -66,4 +66,13 @@
   
 
 
+
+  
+
+
+
+  
+  
+
+
 
diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c 
b/src/mesa/drivers/dri/i965/intel_extensions.c
index c3cd8004a1..deacd0d9df 100644
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -66,6 +66,7 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Extensions.ARB_occlusion_query = true;
ctx->Extensions.ARB_occlusion_query2 = true;
ctx->Extensions.ARB_point_sprite = true;
+   ctx->Extensions.ARB_polygon_offset_clamp = true;
ctx->Extensions.ARB_seamless_cube_map = true;
ctx->Extensions.ARB_shader_bit_encoding = true;
ctx->Extensions.ARB_shader_draw_parameters = true;
@@ -100,7 +101,6 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Extensions.EXT_packed_float = true;
ctx->Extensions.EXT_pixel_buffer_object = true;
ctx->Extensions.EXT_point_parameters = true;
-   ctx->Extensions.EXT_polygon_offset_clamp = true;
ctx->Extensions.EXT_provoking_vertex = true;
ctx->Extensions.EXT_stencil_two_side = true;
ctx->Extensions.EXT_texture_array = true;
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 208471aca7..b710e1b263 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -3504,7 +3504,7 @@ save_PolygonOffsetEXT(GLfloat factor, GLfloat bias)
 }
 
 static void GLAPIENTRY
-save_PolygonOffsetClampEXT(GLfloat factor, GLfloat units, GLfloat clamp)
+save_PolygonOffsetClamp(GLfloat factor, GLfloat units, GLfloat clamp)
 {
GET_CURRENT_CONTEXT(ctx);
Node *n;
@@ -3516,7 +3516,7 @@ save_PolygonOffsetClampEXT(GLfloat factor, GLfloat units, 
GLfloat clamp)
   n[3].f = clamp;
}
if (ctx->ExecuteFlag) {
-  CALL_PolygonOffsetClampEXT(ctx->Exec, (factor, units, clamp));
+  CALL_PolygonOffsetClamp(ctx->Exec, (factor, units, clamp));
}
 }
 
@@ -10062,11 +10062,11 @@ _mesa_initialize_save_table(const struct gl_context 
*ctx)
SET_ProgramUniformMatrix3x4fv(table, save_ProgramUniformMatrix3x4fv);
SET_ProgramUniformMatrix4x3fv(table, save_ProgramUniformMatrix4x3fv);
 
-   /* GL_EXT_polygon_offset_clamp */
-   SET_PolygonOffsetClampEXT(table, save_PolygonOffsetClampEXT);
-
/* GL_EXT_window_rectangles */
SET_WindowRectanglesEXT(table, save_WindowRectanglesEXT);
+
+   /* GL_ARB_polygon_offset_clamp */
+   SET_PolygonOffsetClamp(table,