ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop support for GL 3.1 on windows

Browse Source 
Fixed pipeline will be used instead
This commit is contained in:
vlj 2014-09-13 15:45:10 +02:00
parent 1d913ad5b4
commit 6d685a843d
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/irrlicht/source/Irrlicht/COpenGLDriver.cpp
View File

@ -155,23 +155,13 @@ static HGLRC getMeAGLContext(HDC HDc)
if (hrc)
return hrc;
int ctx31debug[] =
int legacyctx[] =
{
WGL_CONTEXT_MAJOR_VERSION_ARB, 3,
WGL_CONTEXT_MAJOR_VERSION_ARB, 2,
WGL_CONTEXT_MINOR_VERSION_ARB, 1,
WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_DEBUG_BIT_ARB,
WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB,
0
};
int ctx31[] =
{
WGL_CONTEXT_MAJOR_VERSION_ARB, 3,
WGL_CONTEXT_MINOR_VERSION_ARB, 1,
WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB,
0
};
hrc = wglCreateContextAttribs_ARB(HDc, 0, GLContextDebugBit ? ctx31debug : ctx31);
hrc = wglCreateContextAttribs_ARB(HDc, 0, legacyctx);
if (hrc)
return hrc;

2
src/graphics/irr_driver.cpp
View File

@ -493,7 +493,7 @@ void IrrDriver::initDevice()
if (strstr((const char *)glGetString(GL_VENDOR), "ATI") != NULL)
m_need_srgb_workaround = true;
}
m_glsl = (GLMajorVersion > 3 || (GLMajorVersion == 3 && GLMinorVersion >= 1));
m_glsl = (GLMajorVersion > 3 || (GLMajorVersion == 3 && GLMinorVersion >= 3));
initGL();
// Parse extensions