Minor correction to EXT_framebuffer_object XML. Fix gl_table.py so that it

generates the correct script name in the generated output.

diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml
index 5ce8166..19f204c 100644 (file)
--- a/src/mesa/glapi/gl_API.xml
+++ b/src/mesa/glapi/gl_API.xml
@@ -11508,7 +11508,7 @@
       <param name="textarget" type="GLenum"/>
       <param name="texture" type="GLuint"/>
       <param name="level" type="GLint"/>
-      <param name="zoffsetl" type="GLint"/>
+      <param name="zoffset" type="GLint"/>
     </function>
 
     <function name="FramebufferRenderbufferEXT" offset="810">

diff --git a/src/mesa/glapi/gl_table.py b/src/mesa/glapi/gl_table.py
index 3b8f1ca..7585efa 100644 (file)
--- a/src/mesa/glapi/gl_table.py
+++ b/src/mesa/glapi/gl_table.py
@@ -30,11 +30,11 @@ import license
 import sys, getopt
 
 class PrintGlTable(gl_XML.FilterGLAPISpecBase):
-       file_name = "gl_gen_table.xml (from Mesa)"
-
        def __init__(self):
                gl_XML.FilterGLAPISpecBase.__init__(self)
+
                self.header_tag = '_GLAPI_TABLE_H_'
+               self.name = "gl_table.py (from Mesa)"
                self.license = license.bsd_license_template % ( \
 """Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
 (C) Copyright IBM Corporation 2004""", "BRIAN PAUL, IBM")

diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h
index 8401d41..452527a 100644 (file)
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -1,4 +1,4 @@
-/* DO NOT EDIT - This file generated automatically by a script */
+/* DO NOT EDIT - This file generated automatically by gl_table.py (from Mesa) script */
 
 /*
  * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
@@ -844,7 +844,7 @@ struct _glapi_table
    GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 806 */
    void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 807 */
    void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 808 */
-   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffsetl); /* 809 */
+   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 809 */
    void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 810 */
    void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 811 */
    void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 812 */

diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index 340fc66..fd68cb8 100644 (file)
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -4115,9 +4115,9 @@ KEYWORD1 void KEYWORD2 NAME(FramebufferTexture2DEXT)(GLenum target, GLenum attac
    DISPATCH(FramebufferTexture2DEXT, (target, attachment, textarget, texture, level), (F, "glFramebufferTexture2DEXT(0x%x, 0x%x, 0x%x, %d, %d);\n", target, attachment, textarget, texture, level));
 }
 
-KEYWORD1 void KEYWORD2 NAME(FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffsetl)
+KEYWORD1 void KEYWORD2 NAME(FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
-   DISPATCH(FramebufferTexture3DEXT, (target, attachment, textarget, texture, level, zoffsetl), (F, "glFramebufferTexture3DEXT(0x%x, 0x%x, 0x%x, %d, %d, %d);\n", target, attachment, textarget, texture, level, zoffsetl));
+   DISPATCH(FramebufferTexture3DEXT, (target, attachment, textarget, texture, level, zoffset), (F, "glFramebufferTexture3DEXT(0x%x, 0x%x, 0x%x, %d, %d, %d);\n", target, attachment, textarget, texture, level, zoffset));
 }
 
 KEYWORD1 void KEYWORD2 NAME(FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)