From 15ca6eabb4d57a81e2785dc85d0293cc85b298f2 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Wed, 10 Apr 2019 12:54:46 -0500 Subject: [PATCH] cleanup duplicate var, and constructor-init skylight shaderconsts --- Engine/source/renderInstance/renderProbeMgr.cpp | 10 +++++----- Engine/source/renderInstance/renderProbeMgr.h | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Engine/source/renderInstance/renderProbeMgr.cpp b/Engine/source/renderInstance/renderProbeMgr.cpp index 0f884bf98..386f361fd 100644 --- a/Engine/source/renderInstance/renderProbeMgr.cpp +++ b/Engine/source/renderInstance/renderProbeMgr.cpp @@ -119,7 +119,6 @@ void ProbeRenderInst::set(const ProbeRenderInst *probeInfo) ProbeShaderConstants::ProbeShaderConstants() : mInit(false), mShader(NULL), - mProbeParamsSC(NULL), mProbePositionSC(NULL), mProbeRefPosSC(NULL), mProbeBoxMinSC(NULL), @@ -127,7 +126,10 @@ ProbeShaderConstants::ProbeShaderConstants() mProbeConfigDataSC(NULL), mProbeSpecularCubemapSC(NULL), mProbeIrradianceCubemapSC(NULL), - mProbeCountSC(NULL) + mProbeCountSC(NULL), + mSkylightSpecularMap(NULL), + mSkylightIrradMap(NULL), + mHasSkylight(NULL) { } @@ -150,9 +152,7 @@ void ProbeShaderConstants::init(GFXShader* shader) mShader = shader; mShader->getReloadSignal().notify(this, &ProbeShaderConstants::_onShaderReload); } - - mProbeParamsSC = shader->getShaderConstHandle("$probeParams"); - + //Reflection Probes mProbePositionSC = shader->getShaderConstHandle(ShaderGenVars::probePosition); mProbeRefPosSC = shader->getShaderConstHandle(ShaderGenVars::probeRefPos); diff --git a/Engine/source/renderInstance/renderProbeMgr.h b/Engine/source/renderInstance/renderProbeMgr.h index a9039fbbe..ae1d0bc93 100644 --- a/Engine/source/renderInstance/renderProbeMgr.h +++ b/Engine/source/renderInstance/renderProbeMgr.h @@ -131,9 +131,7 @@ struct ProbeShaderConstants bool mInit; GFXShaderRef mShader; - - GFXShaderConstHandle* mProbeParamsSC; - + //Reflection Probes GFXShaderConstHandle *mProbePositionSC; GFXShaderConstHandle *mProbeRefPosSC;