Attachment 81574 Details for Bug 66236 – Build fix

[patch] Build fix

0001-mesa-Fix-build-with-older-gcc-since-update-of-glext..patch (text/plain), 2.65 KB, created by Tom Stellard on 2013-06-27 18:06:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Stellard

Created: 2013-06-27 18:06:37 UTC

Size: 2.65 KB

patch

obsolete

>From 984c077cb930bde4101b5c125ca23aaed88a7d66 Mon Sep 17 00:00:00 2001
>From: Tom Stellard <thomas.stellard@amd.com>
>Date: Thu, 27 Jun 2013 08:27:30 -0700
>Subject: [PATCH] mesa: Fix build with older gcc, since update of glext.h
>
>---
> include/GL/glext.h       |    2 --
> src/mapi/mapi_abi.py     |    4 ----
> src/mesa/main/glheader.h |    1 -
> 3 files changed, 0 insertions(+), 7 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..fed32ea 100644
>--- a/src/mesa/main/glheader.h
>+++ b/src/mesa/main/glheader.h
>@@ -62,7 +62,6 @@ extern "C" {
> /**
>  * GL_FIXED is defined in glext.h version 64 but these typedefs aren't (yet).
>  */
>-typedef int GLfixed;
> typedef int GLclampx;
> 
> 
>-- 
>1.7.3.4
>

Actions: View | Splinter Review

Attachments on bug 66236: 81568 | 81569 | 81574

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.