diff options
Diffstat (limited to 'intern/ghost/intern/GHOST_ContextWGL.cpp')
-rw-r--r-- | intern/ghost/intern/GHOST_ContextWGL.cpp | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/intern/ghost/intern/GHOST_ContextWGL.cpp b/intern/ghost/intern/GHOST_ContextWGL.cpp index 39ef63fa723..f861631a94e 100644 --- a/intern/ghost/intern/GHOST_ContextWGL.cpp +++ b/intern/ghost/intern/GHOST_ContextWGL.cpp @@ -40,10 +40,6 @@ #include <vector> -#ifdef WITH_GLEW_MX -WGLEWContext *wglewContext = NULL; -#endif - HGLRC GHOST_ContextWGL::s_sharedHGLRC = NULL; int GHOST_ContextWGL::s_sharedCount = 0; @@ -82,10 +78,6 @@ GHOST_ContextWGL::GHOST_ContextWGL( m_alphaBackground(alphaBackground), m_contextResetNotificationStrategy(contextResetNotificationStrategy), m_hGLRC(NULL) -#ifdef WITH_GLEW_MX - , - m_wglewContext(NULL) -#endif #ifndef NDEBUG , m_dummyVendor(NULL), @@ -116,10 +108,6 @@ GHOST_ContextWGL::~GHOST_ContextWGL() } } -#ifdef WITH_GLEW_MX - delete m_wglewContext; -#endif - #ifndef NDEBUG free((void*)m_dummyRenderer); free((void*)m_dummyVendor); @@ -158,7 +146,6 @@ GHOST_TSuccess GHOST_ContextWGL::getSwapInterval(int &intervalOut) GHOST_TSuccess GHOST_ContextWGL::activateDrawingContext() { if (WIN32_CHK(::wglMakeCurrent(m_hDC, m_hGLRC))) { - activateGLEW(); return GHOST_kSuccess; } else { @@ -338,15 +325,6 @@ void GHOST_ContextWGL::initContextWGLEW(PIXELFORMATDESCRIPTOR &preferredPFD) int iPixelFormat; - -#ifdef WITH_GLEW_MX - wglewContext = new WGLEWContext; - memset(wglewContext, 0, sizeof(WGLEWContext)); - - delete m_wglewContext; - m_wglewContext = wglewContext; -#endif - SetLastError(NO_ERROR); prevHDC = ::wglGetCurrentDC(); @@ -385,13 +363,8 @@ void GHOST_ContextWGL::initContextWGLEW(PIXELFORMATDESCRIPTOR &preferredPFD) if (!WIN32_CHK(::wglMakeCurrent(dummyHDC, dummyHGLRC))) goto finalize; -#ifdef WITH_GLEW_MX - if (GLEW_CHK(wglewInit()) != GLEW_OK) - fprintf(stderr, "Warning! WGLEW failed to initialize properly.\n"); -#else if (GLEW_CHK(glewInit()) != GLEW_OK) fprintf(stderr, "Warning! Dummy GLEW/WGLEW failed to initialize properly.\n"); -#endif // the following are not technially WGLEW, but they also require a context to work @@ -828,8 +801,6 @@ GHOST_TSuccess GHOST_ContextWGL::initializeDrawingContext() return GHOST_kFailure; } - activateWGLEW(); - if (WGLEW_ARB_create_context) { int profileBitCore = m_contextProfileMask & WGL_CONTEXT_CORE_PROFILE_BIT_ARB; int profileBitCompat = m_contextProfileMask & WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB; |