aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lldrawpoolsimple.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/lldrawpoolsimple.cpp')
-rw-r--r--linden/indra/newview/lldrawpoolsimple.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/lldrawpoolsimple.cpp b/linden/indra/newview/lldrawpoolsimple.cpp
index d580e97..97efb80 100644
--- a/linden/indra/newview/lldrawpoolsimple.cpp
+++ b/linden/indra/newview/lldrawpoolsimple.cpp
@@ -40,7 +40,7 @@
40#include "llsky.h" 40#include "llsky.h"
41#include "pipeline.h" 41#include "pipeline.h"
42#include "llspatialpartition.h" 42#include "llspatialpartition.h"
43#include "llglslshader.h" 43#include "llviewershadermgr.h"
44#include "llrender.h" 44#include "llrender.h"
45 45
46 46
@@ -54,7 +54,7 @@ void LLDrawPoolGlow::render(S32 pass)
54 LLGLDisable test(GL_ALPHA_TEST); 54 LLGLDisable test(GL_ALPHA_TEST);
55 gGL.setSceneBlendType(LLRender::BT_ADD); 55 gGL.setSceneBlendType(LLRender::BT_ADD);
56 56
57 U32 shader_level = LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_OBJECT); 57 U32 shader_level = LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_OBJECT);
58 58
59 if (shader_level > 0 && fullbright_shader) 59 if (shader_level > 0 && fullbright_shader)
60 { 60 {
@@ -92,7 +92,7 @@ LLDrawPoolSimple::LLDrawPoolSimple() :
92 92
93void LLDrawPoolSimple::prerender() 93void LLDrawPoolSimple::prerender()
94{ 94{
95 mVertexShaderLevel = LLShaderMgr::getVertexShaderLevel(LLShaderMgr::SHADER_OBJECT); 95 mVertexShaderLevel = LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_OBJECT);
96} 96}
97 97
98void LLDrawPoolSimple::beginRenderPass(S32 pass) 98void LLDrawPoolSimple::beginRenderPass(S32 pass)
@@ -113,7 +113,7 @@ void LLDrawPoolSimple::beginRenderPass(S32 pass)
113 if (mVertexShaderLevel > 0) 113 if (mVertexShaderLevel > 0)
114 { 114 {
115 simple_shader->bind(); 115 simple_shader->bind();
116 simple_shader->uniform1f(LLShaderMgr::FULLBRIGHT, 0.f); 116 simple_shader->uniform1f(LLViewerShaderMgr::FULLBRIGHT, 0.f);
117 } 117 }
118 else 118 else
119 { 119 {
@@ -161,7 +161,7 @@ void LLDrawPoolSimple::render(S32 pass)
161 if (mVertexShaderLevel > 0) 161 if (mVertexShaderLevel > 0)
162 { 162 {
163 fullbright_shader->bind(); 163 fullbright_shader->bind();
164 fullbright_shader->uniform1f(LLShaderMgr::FULLBRIGHT, 1.f); 164 fullbright_shader->uniform1f(LLViewerShaderMgr::FULLBRIGHT, 1.f);
165 } 165 }
166 else 166 else
167 { 167 {