summaryrefslogtreecommitdiff
path: root/indra/llrender/llglslshader.cpp
diff options
context:
space:
mode:
authorJonathan Goodman <geenz@geenzo.com>2012-08-29 04:56:54 -0400
committerJonathan Goodman <geenz@geenzo.com>2012-08-29 04:56:54 -0400
commite606677ed885c4e9189b0768b5e6f999fa2cf885 (patch)
treebca76b8c003506acc0d6f595f4beaa4bd5fcf6aa /indra/llrender/llglslshader.cpp
parentc911efb953a600092a6213c088d5b94fcf7779d3 (diff)
Added the ability to remove a preprocessor define.
Diffstat (limited to 'indra/llrender/llglslshader.cpp')
-rw-r--r--indra/llrender/llglslshader.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index 04878cabe2..39e81c4bfc 100644
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -379,6 +379,11 @@ void LLGLSLShader::addPermutation(std::string name, std::string value)
mDefines[name] = value;
}
+void LLGLSLShader::removePermutation(std::string name)
+{
+ mDefines[name].erase();
+}
+
GLint LLGLSLShader::mapUniformTextureChannel(GLint location, GLenum type)
{
if (type >= GL_SAMPLER_1D_ARB && type <= GL_SAMPLER_2D_RECT_SHADOW_ARB ||