summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-03-11 16:06:36 -0600
committerDave Parks <davep@lindenlab.com>2010-03-11 16:06:36 -0600
commitf5c431aa7bce953503b33c957ba024bdd9104e63 (patch)
tree17d32a42dd406024b8a680cc790771f03f229266 /indra/llrender
parent9aefe34998bcd2320b09924d9a78e518627ddd79 (diff)
EXT-6276 Put in some gl flush calls to texture state functions.
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llrender.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index 0ce6bdf398..9acfb6b0a8 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -387,6 +387,8 @@ void LLTexUnit::setTextureAddressMode(eTextureAddressMode mode)
{
if (mIndex < 0 || mCurrTexture == 0) return;
+ gGL.flush();
+
activate();
glTexParameteri (sGLTextureType[mCurrTexType], GL_TEXTURE_WRAP_S, sGLAddressMode[mode]);
@@ -401,6 +403,8 @@ void LLTexUnit::setTextureFilteringOption(LLTexUnit::eTextureFilterOptions optio
{
if (mIndex < 0 || mCurrTexture == 0) return;
+ gGL.flush();
+
if (option == TFO_POINT)
{
glTexParameteri(sGLTextureType[mCurrTexType], GL_TEXTURE_MAG_FILTER, GL_NEAREST);