Module: Mesa
Branch: master
Commit: bee49cb0ecbacb9fbc9dddc5e560874adacc518e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=bee49cb0ecbacb9fbc9dddc5e560874adacc518e
Author: Tom Stellard <thomas.stell...@amd.com>
Date: Thu Jun 27 08:27:30 2013 -0700
mesa: Fix build with older gcc since update of glext.h
Reviewed-by: Brian Paul <bri...@vmware.com>
---
include/GL/glext.h | 2 --
src/mapi/mapi_abi.py | 4 ----
src/mesa/main/glheader.h | 4 ----
3 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/include/GL/glext.h b/include/GL/glext.h
index adefd56..c14219e 100644
--- a/include/GL/glext.h
+++ b/include/GL/glext.h
@@ -4606,7 +4606,6 @@ GLAPI GLbitfield APIENTRY glQueryMatrixxOES (GLfixed
*mantissa, GLint *exponent)
#ifndef GL_OES_single_precision
#define GL_OES_single_precision 1
-typedef float GLclampf;
typedef void (APIENTRYP PFNGLCLEARDEPTHFOESPROC) (GLclampf depth);
typedef void (APIENTRYP PFNGLCLIPPLANEFOESPROC) (GLenum plane, const GLfloat
*equation);
typedef void (APIENTRYP PFNGLDEPTHRANGEFOESPROC) (GLclampf n, GLclampf f);
@@ -5802,7 +5801,6 @@ GLAPI void APIENTRY glCullParameterfvEXT (GLenum pname,
GLfloat *params);
#ifndef GL_EXT_depth_bounds_test
#define GL_EXT_depth_bounds_test 1
-typedef double GLclampd;
#define GL_DEPTH_BOUNDS_TEST_EXT 0x8890
#define GL_DEPTH_BOUNDS_EXT 0x8891
typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd
zmax);
diff --git a/src/mapi/mapi_abi.py b/src/mapi/mapi_abi.py
index faa3431..f5ff8d8 100644
--- a/src/mapi/mapi_abi.py
+++ b/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_ */"""
diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index c83c68f..b3b0c52 100644
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -59,10 +59,6 @@ extern "C" {
#endif
-/**
- * GL_FIXED is defined in glext.h version 64 but these typedefs aren't (yet).
- */
-typedef int GLfixed;
typedef int GLclampx;
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
