summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowwin32.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-11-03 15:00:40 -0500
committerDave Parks <davep@lindenlab.com>2011-11-03 15:00:40 -0500
commitfa5a0a90f451c0be63bda4a6a61350c2edc639d8 (patch)
tree56462a946b9dad76e8e495f7b6946996a9b7dec9 /indra/llwindow/llwindowwin32.cpp
parentdb8267f95109cccb94cde8b9673df995dddc7a3e (diff)
SH-2240 Fix for core profile assertions when Debug GL enabled.
Diffstat (limited to 'indra/llwindow/llwindowwin32.cpp')
-rw-r--r--indra/llwindow/llwindowwin32.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index e46fcea692..f7cbc383eb 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -1416,6 +1416,11 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
{
llinfos << "Created OpenGL " << llformat("%d.%d", attribs[1], attribs[3]) << " context." << llendl;
done = true;
+
+ if (LLRender::sGLCoreProfile)
+ {
+ LLGLSLShader::sNoFixedFunction = true;
+ }
}
}
}