diff --git a/Windows/OpenGLBase.cpp b/Windows/OpenGLBase.cpp index 0a7207369e..1a31d85d07 100644 --- a/Windows/OpenGLBase.cpp +++ b/Windows/OpenGLBase.cpp @@ -177,17 +177,41 @@ bool GL_Init(HWND window, std::string *error_message) { return false; } - // Alright, now for the modernity. - static const int attribs[] = { + CheckGLExtensions(); + + int contextFlags = enableGLDebug ? WGL_CONTEXT_DEBUG_BIT_ARB : 0; + + // Alright, now for the modernity. First try a 4.4, then 4.3, context, if that fails try 3.3. + // I can't seem to find a way that lets you simply request the newest version available. + const int attribs44[] = { + WGL_CONTEXT_MAJOR_VERSION_ARB, 4, + WGL_CONTEXT_MINOR_VERSION_ARB, 4, + WGL_CONTEXT_FLAGS_ARB, contextFlags, + WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB, + 0 + }; + const int attribs43[] = { + WGL_CONTEXT_MAJOR_VERSION_ARB, 4, + WGL_CONTEXT_MINOR_VERSION_ARB, 3, + WGL_CONTEXT_FLAGS_ARB, contextFlags, + WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB, + 0 + }; + const int attribs33[] = { WGL_CONTEXT_MAJOR_VERSION_ARB, 3, - WGL_CONTEXT_MINOR_VERSION_ARB, 1, - WGL_CONTEXT_FLAGS_ARB, enableGLDebug ? WGL_CONTEXT_DEBUG_BIT_ARB : 0, + WGL_CONTEXT_MINOR_VERSION_ARB, 3, + WGL_CONTEXT_FLAGS_ARB, contextFlags, + WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB, 0 }; HGLRC m_hrc; if(wglewIsSupported("WGL_ARB_create_context") == 1) { - m_hrc = wglCreateContextAttribsARB(hDC, 0, attribs); + m_hrc = wglCreateContextAttribsARB(hDC, 0, attribs44); + if (!m_hrc) + m_hrc = wglCreateContextAttribsARB(hDC, 0, attribs43); + if (!m_hrc) + m_hrc = wglCreateContextAttribsARB(hDC, 0, attribs33); if (!m_hrc) { // Fall back m_hrc = hRC; @@ -222,8 +246,6 @@ bool GL_Init(HWND window, std::string *error_message) { MessageBox(0,ConvertUTF8ToWString((const char *)glGetString(GL_SHADING_LANGUAGE_VERSION)).c_str(),0,0); */ - CheckGLExtensions(); - glstate.Initialize(); if (wglSwapIntervalEXT) wglSwapIntervalEXT(0);