diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-01 11:58:08 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-01 11:58:08 +0200 |
| commit | 458ea020a211b25c00c1de9e30e4434213b55f47 (patch) | |
| tree | 86ce7ba4b2cc9a655d270a877202e129dcca6df3 /mesalib/src/mapi | |
| parent | 6d46609dfd488f9433d0ed10f49d05e31a6fe51e (diff) | |
| parent | 28d1f604563d9c738a4c5630364d0e6b4e9b13ff (diff) | |
| download | vcxsrv-458ea020a211b25c00c1de9e30e4434213b55f47.tar.gz vcxsrv-458ea020a211b25c00c1de9e30e4434213b55f47.tar.bz2 vcxsrv-458ea020a211b25c00c1de9e30e4434213b55f47.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa git update 1 Jul 2013
Diffstat (limited to 'mesalib/src/mapi')
| -rwxr-xr-x | mesalib/src/mapi/glapi/gen/gl_API.xml | 2 | ||||
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/mesadef.py | 1 | ||||
| -rwxr-xr-x | mesalib/src/mapi/mapi_abi.py | 4 |
3 files changed, 1 insertions, 6 deletions
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml index 0fb3a1aab..e52da2c2f 100755 --- a/mesalib/src/mapi/glapi/gen/gl_API.xml +++ b/mesalib/src/mapi/glapi/gen/gl_API.xml @@ -11032,7 +11032,7 @@ </category> <category name="GL_MESA_resize_buffers" number="196"> - <function name="ResizeBuffersMESA" offset="assign"> + <function name="ResizeBuffersMESA" offset="assign" exec="skip"> <glx ignore="true"/> </function> </category> diff --git a/mesalib/src/mapi/glapi/gen/mesadef.py b/mesalib/src/mapi/glapi/gen/mesadef.py index f6d33cb8c..77cc4a350 100644 --- a/mesalib/src/mapi/glapi/gen/mesadef.py +++ b/mesalib/src/mapi/glapi/gen/mesadef.py @@ -134,7 +134,6 @@ def PrintTail(): print '\t_mesa_new_buffer_object' print '\t_mesa_new_texture_object' print '\t_mesa_problem' - print '\t_mesa_ResizeBuffersMESA' print '\t_mesa_store_compressed_teximage1d' print '\t_mesa_store_compressed_teximage2d' print '\t_mesa_store_compressed_teximage3d' diff --git a/mesalib/src/mapi/mapi_abi.py b/mesalib/src/mapi/mapi_abi.py index faa34311c..f5ff8d843 100755 --- a/mesalib/src/mapi/mapi_abi.py +++ b/mesalib/src/mapi/mapi_abi.py @@ -728,7 +728,6 @@ class GLAPIPrinter(ABIPrinter): #define GLAPI_PREFIX_STR(func) "gl"#func #endif /* USE_MGL_NAMESPACE */ -typedef int GLfixed; typedef int GLclampx; #endif /* _GLAPI_TMP_H_ */""" @@ -752,7 +751,6 @@ class ES1APIPrinter(GLAPIPrinter): def _get_c_header(self): header = """#ifndef _GLAPI_TMP_H_ #define _GLAPI_TMP_H_ -typedef int GLfixed; typedef int GLclampx; #endif /* _GLAPI_TMP_H_ */""" @@ -776,7 +774,6 @@ class ES2APIPrinter(GLAPIPrinter): def _get_c_header(self): header = """#ifndef _GLAPI_TMP_H_ #define _GLAPI_TMP_H_ -typedef int GLfixed; typedef int GLclampx; #endif /* _GLAPI_TMP_H_ */""" @@ -804,7 +801,6 @@ class SharedGLAPIPrinter(GLAPIPrinter): def _get_c_header(self): header = """#ifndef _GLAPI_TMP_H_ #define _GLAPI_TMP_H_ -typedef int GLfixed; typedef int GLclampx; #endif /* _GLAPI_TMP_H_ */""" |