[Mesa-dev] [PATCH] Allow AMD_perfmon on GLES contexts

[Ilia Mirkin]

On Wed, Jul 18, 2018 at 11:01 AM, Rob Clark <robdclark at gmail.com> wrote:
> From: Eric Anholt <eric at anholt.net>
>
> Reviewed-by: Rob Clark <robdclark at gmail.com>
> ---
> Not sure if this ever got sent to list.. but this extension is meant to
> be exposed in GLES as well as GL
>
>  .../glapi/gen/AMD_performance_monitor.xml     | 22 +++++++++----------
>  src/mesa/main/extensions_table.h              |  2 +-
>  2 files changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/src/mapi/glapi/gen/AMD_performance_monitor.xml b/src/mapi/glapi/gen/AMD_performance_monitor.xml
> index b29dc5d9036..785ea076c6f 100644
> --- a/src/mapi/glapi/gen/AMD_performance_monitor.xml
> +++ b/src/mapi/glapi/gen/AMD_performance_monitor.xml
> @@ -5,13 +5,13 @@
>
>  <category name="GL_AMD_performance_monitor" number="360">
>
> -    <function name="GetPerfMonitorGroupsAMD">
> +    <function name="GetPerfMonitorGroupsAMD" es2="2.0">
>          <param name="numGroups" type="GLint *"/>
>          <param name="groupsSize" type="GLsizei"/>
>          <param name="groups" type="GLuint *"/>
>      </function>
>
> -    <function name="GetPerfMonitorCountersAMD">
> +    <function name="GetPerfMonitorCountersAMD" es2="2.0">
>          <param name="group" type="GLuint"/>
>          <param name="numCounters" type="GLint *"/>
>          <param name="maxActiveCounters" type="GLint *"/>
> @@ -19,14 +19,14 @@
>          <param name="counters" type="GLuint *"/>
>      </function>
>
> -    <function name="GetPerfMonitorGroupStringAMD">
> +    <function name="GetPerfMonitorGroupStringAMD" es2="2.0">
>          <param name="group" type="GLuint"/>
>          <param name="bufSize" type="GLsizei"/>
>          <param name="length" type="GLsizei *"/>
>          <param name="groupString" type="GLchar *"/>
>      </function>
>
> -    <function name="GetPerfMonitorCounterStringAMD">
> +    <function name="GetPerfMonitorCounterStringAMD" es2="2.0">
>          <param name="group" type="GLuint"/>
>          <param name="counter" type="GLuint"/>
>          <param name="bufSize" type="GLsizei"/>
> @@ -34,24 +34,24 @@
>          <param name="counterString" type="GLchar *"/>
>      </function>
>
> -    <function name="GetPerfMonitorCounterInfoAMD">
> +    <function name="GetPerfMonitorCounterInfoAMD" es2="2.0">
>          <param name="group" type="GLuint"/>
>          <param name="counter" type="GLuint"/>
>          <param name="pname" type="GLenum"/>
>          <param name="data" type="GLvoid *"/>
>      </function>
>
> -    <function name="GenPerfMonitorsAMD">
> +    <function name="GenPerfMonitorsAMD" es2="2.0">
>          <param name="n" type="GLsizei"/>
>          <param name="monitors" type="GLuint *"/>
>      </function>
>
> -    <function name="DeletePerfMonitorsAMD">
> +    <function name="DeletePerfMonitorsAMD" es2="2.0">
>          <param name="n" type="GLsizei"/>
>          <param name="monitors" type="GLuint *"/>
>      </function>
>
> -    <function name="SelectPerfMonitorCountersAMD">
> +    <function name="SelectPerfMonitorCountersAMD" es2="2.0">
>          <param name="monitor" type="GLuint"/>
>          <param name="enable" type="GLboolean"/>
>          <param name="group" type="GLuint"/>
> @@ -59,15 +59,15 @@
>          <param name="counterList" type="GLuint *"/>
>      </function>
>
> -    <function name="BeginPerfMonitorAMD">
> +    <function name="BeginPerfMonitorAMD" es2="2.0">
>          <param name="monitor" type="GLuint"/>
>      </function>
>
> -    <function name="EndPerfMonitorAMD">
> +    <function name="EndPerfMonitorAMD" es2="2.0">
>          <param name="monitor" type="GLuint"/>
>      </function>
>
> -    <function name="GetPerfMonitorCounterDataAMD">
> +    <function name="GetPerfMonitorCounterDataAMD" es2="2.0">
>          <param name="monitor" type="GLuint"/>
>          <param name="pname" type="GLenum"/>
>          <param name="dataSize" type="GLsizei"/>
> diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
> index e24287b8581..af1ae73473d 100644
> --- a/src/mesa/main/extensions_table.h
> +++ b/src/mesa/main/extensions_table.h
> @@ -10,7 +10,7 @@ EXT(3DFX_texture_compression_FXT1           , TDFX_texture_compression_FXT1
>
>  EXT(AMD_conservative_depth                  , ARB_conservative_depth                 , GLL, GLC,  x ,  x , 2009)
>  EXT(AMD_draw_buffers_blend                  , ARB_draw_buffers_blend                 , GLL, GLC,  x ,  x , 2009)
> -EXT(AMD_performance_monitor                 , AMD_performance_monitor                , GLL, GLC,  x ,  x , 2007)
> +EXT(AMD_performance_monitor                 , AMD_performance_monitor                , GLL, GLC,  x ,  ES2 , 2007)

Please keep this aligned, as all the other entries are...

>  EXT(AMD_pinned_memory                       , AMD_pinned_memory                      , GLL, GLC,  x ,  x , 2013)
>  EXT(AMD_seamless_cubemap_per_texture        , AMD_seamless_cubemap_per_texture       , GLL, GLC,  x ,  x , 2009)
>  EXT(AMD_shader_stencil_export               , ARB_shader_stencil_export              , GLL, GLC,  x ,  x , 2009)
> --
> 2.17.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev