From 29cf62d20133b32e1514a315b4f7e013ed9cb768 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <stefano.pigozzi@gmail.com>
Date: Thu, 22 Jan 2015 08:27:03 +0100
Subject: cocoa: remove support for systems without gl3.h header

---
 video/out/gl_common.h       |  6 ++----
 video/out/gl_header_fixes.h | 34 +---------------------------------
 2 files changed, 3 insertions(+), 37 deletions(-)

(limited to 'video/out')

diff --git a/video/out/gl_common.h b/video/out/gl_common.h
index 81437b0852..7c9fbc0045 100644
--- a/video/out/gl_common.h
+++ b/video/out/gl_common.h
@@ -38,11 +38,9 @@
 #include "video/mp_image.h"
 
 #if HAVE_GL_COCOA
-#ifdef GL_VERSION_3_0
-#include <OpenGL/gl3.h>
-#else
+#define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED 1
 #include <OpenGL/gl.h>
-#endif
+#include <OpenGL/gl3.h>
 #include <OpenGL/glext.h>
 #else
 #include <GL/gl.h>
diff --git a/video/out/gl_header_fixes.h b/video/out/gl_header_fixes.h
index d7c48b3f0b..0e29531f2f 100644
--- a/video/out/gl_header_fixes.h
+++ b/video/out/gl_header_fixes.h
@@ -57,42 +57,10 @@
 #define WGL_CONTEXT_CORE_PROFILE_BIT_ARB   0x00000001
 #endif
 
-// Define just enough constants to make the OpenGL 3 code compile against
-// older SDKs. Values are taken straight from OpenGL/gl3.h
-#if defined __APPLE__ && !(defined GL_VERSION_3_0)
-#define GL_RGBA16F                        0x881A
-#define GL_RGB16F                         0x881B
-#define GL_MAJOR_VERSION                  0x821B
-#define GL_MINOR_VERSION                  0x821C
-#define GL_NUM_EXTENSIONS                 0x821D
-
-#ifndef GL_ARB_framebuffer_sRGB
-#define GL_FRAMEBUFFER_SRGB               0x8DB9
-#endif
-#endif
-
-#ifndef GL_RGB_422_APPLE
-#define GL_RGB_422_APPLE 0x8A1F
-#endif
-
-#ifndef UNSIGNED_SHORT_8_8_APPLE
-#define UNSIGNED_SHORT_8_8_APPLE 0x85BA
-#endif
-
-#ifndef UNSIGNED_SHORT_8_8_APPLE
-#define UNSIGNED_SHORT_8_8_APPLE 0x85BB
-#endif
-
 #ifndef GL_NV_vdpau_interop
 #define GLvdpauSurfaceNV GLintptr
 #endif
 
-// OSX
-#ifndef GL_RED_INTEGER
-#define GL_RED_INTEGER                    0x8D94
-#define GL_RGB_INTEGER                    0x8D98
-#define GL_RGBA_INTEGER                   0x8D99
-#endif
 #ifndef GL_DEBUG_SEVERITY_HIGH
 #define GL_DEBUG_SEVERITY_HIGH            0x9146
 #define GL_DEBUG_SEVERITY_MEDIUM          0x9147
@@ -102,7 +70,7 @@
 
 #undef MP_GET_GL_WORKAROUNDS
 
-#endif
+#endif // MP_GET_GL_WORKAROUNDS
 
 #ifdef MP_GET_GLX_WORKAROUNDS
 
-- 
cgit v1.2.3