summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolbump.cpp
diff options
context:
space:
mode:
authorGraham Madarasz (Graham) <graham@lindenlab.com>2013-03-04 08:57:58 -0800
committerGraham Madarasz (Graham) <graham@lindenlab.com>2013-03-04 08:57:58 -0800
commit4e81a84abd2c928dbdc6c4e2a3a348494d205edf (patch)
tree7066e1bbe40d44db58660ea65ef126d32b513c62 /indra/newview/lldrawpoolbump.cpp
parent3849ee79c3810226d1129bcbeb6bd69144aba243 (diff)
parentda2caa46406d07b4b093bc17966ee23d87819f7c (diff)
Performance improvements. Faster threadsaferefcount, faster instancetracker, use hashtable and pre-hashed strings for GLSL uniform lookup, and use dup_handles curl interface to avoid re-initing ares resolvers expensively.
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
-rw-r--r--indra/newview/lldrawpoolbump.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp
index 4137084ebe..7e95046479 100644
--- a/indra/newview/lldrawpoolbump.cpp
+++ b/indra/newview/lldrawpoolbump.cpp
@@ -461,6 +461,8 @@ void LLDrawPoolBump::unbindCubeMap(LLGLSLShader* shader, S32 shader_level, S32&
}
}
}
+ // Moved below shader->disableTexture call to avoid false alarms from auto-re-enable of textures on stage 0
+ // MAINT-755
cube_map->disable();
cube_map->restoreMatrix();
}