3 files changed, 3 insertions, 92 deletions
diff --git a/intern/glew-mx/glew-mx.h b/intern/glew-mx/glew-mx.h
index ed17ea4a0e6..86f48a1068d 100644
--- a/intern/glew-mx/glew-mx.h
+++ b/intern/glew-mx/glew-mx.h
@@ -49,12 +49,6 @@
 #ifndef __GLEW_MX_H__
 #define __GLEW_MX_H__
 
-#ifdef WITH_GLEW_MX
-/* glew itself expects this */
-#  define GLEW_MX 1
-#  define glewGetContext() (&(_mx_context->glew_context))
-#endif
-
 #include <GL/glew.h>
 
 
@@ -62,39 +56,16 @@
 extern "C" {
 #endif
 
-/* MXContext is used instead of GLEWContext directly so that
-   extending what data is held by a context is easier.
- */
-typedef struct MXContext {
-#ifdef WITH_GLEW_MX
-	GLEWContext glew_context;
-#endif
-
-	int reserved; /* structs need at least one member */
-
-} MXContext;
-
-#ifdef WITH_GLEW_MX
-extern MXContext *_mx_context;
-#endif
-
-
 #include "intern/symbol-binding.h"
 
 
 /* If compiling only for OpenGL 3.2 Core Profile then we should make sure
  * no legacy API entries or symbolic constants are used.
  */
-#if defined(WITH_GL_PROFILE_CORE) && !defined(WITH_GL_PROFILE_COMPAT) && !defined(WITH_GL_PROFILE_ES20)
+#if (!defined(WITH_LEGACY_OPENGL)) || defined(WITH_GL_PROFILE_CORE) && !defined(WITH_GL_PROFILE_COMPAT) && !defined(WITH_GL_PROFILE_ES20)
 #  include "intern/gl-deprecated.h"
 #endif
 
-
-MXContext *mxCreateContext     (void);
-MXContext *mxGetCurrentContext (void);
-void       mxMakeCurrentContext(MXContext *ctx);
-void       mxDestroyContext    (MXContext *ctx);
-
 GLenum glew_chk(GLenum error, const char *file, int line, const char *text);
 
 #ifndef NDEBUG
diff --git a/intern/glew-mx/intern/gl-deprecated.h b/intern/glew-mx/intern/gl-deprecated.h
index 1a23642fbfc..669fb83a644 100644
--- a/intern/glew-mx/intern/gl-deprecated.h
+++ b/intern/glew-mx/intern/gl-deprecated.h
@@ -841,6 +841,7 @@
 #undef GL_SOURCE2_RGB
 #define GL_SOURCE2_RGB DO_NOT_USE_GL_SOURCE2_RGB
 
+#if 0 /* Those are deprecated but still valid */
 // Old Token Names 3.0
 #undef GL_CLIP_PLANE0
 #define GL_CLIP_PLANE0 USE_GL_CLIP_DISTANCE0
@@ -864,9 +865,6 @@
 // Old Token Names 3.2
 #undef GL_VERTEX_PROGRAM_POINT_SIZE
 #define GL_VERTEX_PROGRAM_POINT_SIZE USE_GL_PROGRAM_POINT_SIZE
-
-// Old Token Names 4.1
-#undef GL_CURRENT_PROGRAM
-#define GL_CURRENT_PROGRAM DO_NOT_USE_GL_CURRENT_PROGRAM
+#endif
 
 #endif /* __GL_DEPRECATED_H__ */
diff --git a/intern/glew-mx/intern/glew-mx.c b/intern/glew-mx/intern/glew-mx.c
index 6fbb1a7a2e2..9db2d233085 100644
--- a/intern/glew-mx/intern/glew-mx.c
+++ b/intern/glew-mx/intern/glew-mx.c
@@ -84,61 +84,3 @@ GLenum glew_chk(GLenum error, const char *file, int line, const char *text)
 
 	return error;
 }
-
-
-#ifdef WITH_GLEW_MX
-MXContext *_mx_context = NULL;
-#endif
-
-
-MXContext *mxCreateContext(void)
-{
-#ifdef WITH_GLEW_MX
-	MXContext* new_ctx = calloc(1, sizeof(MXContext));
-
-	if (new_ctx != NULL) {
-		MXContext* cur_ctx = _mx_context;
-		_mx_context = new_ctx;
-		GLEW_CHK(glewInit());
-		_mx_context = cur_ctx;
-	}
-
-	return new_ctx;
-#else
-	GLEW_CHK(glewInit());
-	return NULL;
-#endif
-}
-
-
-MXContext *mxGetCurrentContext(void)
-{
-#ifdef WITH_GLEW_MX
-	return _mx_context;
-#else
-	return NULL;
-#endif
-}
-
-
-void mxMakeCurrentContext(MXContext *ctx)
-{
-#ifdef WITH_GLEW_MX
-	_mx_context = ctx;
-#else
-	(void)ctx;
-#endif
-}
-
-
-void mxDestroyContext(MXContext *ctx)
-{
-#ifdef WITH_GLEW_MX
-	if (_mx_context == ctx)
-		_mx_context = NULL;
-
-	free(ctx);
-#else
-	(void)ctx;
-#endif
-}