diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-16 12:40:53 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-16 12:40:53 -0500 |
| commit | da84f5552731e1ece3a463c4c385bb327f1048a1 (patch) | |
| tree | dc10fc228a15b69f8b62631a68dbc67efe1f3395 /indra/newview/lldrawpoolterrain.cpp | |
| parent | 4fea7dcb3ef35cae9e31ba467403d31ce9083905 (diff) | |
SH-2243 work in progress -- don't use deprecated shader state
Diffstat (limited to 'indra/newview/lldrawpoolterrain.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolterrain.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp index 3ba4a89686..cac8439eb8 100644 --- a/indra/newview/lldrawpoolterrain.cpp +++ b/indra/newview/lldrawpoolterrain.cpp @@ -316,13 +316,12 @@ void LLDrawPoolTerrain::renderFullShader() gGL.getTexUnit(detail0)->bind(detail_texture0p); gGL.getTexUnit(0)->activate(); - glEnable(GL_TEXTURE_GEN_S); - glEnable(GL_TEXTURE_GEN_T); - glTexGeni(GL_S, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR); - glTexGeni(GL_T, GL_TEXTURE_GEN_MODE, GL_OBJECT_LINEAR); + LLGLSLShader* shader = LLGLSLShader::sCurBoundShaderPtr; + llassert(shader); + + shader->uniform4fv("object_plane_s", 1, tp0.mV); + shader->uniform4fv("object_plane_t", 1, tp1.mV); - glTexGenfv(GL_S, GL_OBJECT_PLANE, tp0.mV); - glTexGenfv(GL_T, GL_OBJECT_PLANE, tp1.mV); gGL.matrixMode(LLRender::MM_TEXTURE); gGL.loadIdentity(); gGL.matrixMode(LLRender::MM_MODELVIEW); |