Skip to content
Snippets Groups Projects
Commit e18ba7d8 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Bonk

parent 86175158
Branches screensquare
No related tags found
No related merge requests found
...@@ -1009,7 +1009,7 @@ GLuint LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shader_lev ...@@ -1009,7 +1009,7 @@ GLuint LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shader_lev
S32 major_version = gGLManager.mGLSLVersionMajor; S32 major_version = gGLManager.mGLSLVersionMajor;
S32 minor_version = gGLManager.mGLSLVersionMinor; S32 minor_version = gGLManager.mGLSLVersionMinor;
#if 1 #if LL_GL_DESKTOP
if (major_version == 1 && minor_version < 30) if (major_version == 1 && minor_version < 30)
{ {
llassert(false); // GL 3.1 or later required llassert(false); // GL 3.1 or later required
......
...@@ -1951,7 +1951,7 @@ void LLWindowWin32::recreateWindow(RECT window_rect, DWORD dw_ex_style, DWORD dw ...@@ -1951,7 +1951,7 @@ void LLWindowWin32::recreateWindow(RECT window_rect, DWORD dw_ex_style, DWORD dw
void* LLWindowWin32::createSharedContext() void* LLWindowWin32::createSharedContext()
{ {
#if 1 #if LL_GL_DESKTOP
mMaxGLVersion = llclamp(mMaxGLVersion, 3.f, 4.6f); mMaxGLVersion = llclamp(mMaxGLVersion, 3.f, 4.6f);
#else #else
mMaxGLVersion = llclamp(mMaxGLVersion, 3.f, 3.2f); mMaxGLVersion = llclamp(mMaxGLVersion, 3.f, 3.2f);
...@@ -1963,7 +1963,7 @@ void* LLWindowWin32::createSharedContext() ...@@ -1963,7 +1963,7 @@ void* LLWindowWin32::createSharedContext()
{ {
WGL_CONTEXT_MAJOR_VERSION_ARB, version_major, WGL_CONTEXT_MAJOR_VERSION_ARB, version_major,
WGL_CONTEXT_MINOR_VERSION_ARB, version_minor, WGL_CONTEXT_MINOR_VERSION_ARB, version_minor,
#if 1 #if LL_GL_DESKTOP
WGL_CONTEXT_PROFILE_MASK_ARB, LLRender::sGLCoreProfile ? WGL_CONTEXT_CORE_PROFILE_BIT_ARB : WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB, WGL_CONTEXT_PROFILE_MASK_ARB, LLRender::sGLCoreProfile ? WGL_CONTEXT_CORE_PROFILE_BIT_ARB : WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB,
#else #else
WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_ES_PROFILE_BIT_EXT, WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_ES_PROFILE_BIT_EXT,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment