From ef640ecf1004f7af9cfde09f5ce1cde2fb70747f Mon Sep 17 00:00:00 2001 From: Mike Erwin Date: Sat, 22 Apr 2017 00:35:04 -0400 Subject: OpenGL: remove use of GLEW MX MX (Multiple conteXt) support was dropped from the GLEW 2.0 library to make core profile support cleaner. Our WITH_GLEW_MX build option was OFF by default already; this commit removes the inactive code paths. I'm working on a plan for multiple GPUs, contexts, resource sharing, etc. This commit gives us a cleaner starting point for that upcoming work. Tested on Mac, will test on Linux & Windows immediately after pushing. --- intern/glew-mx/glew-mx.h | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'intern/glew-mx/glew-mx.h') diff --git a/intern/glew-mx/glew-mx.h b/intern/glew-mx/glew-mx.h index 813e95958b5..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 @@ -62,23 +56,6 @@ 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" @@ -89,12 +66,6 @@ extern MXContext *_mx_context; # 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 -- cgit v1.2.3