[Mesa-dev] [PATCH] glapi: remove the final function offset tags

Emil Velikov emil.l.velikov at gmail.com
Tue Nov 24 14:16:54 PST 2015 

A commit earlier this year reworked out python scripts to use a separate
file for these. Followed by removing support from the parser, and
removing all of the offset tags.

Seems like we either missed a few, or people added them by mistake.
Either way let's nuke the ones that are still around.

Cc: Ian Romanick <ian.d.romanick at intel.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---

Noticed while digging around the KHR_debug CTS failures.

-Emil

 src/mapi/glapi/gen/ARB_direct_state_access.xml   | 36 ++++++++++++------------
 src/mapi/glapi/gen/ARB_get_texture_sub_image.xml |  4 +--
 src/mapi/glapi/gen/ARB_shader_subroutine.xml     | 16 +++++------
 src/mapi/glapi/gen/ARB_tessellation_shader.xml   |  4 +--
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml b/src/mapi/glapi/gen/ARB_direct_state_access.xml
index 4c8f73e..254df98 100644
--- a/src/mapi/glapi/gen/ARB_direct_state_access.xml
+++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml
@@ -154,32 +154,32 @@
 
    <!-- Framebuffer object functions -->
 
-   <function name="CreateFramebuffers" offset="assign">
+   <function name="CreateFramebuffers">
       <param name="n" type="GLsizei" />
       <param name="framebuffers" type="GLuint *" />
    </function>
 
-   <function name="NamedFramebufferRenderbuffer" offset="assign">
+   <function name="NamedFramebufferRenderbuffer">
       <param name="framebuffer" type="GLuint" />
       <param name="attachment" type="GLenum" />
       <param name="renderbuffertarget" type="GLenum" />
       <param name="renderbuffer" type="GLuint" />
    </function>
 
-   <function name="NamedFramebufferParameteri" offset="assign">
+   <function name="NamedFramebufferParameteri">
       <param name="framebuffer" type="GLuint" />
       <param name="pname" type="GLenum" />
       <param name="param" type="GLint" />
    </function>
 
-   <function name="NamedFramebufferTexture" offset="assign">
+   <function name="NamedFramebufferTexture">
       <param name="framebuffer" type="GLuint" />
       <param name="attachment" type="GLenum" />
       <param name="texture" type="GLuint" />
       <param name="level" type="GLint" />
    </function>
 
-   <function name="NamedFramebufferTextureLayer" offset="assign">
+   <function name="NamedFramebufferTextureLayer">
       <param name="framebuffer" type="GLuint" />
       <param name="attachment" type="GLenum" />
       <param name="texture" type="GLuint" />
@@ -187,29 +187,29 @@
       <param name="layer" type="GLint" />
    </function>
 
-   <function name="NamedFramebufferDrawBuffer" offset="assign">
+   <function name="NamedFramebufferDrawBuffer">
       <param name="framebuffer" type="GLuint" />
       <param name="buf" type="GLenum" />
    </function>
 
-   <function name="NamedFramebufferDrawBuffers" offset="assign">
+   <function name="NamedFramebufferDrawBuffers">
       <param name="framebuffer" type="GLuint" />
       <param name="n" type="GLsizei" />
       <param name="bufs" type="const GLenum *" />
    </function>
 
-   <function name="NamedFramebufferReadBuffer" offset="assign">
+   <function name="NamedFramebufferReadBuffer">
       <param name="framebuffer" type="GLuint" />
       <param name="buf" type="GLenum" />
    </function>
 
-   <function name="InvalidateNamedFramebufferData" offset="assign">
+   <function name="InvalidateNamedFramebufferData">
       <param name="framebuffer" type="GLuint" />
       <param name="numAttachments" type="GLsizei" />
       <param name="attachments" type="const GLenum *" />
    </function>
 
-   <function name="InvalidateNamedFramebufferSubData" offset="assign">
+   <function name="InvalidateNamedFramebufferSubData">
       <param name="framebuffer" type="GLuint" />
       <param name="numAttachments" type="GLsizei" />
       <param name="attachments" type="const GLenum *" />
@@ -219,35 +219,35 @@
       <param name="height" type="GLsizei" />
    </function>
 
-   <function name="ClearNamedFramebufferiv" offset="assign">
+   <function name="ClearNamedFramebufferiv">
       <param name="framebuffer" type="GLuint" />
       <param name="buffer" type="GLenum" />
       <param name="drawbuffer" type="GLint" />
       <param name="value" type="const GLint *" />
    </function>
 
-   <function name="ClearNamedFramebufferuiv" offset="assign">
+   <function name="ClearNamedFramebufferuiv">
       <param name="framebuffer" type="GLuint" />
       <param name="buffer" type="GLenum" />
       <param name="drawbuffer" type="GLint" />
       <param name="value" type="const GLuint *" />
    </function>
 
-   <function name="ClearNamedFramebufferfv" offset="assign">
+   <function name="ClearNamedFramebufferfv">
       <param name="framebuffer" type="GLuint" />
       <param name="buffer" type="GLenum" />
       <param name="drawbuffer" type="GLint" />
       <param name="value" type="const GLfloat *" />
    </function>
 
-   <function name="ClearNamedFramebufferfi" offset="assign">
+   <function name="ClearNamedFramebufferfi">
       <param name="framebuffer" type="GLuint" />
       <param name="buffer" type="GLenum" />
       <param name="depth" type="GLfloat" />
       <param name="stencil" type="GLint" />
    </function>
 
-   <function name="BlitNamedFramebuffer" offset="assign">
+   <function name="BlitNamedFramebuffer">
       <param name="readFramebuffer" type="GLuint" />
       <param name="drawFramebuffer" type="GLuint" />
       <param name="srcX0" type="GLint" />
@@ -262,19 +262,19 @@
       <param name="filter" type="GLenum" />
    </function>
 
-   <function name="CheckNamedFramebufferStatus" offset="assign">
+   <function name="CheckNamedFramebufferStatus">
       <return type="GLenum" />
       <param name="framebuffer" type="GLuint" />
       <param name="target" type="GLenum" />
    </function>
 
-   <function name="GetNamedFramebufferParameteriv" offset="assign">
+   <function name="GetNamedFramebufferParameteriv">
       <param name="framebuffer" type="GLuint" />
       <param name="pname" type="GLenum" />
       <param name="param" type="GLint *" />
    </function>
 
-   <function name="GetNamedFramebufferAttachmentParameteriv" offset="assign">
+   <function name="GetNamedFramebufferAttachmentParameteriv">
       <param name="framebuffer" type="GLuint" />
       <param name="attachment" type="GLenum" />
       <param name="pname" type="GLenum" />
diff --git a/src/mapi/glapi/gen/ARB_get_texture_sub_image.xml b/src/mapi/glapi/gen/ARB_get_texture_sub_image.xml
index 14e1c20..47e26ab 100644
--- a/src/mapi/glapi/gen/ARB_get_texture_sub_image.xml
+++ b/src/mapi/glapi/gen/ARB_get_texture_sub_image.xml
@@ -7,7 +7,7 @@
 
 <category name="GL_ARB_get_texture_sub_image" number="165">
 
-    <function name="GetTextureSubImage" offset="assign">
+    <function name="GetTextureSubImage">
         <param name="texture" type="GLuint"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -22,7 +22,7 @@
         <param name="pixels" type="GLvoid *"/>
     </function>
 
-    <function name="GetCompressedTextureSubImage" offset="assign">
+    <function name="GetCompressedTextureSubImage">
         <param name="texture" type="GLuint"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
diff --git a/src/mapi/glapi/gen/ARB_shader_subroutine.xml b/src/mapi/glapi/gen/ARB_shader_subroutine.xml
index 04b75cb..8a7d08c 100644
--- a/src/mapi/glapi/gen/ARB_shader_subroutine.xml
+++ b/src/mapi/glapi/gen/ARB_shader_subroutine.xml
@@ -7,21 +7,21 @@
 
 <category name="GL_ARB_shader_subroutine" number="90">
 
-    <function name="GetSubroutineUniformLocation" offset="assign">
+    <function name="GetSubroutineUniformLocation">
         <param name="program" type="GLuint"/>
         <param name="shadertype" type="GLenum"/>
         <param name="name" type="const GLchar *"/>
         <return type="GLint"/>
     </function>
 
-    <function name="GetSubroutineIndex" offset="assign">
+    <function name="GetSubroutineIndex">
         <param name="program" type="GLuint"/>
         <param name="shadertype" type="GLenum"/>
         <param name="name" type="const GLchar *"/>
         <return type="GLuint"/>
     </function>
 
-    <function name="GetActiveSubroutineUniformiv" offset="assign">
+    <function name="GetActiveSubroutineUniformiv">
         <param name="program" type="GLuint"/>
         <param name="shadertype" type="GLenum"/>
         <param name="index" type="GLuint"/>
@@ -29,7 +29,7 @@
         <param name="values" type="GLint *" output="true"/>
     </function>
 
-    <function name="GetActiveSubroutineUniformName" offset="assign">
+    <function name="GetActiveSubroutineUniformName">
         <param name="program" type="GLuint"/>
         <param name="shadertype" type="GLenum"/>
         <param name="index" type="GLuint"/>
@@ -38,7 +38,7 @@
         <param name="name" type="GLchar *" output="true"/>
     </function>
 
-    <function name="GetActiveSubroutineName" offset="assign">
+    <function name="GetActiveSubroutineName">
         <param name="program" type="GLuint"/>
         <param name="shadertype" type="GLenum"/>
         <param name="index" type="GLuint"/>
@@ -47,19 +47,19 @@
         <param name="name" type="GLchar *" output="true"/>
     </function>
 
-    <function name="UniformSubroutinesuiv" offset="assign">
+    <function name="UniformSubroutinesuiv">
         <param name="shadertype" type="GLenum"/>
         <param name="count" type="GLsizei"/>
         <param name="indices" type="const GLuint *"/>
     </function>
 
-    <function name="GetUniformSubroutineuiv" offset="assign">
+    <function name="GetUniformSubroutineuiv">
         <param name="shadertype" type="GLenum"/>
         <param name="location" type="GLint"/>
         <param name="params" type="GLuint *" output="true"/>
     </function>
 
-    <function name="GetProgramStageiv" offset="assign">
+    <function name="GetProgramStageiv">
         <param name="program" type="GLuint"/>
         <param name="shadertype" type="GLenum"/>
         <param name="pname" type="GLenum"/>
diff --git a/src/mapi/glapi/gen/ARB_tessellation_shader.xml b/src/mapi/glapi/gen/ARB_tessellation_shader.xml
index 16a2139..77f2228 100644
--- a/src/mapi/glapi/gen/ARB_tessellation_shader.xml
+++ b/src/mapi/glapi/gen/ARB_tessellation_shader.xml
@@ -49,11 +49,11 @@
     <enum value="0x8E89" name="MAX_TESS_CONTROL_UNIFORM_BLOCKS"/>
     <enum value="0x8E8A" name="MAX_TESS_EVALUATION_UNIFORM_BLOCKS"/>
 
-    <function name="PatchParameteri" offset="assign">
+    <function name="PatchParameteri">
         <param name="pname" type="GLenum"/>
         <param name="value" type="GLint"/>
     </function>
-    <function name="PatchParameterfv" offset="assign">
+    <function name="PatchParameterfv">
         <param name="pname" type="GLenum"/>
         <param name="values" type="const GLfloat *"/>
     </function>
-- 
2.6.2

More information about the mesa-dev mailing list