Module: Mesa Branch: master Commit: 70534dbe29052e2b4444d1c669750db3608c9eb9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=70534dbe29052e2b4444d1c669750db3608c9eb9
Author: Eric Anholt <[email protected]> Date: Wed Jul 18 11:01:17 2018 -0400 Allow AMD_perfmon on GLES contexts v2: whitespace alignment fix Reviewed-by: Rob Clark <[email protected]> --- src/mapi/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 b29dc5d903..785ea076c6 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 e24287b858..5795bccf33 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) 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) _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
