Skip to content
Snippets Groups Projects
Commit abf78817 authored by David Parks's avatar David Parks
Browse files

SL-18096 WIP -- partial support for double sided rendering. Shadow map and picking support TBD.

parent ef2eecca
No related branches found
No related tags found
No related merge requests found
...@@ -97,6 +97,7 @@ S32 LLWorkerThread::update(F32 max_time_ms) ...@@ -97,6 +97,7 @@ S32 LLWorkerThread::update(F32 max_time_ms)
{ {
if (worker->getFlags(LLWorkerClass::WCF_WORK_FINISHED)) if (worker->getFlags(LLWorkerClass::WCF_WORK_FINISHED))
{ {
worker->setFlags(LLWorkerClass::WCF_DELETE_REQUESTED);
delete_list.push_back(worker); delete_list.push_back(worker);
mDeleteList.erase(curiter); mDeleteList.erase(curiter);
} }
......
...@@ -153,6 +153,8 @@ void main() ...@@ -153,6 +153,8 @@ void main()
col.rgb = vary_position.xyz; col.rgb = vary_position.xyz;
#endif #endif
tnorm *= gl_FrontFacing ? 1.0 : -1.0;
// See: C++: addDeferredAttachments(), GLSL: softenLightF // See: C++: addDeferredAttachments(), GLSL: softenLightF
frag_data[0] = vec4(col, 0.0); // Diffuse frag_data[0] = vec4(col, 0.0); // Diffuse
frag_data[1] = vec4(emissive, vertex_color.a); // PBR sRGB Emissive frag_data[1] = vec4(emissive, vertex_color.a); // PBR sRGB Emissive
......
...@@ -146,6 +146,8 @@ void LLDrawPoolPBROpaque::renderDeferred(S32 pass) ...@@ -146,6 +146,8 @@ void LLDrawPoolPBROpaque::renderDeferred(S32 pass)
shader->uniform1f(LLShaderMgr::METALLIC_FACTOR, pparams->mGLTFMaterial->mMetallicFactor); shader->uniform1f(LLShaderMgr::METALLIC_FACTOR, pparams->mGLTFMaterial->mMetallicFactor);
shader->uniform3fv(LLShaderMgr::EMISSIVE_COLOR, 1, pparams->mGLTFMaterial->mEmissiveColor.mV); shader->uniform3fv(LLShaderMgr::EMISSIVE_COLOR, 1, pparams->mGLTFMaterial->mEmissiveColor.mV);
LLGLDisable cull_face(mat->mDoubleSided ? GL_CULL_FACE : 0);
if (rigged) if (rigged)
{ {
if (pparams->mAvatar.notNull() && (lastAvatar != pparams->mAvatar || lastMeshId != pparams->mSkinInfo->mHash)) if (pparams->mAvatar.notNull() && (lastAvatar != pparams->mAvatar || lastMeshId != pparams->mSkinInfo->mHash))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment