[Mesa-dev] [PATCH 15/20] glapi: Remove all offset tags from the XML

Ian Romanick idr at freedesktop.org
Wed May 13 12:44:43 PDT 2015


From: Ian Romanick <ian.d.romanick at intel.com>

Changes generated by:

    cd src/mapi/glapi/gen
    for i in *.xml; do
        cat $i |\
        sed 's/[[:space:]]*offset="[^"]*">/>/' |\
        sed 's/[[:space:]]*offset="[^"]*"[[:space:]]*$//' |\
        sed 's/[[:space:]]*offset="[^"]*"[[:space:]]*/ /' > x
        mv x $i
    done

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---

I cut out most of this patch for the mailing list.  It was 394075 bytes,
and the list server would have rejected it.  The full patch is in my
fd.o repo.

 src/mapi/glapi/gen/AMD_performance_monitor.xml     |   22 +-
 src/mapi/glapi/gen/APPLE_object_purgeable.xml      |    6 +-
 src/mapi/glapi/gen/APPLE_vertex_array_object.xml   |    4 +-
 src/mapi/glapi/gen/ARB_ES2_compatibility.xml       |   10 +-
 src/mapi/glapi/gen/ARB_base_instance.xml           |    6 +-
 src/mapi/glapi/gen/ARB_blend_func_extended.xml     |    4 +-
 src/mapi/glapi/gen/ARB_clear_buffer_object.xml     |    8 +-
 src/mapi/glapi/gen/ARB_clear_texture.xml           |    4 +-
 src/mapi/glapi/gen/ARB_clip_control.xml            |    2 +-
 src/mapi/glapi/gen/ARB_compute_shader.xml          |    4 +-
 src/mapi/glapi/gen/ARB_copy_buffer.xml             |    2 +-
 src/mapi/glapi/gen/ARB_copy_image.xml              |    2 +-
 src/mapi/glapi/gen/ARB_direct_state_access.xml     |  158 +--
 src/mapi/glapi/gen/ARB_draw_buffers_blend.xml      |    8 +-
 .../glapi/gen/ARB_draw_elements_base_vertex.xml    |    8 +-
 src/mapi/glapi/gen/ARB_draw_indirect.xml           |    8 +-
 src/mapi/glapi/gen/ARB_draw_instanced.xml          |    4 +-
 src/mapi/glapi/gen/ARB_framebuffer_object.xml      |   40 +-
 src/mapi/glapi/gen/ARB_get_program_binary.xml      |    6 +-
 src/mapi/glapi/gen/ARB_gpu_shader_fp64.xml         |   36 +-
 src/mapi/glapi/gen/ARB_internalformat_query.xml    |    2 +-
 src/mapi/glapi/gen/ARB_invalidate_subdata.xml      |   12 +-
 src/mapi/glapi/gen/ARB_map_buffer_range.xml        |    4 +-
 src/mapi/glapi/gen/ARB_multi_bind.xml              |   12 +-
 src/mapi/glapi/gen/ARB_program_interface_query.xml |   12 +-
 src/mapi/glapi/gen/ARB_robustness.xml              |   40 +-
 src/mapi/glapi/gen/ARB_sampler_objects.xml         |   28 +-
 src/mapi/glapi/gen/ARB_separate_shader_objects.xml |  122 +-
 src/mapi/glapi/gen/ARB_shader_atomic_counters.xml  |    2 +-
 src/mapi/glapi/gen/ARB_shader_image_load_store.xml |    4 +-
 src/mapi/glapi/gen/ARB_sync.xml                    |   14 +-
 src/mapi/glapi/gen/ARB_texture_buffer_range.xml    |    2 +-
 src/mapi/glapi/gen/ARB_texture_multisample.xml     |    8 +-
 src/mapi/glapi/gen/ARB_texture_storage.xml         |   12 +-
 .../glapi/gen/ARB_texture_storage_multisample.xml  |    4 +-
 src/mapi/glapi/gen/ARB_texture_view.xml            |    2 +-
 src/mapi/glapi/gen/ARB_uniform_buffer_object.xml   |   14 +-
 src/mapi/glapi/gen/ARB_vertex_array_object.xml     |    8 +-
 src/mapi/glapi/gen/ARB_vertex_attrib_64bit.xml     |   20 +-
 src/mapi/glapi/gen/ARB_vertex_attrib_binding.xml   |   12 +-
 .../glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml   |   76 +-
 src/mapi/glapi/gen/ARB_viewport_array.xml          |   20 +-
 src/mapi/glapi/gen/EXT_framebuffer_object.xml      |    4 +-
 src/mapi/glapi/gen/EXT_gpu_shader4.xml             |   28 +-
 src/mapi/glapi/gen/EXT_provoking_vertex.xml        |    2 +-
 src/mapi/glapi/gen/EXT_separate_shader_objects.xml |    6 +-
 src/mapi/glapi/gen/EXT_texture_integer.xml         |    4 +-
 src/mapi/glapi/gen/EXT_transform_feedback.xml      |   16 +-
 src/mapi/glapi/gen/GL3x.xml                        |  100 +-
 src/mapi/glapi/gen/GL4x.xml                        |    2 +-
 src/mapi/glapi/gen/INTEL_performance_query.xml     |   20 +-
 src/mapi/glapi/gen/KHR_debug.xml                   |   20 +-
 src/mapi/glapi/gen/NV_primitive_restart.xml        |    2 +-
 src/mapi/glapi/gen/NV_texture_barrier.xml          |    2 +-
 src/mapi/glapi/gen/NV_vdpau_interop.xml            |   20 +-
 src/mapi/glapi/gen/OES_EGL_image.xml               |    4 +-
 src/mapi/glapi/gen/OES_fixed_point.xml             |    6 +-
 src/mapi/glapi/gen/es_EXT.xml                      |   22 +-
 src/mapi/glapi/gen/gl_API.xml                      | 1462 ++++++++++----------
 src/mapi/glapi/gen/gl_and_es_API.xml               |   86 +-
 60 files changed, 1289 insertions(+), 1289 deletions(-)

diff --git a/src/mapi/glapi/gen/AMD_performance_monitor.xml b/src/mapi/glapi/gen/AMD_performance_monitor.xml
index b96b263..41b5208 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" offset="assign">
+    <function name="GetPerfMonitorGroupsAMD">
         <param name="numGroups" type="GLint *"/>
         <param name="groupsSize" type="GLsizei"/>
         <param name="groups" type="GLuint *"/>
     </function>
 
-    <function name="GetPerfMonitorCountersAMD" offset="assign">
+    <function name="GetPerfMonitorCountersAMD">
         <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" offset="assign">
+    <function name="GetPerfMonitorGroupStringAMD">
         <param name="group" type="GLuint"/>
         <param name="bufSize" type="GLsizei"/>
         <param name="length" type="GLsizei *"/>
         <param name="groupString" type="GLchar *"/>
     </function>
 
-    <function name="GetPerfMonitorCounterStringAMD" offset="assign">
+    <function name="GetPerfMonitorCounterStringAMD">
         <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" offset="assign">
+    <function name="GetPerfMonitorCounterInfoAMD">
         <param name="group" type="GLuint"/>
         <param name="counter" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="data" type="GLvoid *"/>
     </function>
 
-    <function name="GenPerfMonitorsAMD" offset="assign">
+    <function name="GenPerfMonitorsAMD">
         <param name="n" type="GLsizei"/>
         <param name="monitors" type="GLuint *"/>
     </function>
 
-    <function name="DeletePerfMonitorsAMD" offset="assign">
+    <function name="DeletePerfMonitorsAMD">
         <param name="n" type="GLsizei"/>
         <param name="monitors" type="GLuint *"/>
     </function>
 
-    <function name="SelectPerfMonitorCountersAMD" offset="assign">
+    <function name="SelectPerfMonitorCountersAMD">
         <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" offset="assign">
+    <function name="BeginPerfMonitorAMD">
         <param name="monitor" type="GLuint"/>
     </function>
 
-    <function name="EndPerfMonitorAMD" offset="assign">
+    <function name="EndPerfMonitorAMD">
         <param name="monitor" type="GLuint"/>
     </function>
 
-    <function name="GetPerfMonitorCounterDataAMD" offset="assign">
+    <function name="GetPerfMonitorCounterDataAMD">
         <param name="monitor" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="dataSize" type="GLsizei"/>
diff --git a/src/mapi/glapi/gen/APPLE_object_purgeable.xml b/src/mapi/glapi/gen/APPLE_object_purgeable.xml
index 62fa64a..829fc26 100644
--- a/src/mapi/glapi/gen/APPLE_object_purgeable.xml
+++ b/src/mapi/glapi/gen/APPLE_object_purgeable.xml
@@ -13,21 +13,21 @@
 
     <enum name="BUFFER_OBJECT_APPLE"          value="0x85B3"/>
 
-    <function name="ObjectPurgeableAPPLE" offset="assign">
+    <function name="ObjectPurgeableAPPLE">
         <param name="objectType" type="GLenum"/>
         <param name="name" type="GLuint"/>
         <param name="option" type="GLenum"/>
 	<return type="GLenum"/>
     </function>
 
-    <function name="ObjectUnpurgeableAPPLE" offset="assign">
+    <function name="ObjectUnpurgeableAPPLE">
         <param name="objectType" type="GLenum"/>
         <param name="name" type="GLuint"/>
         <param name="option" type="GLenum"/>
 	<return type="GLenum"/>
     </function>
 
-    <function name="GetObjectParameterivAPPLE" offset="assign">
+    <function name="GetObjectParameterivAPPLE">
         <param name="objectType" type="GLenum"/>
         <param name="name" type="GLuint"/>
         <param name="pname" type="GLenum"/>
diff --git a/src/mapi/glapi/gen/APPLE_vertex_array_object.xml b/src/mapi/glapi/gen/APPLE_vertex_array_object.xml
index 9410e4e..7312f9b 100644
--- a/src/mapi/glapi/gen/APPLE_vertex_array_object.xml
+++ b/src/mapi/glapi/gen/APPLE_vertex_array_object.xml
@@ -5,7 +5,7 @@
 <category name="GL_APPLE_vertex_array_object" number="273">
     <enum name="VERTEX_ARRAY_BINDING_APPLE"               value="0x85B5"/>
 
-    <function name="BindVertexArrayAPPLE" offset="assign" deprecated="3.1">
+    <function name="BindVertexArrayAPPLE" deprecated="3.1">
         <param name="array" type="GLuint"/>
     </function>
 
@@ -14,7 +14,7 @@
 	<param name="arrays" type="const GLuint *"/>
     </function>
 
-    <function name="GenVertexArraysAPPLE" offset="assign" deprecated="3.1">
+    <function name="GenVertexArraysAPPLE" deprecated="3.1">
         <param name="n" type="GLsizei"/>
 	<param name="arrays" type="GLuint *" count="n" output="true"/>
     </function>
diff --git a/src/mapi/glapi/gen/ARB_ES2_compatibility.xml b/src/mapi/glapi/gen/ARB_ES2_compatibility.xml
index d157366..c96e71c 100644
--- a/src/mapi/glapi/gen/ARB_ES2_compatibility.xml
+++ b/src/mapi/glapi/gen/ARB_ES2_compatibility.xml
@@ -18,17 +18,17 @@
     <enum name="MAX_VARYING_VECTORS"                          value="0x8DFC"/>
     <enum name="MAX_FRAGMENT_UNIFORM_VECTORS"                 value="0x8DFD"/>
 
-    <function name="GetShaderPrecisionFormat" offset="assign" es2="2.0">
+    <function name="GetShaderPrecisionFormat" es2="2.0">
         <param name="shadertype" type="GLenum"/>
         <param name="precisiontype" type="GLenum"/>
         <param name="range" type="GLint *"/>
         <param name="precision" type="GLint *"/>
     </function>
 
-    <function name="ReleaseShaderCompiler" offset="assign" es2="2.0">
+    <function name="ReleaseShaderCompiler" es2="2.0">
     </function>
 
-    <function name="ShaderBinary" offset="assign" es2="2.0">
+    <function name="ShaderBinary" es2="2.0">
         <param name="n" type="GLsizei"/>
         <param name="shaders" type="const GLuint *"/>
         <param name="binaryformat" type="GLenum"/>
@@ -45,11 +45,11 @@
     <enum name="IMPLEMENTATION_COLOR_READ_FORMAT"         value="0x8B9B"/>
 
     <!-- from GL_OES_single_precision -->
-    <function name="ClearDepthf" offset="assign" es1="1.0" es2="2.0">
+    <function name="ClearDepthf" es1="1.0" es2="2.0">
         <param name="depth" type="GLclampf"/>
     </function>
 
-    <function name="DepthRangef" offset="assign" es1="1.0" es2="2.0">
+    <function name="DepthRangef" es1="1.0" es2="2.0">
         <param name="zNear" type="GLclampf"/>
         <param name="zFar" type="GLclampf"/>
     </function>
diff --git a/src/mapi/glapi/gen/ARB_base_instance.xml b/src/mapi/glapi/gen/ARB_base_instance.xml
index 1478e39..571e0a4 100644
--- a/src/mapi/glapi/gen/ARB_base_instance.xml
+++ b/src/mapi/glapi/gen/ARB_base_instance.xml
@@ -8,7 +8,7 @@
 
 <category name="GL_ARB_base_instance" number="107">
 
-  <function name="DrawArraysInstancedBaseInstance" offset="assign"
+  <function name="DrawArraysInstancedBaseInstance"
             exec="dynamic">
     <param name="mode" type="GLenum"/>
     <param name="first" type="GLint"/>
@@ -17,7 +17,7 @@
     <param name="baseinstance" type="GLuint"/>
   </function>
 
-  <function name="DrawElementsInstancedBaseInstance" offset="assign"
+  <function name="DrawElementsInstancedBaseInstance"
             exec="dynamic">
     <param name="mode" type="GLenum"/>
     <param name="count" type="GLsizei"/>
@@ -27,7 +27,7 @@
     <param name="baseinstance" type="GLuint"/>
   </function>
 
-  <function name="DrawElementsInstancedBaseVertexBaseInstance" offset="assign"
+  <function name="DrawElementsInstancedBaseVertexBaseInstance"
             exec="dynamic">
     <param name="mode" type="GLenum"/>
     <param name="count" type="GLsizei"/>
-- 
2.1.0



More information about the mesa-dev mailing list