TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added fetch for BRDF texture for forward rendering use, re-enabled brdf logic in the lighting shader and got the probe arrays properly sampling into forward as well.

Browse source 
TODO: core::rendering pref on the BRDF texture instead of hardcode path, add best-pick logic for forward probes and double-check ogl forward is playing nice.
This commit is contained in:
Areloch 2019-05-02 00:05:12 -05:00
parent 98a3ff604a
commit 4e557aec83
6 changed files with 40 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/gfx/genericConstBuffer.cpp
View file

@ -281,8 +281,8 @@ void GenericConstBuffer::assertUnassignedConstants( const char *shaderName )
mLayout->getDesc( i, pd ); mLayout->getDesc( i, pd );
// Assert on the unassigned constant. // Assert on the unassigned constant.
AssertFatal( false, avar( "The '%s' shader constant in shader '%s' was unassigned!", //AssertFatal( false, avar( "The '%s' shader constant in shader '%s' was unassigned!",
pd.name.c_str(), shaderName ) ); // pd.name.c_str(), shaderName ) );
} }
} }

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

@ -127,6 +127,7 @@ ProbeShaderConstants::ProbeShaderConstants()
mProbeSpecularCubemapSC(NULL), mProbeSpecularCubemapSC(NULL),
mProbeIrradianceCubemapSC(NULL), mProbeIrradianceCubemapSC(NULL),
mProbeCountSC(NULL), mProbeCountSC(NULL),
mBRDFTextureMap(NULL),
mSkylightSpecularMap(NULL), mSkylightSpecularMap(NULL),
mSkylightIrradMap(NULL), mSkylightIrradMap(NULL),
mHasSkylight(NULL) mHasSkylight(NULL)
@ -164,6 +165,8 @@ void ProbeShaderConstants::init(GFXShader* shader)
mProbeIrradianceCubemapSC = shader->getShaderConstHandle(ShaderGenVars::irradianceCubemapAR); mProbeIrradianceCubemapSC = shader->getShaderConstHandle(ShaderGenVars::irradianceCubemapAR);
mProbeCountSC = shader->getShaderConstHandle(ShaderGenVars::probeCount); mProbeCountSC = shader->getShaderConstHandle(ShaderGenVars::probeCount);
mBRDFTextureMap = shader->getShaderConstHandle(ShaderGenVars::BRDFTextureMap);
mSkylightSpecularMap = shader->getShaderConstHandle(ShaderGenVars::skylightPrefilterMap); mSkylightSpecularMap = shader->getShaderConstHandle(ShaderGenVars::skylightPrefilterMap);
mSkylightIrradMap = shader->getShaderConstHandle(ShaderGenVars::skylightIrradMap); mSkylightIrradMap = shader->getShaderConstHandle(ShaderGenVars::skylightIrradMap);
mHasSkylight = shader->getShaderConstHandle(ShaderGenVars::hasSkylight); mHasSkylight = shader->getShaderConstHandle(ShaderGenVars::hasSkylight);
@ -654,7 +657,7 @@ void RenderProbeMgr::_update4ProbeConsts(const SceneData &sgData,
bool hasSkylight = false; bool hasSkylight = false;
for (U32 i = 0; i < probeCount; i++) for (U32 i = 0; i < probeCount; i++)
{ {
if (effectiveProbeCount >= 4) if (effectiveProbeCount >= MAX_FORWARD_PROBES)
break; break;
const ProbeRenderInst& curEntry = *ProbeRenderInst::all[i]; const ProbeRenderInst& curEntry = *ProbeRenderInst::all[i];
@ -675,18 +678,18 @@ void RenderProbeMgr::_update4ProbeConsts(const SceneData &sgData,
}*/ }*/
if (!curEntry.mIsSkylight) if (!curEntry.mIsSkylight)
{ {
/*probePositions[effectiveProbeCount] = curEntry.getPosition(); probePositionArray[effectiveProbeCount] = curEntry.getPosition();
probeRefPositions[effectiveProbeCount] = curEntry.mProbeRefOffset; probeRefPositionArray[effectiveProbeCount] = curEntry.mProbeRefOffset;
probeWorldToObj[effectiveProbeCount] = curEntry.getTransform(); probeWorldToObjArray[effectiveProbeCount] = curEntry.getTransform();
probeBBMin[effectiveProbeCount] = curEntry.mBounds.minExtents; probeBoxMinArray[effectiveProbeCount] = curEntry.mBounds.minExtents;
probeBBMax[effectiveProbeCount] = curEntry.mBounds.maxExtents; probeBoxMaxArray[effectiveProbeCount] = curEntry.mBounds.maxExtents;
probeConfig[effectiveProbeCount] = Point4F(curEntry.mProbeShapeType, probeConfigArray[effectiveProbeCount] = Point4F(curEntry.mProbeShapeType,
curEntry.mRadius, curEntry.mRadius,
curEntry.mAtten, curEntry.mAtten,
curEntry.mCubemapIndex);*/ curEntry.mCubemapIndex);
}
effectiveProbeCount++; effectiveProbeCount++;
}
} }
shaderConsts->setSafe(probeShaderConsts->mProbeCountSC, (float)effectiveProbeCount); shaderConsts->setSafe(probeShaderConsts->mProbeCountSC, (float)effectiveProbeCount);
@ -699,11 +702,19 @@ void RenderProbeMgr::_update4ProbeConsts(const SceneData &sgData,
shaderConsts->setSafe(probeShaderConsts->mProbeBoxMinSC, probeBoxMinArray); shaderConsts->setSafe(probeShaderConsts->mProbeBoxMinSC, probeBoxMinArray);
shaderConsts->setSafe(probeShaderConsts->mProbeBoxMaxSC, probeBoxMaxArray); shaderConsts->setSafe(probeShaderConsts->mProbeBoxMaxSC, probeBoxMaxArray);
shaderConsts->setSafe(probeShaderConsts->mProbeConfigDataSC, probeConfigArray); shaderConsts->setSafe(probeShaderConsts->mProbeConfigDataSC, probeConfigArray);
//GFX->setCubeArrayTexture(probeShaderConsts->mProbeSpecularCubemapSC->getSamplerRegister(), mPrefilterArray); GFX->setCubeArrayTexture(probeShaderConsts->mProbeSpecularCubemapSC->getSamplerRegister(), mPrefilterArray);
//GFX->setCubeArrayTexture(probeShaderConsts->mProbeIrradianceCubemapSC->getSamplerRegister(), mIrradianceArray); GFX->setCubeArrayTexture(probeShaderConsts->mProbeIrradianceCubemapSC->getSamplerRegister(), mIrradianceArray);
}
//if (!hasSkylight) if (probeShaderConsts->mBRDFTextureMap->isValid())
// shaderConsts->setSafe(probeShaderConsts->mHasSkylight, 0.0f); {
if (!mBRDFTexture.isValid())
{
//try to fetch it
mBRDFTexture.set("core/art/pbr/brdfTexture.dds", &GFXStaticTextureSRGBProfile, "BRDF Texture");
}
GFX->setTexture(probeShaderConsts->mBRDFTextureMap->getSamplerRegister(), mBRDFTexture.getPointer());
} }
//check for skylight action //check for skylight action

4
Engine/source/renderInstance/renderProbeMgr.h
View file

@ -143,6 +143,8 @@ struct ProbeShaderConstants
GFXShaderConstHandle *mProbeIrradianceCubemapSC; GFXShaderConstHandle *mProbeIrradianceCubemapSC;
GFXShaderConstHandle *mProbeCountSC; GFXShaderConstHandle *mProbeCountSC;
GFXShaderConstHandle *mBRDFTextureMap;
GFXShaderConstHandle *mSkylightSpecularMap; GFXShaderConstHandle *mSkylightSpecularMap;
GFXShaderConstHandle *mSkylightIrradMap; GFXShaderConstHandle *mSkylightIrradMap;
GFXShaderConstHandle *mHasSkylight; GFXShaderConstHandle *mHasSkylight;
@ -227,6 +229,8 @@ class RenderProbeMgr : public RenderBinManager
//Default skylight, used for shape editors, etc //Default skylight, used for shape editors, etc
ProbeRenderInst* mDefaultSkyLight; ProbeRenderInst* mDefaultSkyLight;
GFXTexHandle mBRDFTexture;
public: public:
RenderProbeMgr(); RenderProbeMgr();
RenderProbeMgr(RenderInstType riType, F32 renderOrder, F32 processAddOrder); RenderProbeMgr(RenderInstType riType, F32 renderOrder, F32 processAddOrder);

2
Engine/source/shaderGen/shaderGenVars.cpp
View file

@ -80,6 +80,8 @@ const String ShaderGenVars::specularCubemapAR("$specularCubemapAR");
const String ShaderGenVars::irradianceCubemapAR("$irradianceCubemapAR"); const String ShaderGenVars::irradianceCubemapAR("$irradianceCubemapAR");
const String ShaderGenVars::probeCount("$numProbes"); const String ShaderGenVars::probeCount("$numProbes");
const String ShaderGenVars::BRDFTextureMap("$BRDFTexture");
//Skylight //Skylight
const String ShaderGenVars::skylightPrefilterMap("$skylightSpecularMap"); const String ShaderGenVars::skylightPrefilterMap("$skylightSpecularMap");
const String ShaderGenVars::skylightIrradMap("$skylightIrradMap"); const String ShaderGenVars::skylightIrradMap("$skylightIrradMap");

2
Engine/source/shaderGen/shaderGenVars.h
View file

@ -93,6 +93,8 @@ struct ShaderGenVars
const static String irradianceCubemapAR; const static String irradianceCubemapAR;
const static String probeCount; const static String probeCount;
const static String BRDFTextureMap;
//Skylight //Skylight
const static String skylightPrefilterMap; const static String skylightPrefilterMap;
const static String skylightIrradMap; const static String skylightIrradMap;

10
Templates/Full/game/shaders/common/lighting.hlsl
View file

@ -370,7 +370,7 @@ float4 computeForwardProbes(Surface surface,
float lod = surface.roughness*cubeMips; float lod = surface.roughness*cubeMips;
float alpha = 1; float alpha = 1;
/*for (i = 0; i < numProbes; ++i) for (i = 0; i < numProbes; ++i)
{ {
float contrib = contribution[i]; float contrib = contribution[i];
if (contrib != 0) if (contrib != 0)
@ -382,7 +382,7 @@ float4 computeForwardProbes(Surface surface,
specular += TORQUE_TEXCUBEARRAYLOD(specularCubemapAR, dir, cubemapIdx, lod).xyz * contrib; specular += TORQUE_TEXCUBEARRAYLOD(specularCubemapAR, dir, cubemapIdx, lod).xyz * contrib;
alpha -= contrib; alpha -= contrib;
} }
}*/ }
if (hasSkylight && alpha > 0.001) if (hasSkylight && alpha > 0.001)
{ {
@ -394,16 +394,16 @@ float4 computeForwardProbes(Surface surface,
//energy conservation //energy conservation
float3 kD = 1.0.xxx - F; float3 kD = 1.0.xxx - F;
kD *= clamp(1.0 - surface.metalness, 0.2, 1); kD *= 1.0 - surface.metalness;
//apply brdf //apply brdf
//Do it once to save on texture samples //Do it once to save on texture samples
float2 brdf = TORQUE_TEX2DLOD(BRDFTexture,float4(surface.roughness, surface.NdotV, 0.0, 0.0)).xy; float2 brdf = TORQUE_TEX2DLOD(BRDFTexture,float4(surface.roughness, surface.NdotV, 0.0, 0.0)).xy;
//specular *= brdf.x * F + brdf.y; specular *= brdf.x * F + brdf.y;
//final diffuse color //final diffuse color
float3 diffuse = kD * irradiance * surface.baseColor.rgb; float3 diffuse = kD * irradiance * surface.baseColor.rgb;
float4 finalColor = float4(diffuse + specular, 1.0); float4 finalColor = float4(diffuse + specular, 1);
return finalColor; return finalColor;
} }