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

Fix linux compilation (no nullptr).

Browse Source
This commit is contained in:
hiker 2014-08-20 21:07:12 +10:00
parent 6a48010644
commit 6073788813
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphics/irr_driver.cpp
View File

@ -472,11 +472,11 @@ void IrrDriver::initDevice()
m_need_rh_workaround = false; m_need_rh_workaround = false;
#ifdef WIN32 #ifdef WIN32
// Fix for Intel Sandy Bridge on Windows which supports GL up to 3.1 only // Fix for Intel Sandy Bridge on Windows which supports GL up to 3.1 only
if (strstr((const char *)glGetString(GL_VENDOR), "Intel") != nullptr && (GLMajorVersion == 3 && GLMinorVersion == 1)) if (strstr((const char *)glGetString(GL_VENDOR), "Intel") != NULL && (GLMajorVersion == 3 && GLMinorVersion == 1))
m_need_ubo_workaround = true; m_need_ubo_workaround = true;
#endif #endif
// Fix for Nvidia and instanced RH // Fix for Nvidia and instanced RH
if (strstr((const char *)glGetString(GL_VENDOR), "NVIDIA") != nullptr) if (strstr((const char *)glGetString(GL_VENDOR), "NVIDIA") != NULL)
m_need_rh_workaround = true; m_need_rh_workaround = true;
} }
m_glsl = (GLMajorVersion > 3 || (GLMajorVersion == 3 && GLMinorVersion >= 1)); m_glsl = (GLMajorVersion > 3 || (GLMajorVersion == 3 && GLMinorVersion >= 1));