Skip to content
Snippets Groups Projects
Commit 83fa549b authored by Graham Madarasz (Graham Linden)'s avatar Graham Madarasz (Graham Linden)
Browse files

NORSPEC-322 NORSPEC-342 WIP fix black deferred impostors, lighting bugs remain

parent 5b400d50
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/lldrawpoolavatar.cpp
+ 8
− 0
View file @ 83fa549b
...@@ -691,6 +691,9 @@ void LLDrawPoolAvatar::beginDeferredImpostor() ...@@ -691,6 +691,9 @@ void LLDrawPoolAvatar::beginDeferredImpostor()
} }
sVertexProgram = &gDeferredImpostorProgram; sVertexProgram = &gDeferredImpostorProgram;
specular_channel = sVertexProgram->enableTexture(LLViewerShaderMgr::SPECULAR_MAP);
normal_channel = sVertexProgram->enableTexture(LLViewerShaderMgr::DEFERRED_NORMAL);
sDiffuseChannel = sVertexProgram->enableTexture(LLViewerShaderMgr::DIFFUSE_MAP);
gPipeline.bindDeferredShader(*sVertexProgram); gPipeline.bindDeferredShader(*sVertexProgram);
sVertexProgram->setMinimumAlpha(0.01f); sVertexProgram->setMinimumAlpha(0.01f);
} }
...@@ -698,7 +701,12 @@ void LLDrawPoolAvatar::beginDeferredImpostor() ...@@ -698,7 +701,12 @@ void LLDrawPoolAvatar::beginDeferredImpostor()
void LLDrawPoolAvatar::endDeferredImpostor() void LLDrawPoolAvatar::endDeferredImpostor()
{ {
sShaderLevel = mVertexShaderLevel; sShaderLevel = mVertexShaderLevel;
sVertexProgram->disableTexture(LLViewerShaderMgr::DEFERRED_NORMAL);
sVertexProgram->disableTexture(LLViewerShaderMgr::SPECULAR_MAP);
sVertexProgram->disableTexture(LLViewerShaderMgr::DIFFUSE_MAP);
gPipeline.unbindDeferredShader(*sVertexProgram); gPipeline.unbindDeferredShader(*sVertexProgram);
sVertexProgram = NULL;
sDiffuseChannel = 0;
} }
void LLDrawPoolAvatar::beginDeferredRigid() void LLDrawPoolAvatar::beginDeferredRigid()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment