Created
March 11, 2015 16:14
-
-
Save bbandix/df093eb4b350288fe3c7 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/chromium/third_party/mesa/src/include/GL/glext.h b/chromium/third_party/mesa/src/include/GL/glext.h | |
index 050455b..bb66eab 100644 | |
--- a/chromium/third_party/mesa/src/include/GL/glext.h | |
+++ b/chromium/third_party/mesa/src/include/GL/glext.h | |
@@ -6147,19 +6147,6 @@ extern "C" { | |
typedef char GLchar; | |
#endif | |
-#ifndef GL_VERSION_1_5 | |
-#ifndef GLEXT_PTR_TYPES_DEFINED | |
-#define GLEXT_PTR_TYPES_DEFINED 1 | |
-/* GL types for handling large vertex buffer objects */ | |
-#ifdef _WIN64 | |
-typedef signed long long int GLintptr; | |
-typedef signed long long int GLsizeiptr; | |
-#else | |
-typedef signed long int GLintptr; | |
-typedef signed long int GLsizeiptr; | |
-#endif | |
-#endif | |
-#endif | |
#ifndef GL_ARB_vertex_buffer_object | |
/* GL types for handling large vertex buffer objects */ | |
@@ -6536,6 +6523,14 @@ typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v); | |
#ifndef GL_VERSION_1_5 | |
#define GL_VERSION_1_5 1 | |
+/* GL types for handling large vertex buffer objects */ | |
+#ifdef _WIN64 | |
+typedef signed long long int GLintptr; | |
+typedef signed long long int GLsizeiptr; | |
+#else | |
+typedef signed long int GLintptr; | |
+typedef signed long int GLsizeiptr; | |
+#endif | |
#ifdef GL_GLEXT_PROTOTYPES | |
GLAPI void APIENTRY glGenQueries (GLsizei n, GLuint *ids); | |
GLAPI void APIENTRY glDeleteQueries (GLsizei n, const GLuint *ids); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment