TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

explicitly bound the namedtexttargets to input slots. shifted brdf slot on up to 3 (from 5) to cluster flat vs array entries. though it does not appear at time of writing that that is in fact binding...

Browse source
This commit is contained in:
Azaezel 2019-01-28 22:10:57 -06:00
parent 7a8dd96808
commit 1dfd130d85
2 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Engine/source/renderInstance/renderProbeMgr.cpp
View file

@ -741,7 +741,6 @@ void RenderProbeMgr::render( SceneRenderState *state )
break;
ProbeRenderInst* curEntry = ProbeRenderInst::all[i];
if (!curEntry->mIsEnabled)
continue;
@ -751,6 +750,7 @@ void RenderProbeMgr::render( SceneRenderState *state )
if (!curEntry->mCubemap->isInitialised())
continue;
//Setup
const Point3F &probePos = curEntry->getPosition();
probePositions[i] = probePos + curEntry->mProbePosOffset;
@ -787,9 +787,22 @@ void RenderProbeMgr::render( SceneRenderState *state )
mCubemapArray->initStatic(cubeMaps.address(), cubeMaps.size());
mIrradArray->initStatic(irradMaps.address(), irradMaps.size());
GFX->setCubeArrayTexture(3, mCubemapArray);
GFX->setCubeArrayTexture(4, mIrradArray);
GFX->setTexture(5, mBrdfTexture);
NamedTexTarget *deferredTarget = NamedTexTarget::find(RenderDeferredMgr::BufferName);
if (deferredTarget)
GFX->setTexture(0, deferredTarget->getTexture());
NamedTexTarget *colorTarget = NamedTexTarget::find(RenderDeferredMgr::ColorBufferName);
if (colorTarget)
GFX->setTexture(1, colorTarget->getTexture());
NamedTexTarget *matinfoTarget = NamedTexTarget::find(RenderDeferredMgr::MatInfoBufferName);
if (matinfoTarget)
GFX->setTexture(2, matinfoTarget->getTexture());
GFX->setTexture(3, mBrdfTexture);
GFX->setCubeArrayTexture(4, mCubemapArray);
GFX->setCubeArrayTexture(5, mIrradArray);
matParams->set(probePositionSC, probePositions);
matParams->set(probeWorldToObjSC, probeWorldToObj.address(), probeWorldToObj.size());