TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 16:25:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix OpenGL changes formating.

Browse source
This commit is contained in:
LuisAntonRebollo 2014-11-30 23:09:11 +01:00
parent 87f34e3c4f
commit 1d3f3fdfe4
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.cpp
View file

@ -532,9 +532,9 @@ void DeferredMinnaertGLSL::setTexData( Material::StageData &stageDat,
NamedTexTarget *texTarget = NamedTexTarget::find(RenderPrePassMgr::BufferName); NamedTexTarget *texTarget = NamedTexTarget::find(RenderPrePassMgr::BufferName);
if ( texTarget ) if ( texTarget )
{ {
passData.mTexType[texIndex] = Material::TexTarget; passData.mTexType[texIndex] = Material::TexTarget;
passData.mSamplerNames[texIndex] = "prepassBuffer"; passData.mSamplerNames[texIndex] = "prepassBuffer";
passData.mTexSlot[ texIndex++ ].texTarget = texTarget; passData.mTexSlot[ texIndex++ ].texTarget = texTarget;
} }
} }
} }

2
Engine/source/lighting/advanced/glsl/gBufferConditionerGLSL.cpp
View file

@ -333,7 +333,7 @@ Var* GBufferConditionerGLSL::_conditionOutput( Var *unconditionedOutput, MultiLi
// Encode depth into two channels // Encode depth into two channels
if(mNormalStorageType != CartesianXYZ) 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( " \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 ), meta->addStatement( new GenOp( avar( " float2 _tempDepth = frac(@.a * float2(1.0, %llu.0));\r\n", maxValPerChannel - 1 ),
unconditionedOutput ) ); unconditionedOutput ) );

6
Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.cpp
View file

@ -532,9 +532,9 @@ void DeferredMinnaertHLSL::setTexData( Material::StageData &stageDat,
NamedTexTarget *texTarget = NamedTexTarget::find(RenderPrePassMgr::BufferName); NamedTexTarget *texTarget = NamedTexTarget::find(RenderPrePassMgr::BufferName);
if ( texTarget ) if ( texTarget )
{ {
passData.mTexType[texIndex] = Material::TexTarget; passData.mTexType[texIndex] = Material::TexTarget;
passData.mSamplerNames[texIndex] = "prepassBuffer"; passData.mSamplerNames[texIndex] = "prepassBuffer";
passData.mTexSlot[ texIndex++ ].texTarget = texTarget; passData.mTexSlot[ texIndex++ ].texTarget = texTarget;
} }
} }
} }