From 1d3f3fdfe46b34985a484a2d90a65742a3b6912e Mon Sep 17 00:00:00 2001 From: LuisAntonRebollo Date: Sun, 30 Nov 2014 23:09:11 +0100 Subject: [PATCH] Fix OpenGL changes formating. --- .../lighting/advanced/glsl/advancedLightingFeaturesGLSL.cpp | 6 +++--- .../lighting/advanced/glsl/gBufferConditionerGLSL.cpp | 2 +- .../lighting/advanced/hlsl/advancedLightingFeaturesHLSL.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.cpp b/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.cpp index f931638d6..010da5eeb 100644 --- a/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.cpp +++ b/Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.cpp @@ -532,9 +532,9 @@ void DeferredMinnaertGLSL::setTexData( Material::StageData &stageDat, NamedTexTarget *texTarget = NamedTexTarget::find(RenderPrePassMgr::BufferName); if ( texTarget ) { - passData.mTexType[texIndex] = Material::TexTarget; - passData.mSamplerNames[texIndex] = "prepassBuffer"; - passData.mTexSlot[ texIndex++ ].texTarget = texTarget; + passData.mTexType[texIndex] = Material::TexTarget; + passData.mSamplerNames[texIndex] = "prepassBuffer"; + passData.mTexSlot[ texIndex++ ].texTarget = texTarget; } } } diff --git a/Engine/source/lighting/advanced/glsl/gBufferConditionerGLSL.cpp b/Engine/source/lighting/advanced/glsl/gBufferConditionerGLSL.cpp index ddf54833d..9a76d471b 100644 --- a/Engine/source/lighting/advanced/glsl/gBufferConditionerGLSL.cpp +++ b/Engine/source/lighting/advanced/glsl/gBufferConditionerGLSL.cpp @@ -333,7 +333,7 @@ Var* GBufferConditionerGLSL::_conditionOutput( Var *unconditionedOutput, MultiLi // Encode depth into two channels if(mNormalStorageType != CartesianXYZ) { - const U64 maxValPerChannel = (U64)1 << mBitsPerChannel; + const U64 maxValPerChannel = (U64)1 << mBitsPerChannel; meta->addStatement( new GenOp( " \r\n // Encode depth into hi/lo\r\n" ) ); meta->addStatement( new GenOp( avar( " float2 _tempDepth = frac(@.a * float2(1.0, %llu.0));\r\n", maxValPerChannel - 1 ), unconditionedOutput ) ); diff --git a/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.cpp b/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.cpp index 60d9dcfdb..d948e6075 100644 --- a/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.cpp +++ b/Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.cpp @@ -532,9 +532,9 @@ void DeferredMinnaertHLSL::setTexData( Material::StageData &stageDat, NamedTexTarget *texTarget = NamedTexTarget::find(RenderPrePassMgr::BufferName); if ( texTarget ) { - passData.mTexType[texIndex] = Material::TexTarget; - passData.mSamplerNames[texIndex] = "prepassBuffer"; - passData.mTexSlot[ texIndex++ ].texTarget = texTarget; + passData.mTexType[texIndex] = Material::TexTarget; + passData.mSamplerNames[texIndex] = "prepassBuffer"; + passData.mTexSlot[ texIndex++ ].texTarget = texTarget; } } }