From ddfa4eaf1831768a7aa3a3ea8abdcbdcdca2928e Mon Sep 17 00:00:00 2001 From: rextimmy Date: Thu, 9 Jun 2016 15:23:54 +1000 Subject: [PATCH 1/2] DX11 accumulation shadergen fix. --- Engine/source/shaderGen/HLSL/accuFeatureHLSL.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Engine/source/shaderGen/HLSL/accuFeatureHLSL.cpp b/Engine/source/shaderGen/HLSL/accuFeatureHLSL.cpp index 6010c8283..ca0a7b40e 100644 --- a/Engine/source/shaderGen/HLSL/accuFeatureHLSL.cpp +++ b/Engine/source/shaderGen/HLSL/accuFeatureHLSL.cpp @@ -65,7 +65,11 @@ void AccuTexFeatHLSL::processPix( Vector &componentList, // accu map Var *accuMap = new Var; - accuMap->setType( "sampler2D" ); + if (mIsDirect3D11) + accuMap->setType("SamplerState"); + else + accuMap->setType("sampler2D"); + accuMap->setName( "accuMap" ); accuMap->uniform = true; accuMap->sampler = true; From 92017332eb28c346caa61c9ca41c9454d914ee31 Mon Sep 17 00:00:00 2001 From: rextimmy Date: Thu, 9 Jun 2016 16:23:53 +1000 Subject: [PATCH 2/2] Fixed AccuTexFeatHLSL implicit truncation error --- Engine/source/shaderGen/HLSL/accuFeatureHLSL.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engine/source/shaderGen/HLSL/accuFeatureHLSL.cpp b/Engine/source/shaderGen/HLSL/accuFeatureHLSL.cpp index ca0a7b40e..ca1ee2702 100644 --- a/Engine/source/shaderGen/HLSL/accuFeatureHLSL.cpp +++ b/Engine/source/shaderGen/HLSL/accuFeatureHLSL.cpp @@ -170,7 +170,7 @@ void AccuTexFeatHLSL::processPix( Vector &componentList, meta->addStatement( new GenOp( " @.z *= @*2.0;\r\n", accuVec, accuDirection ) ); // saturate based on strength - meta->addStatement( new GenOp( " @ = saturate( dot( @, @.xyz * pow(@, 5) ) );\r\n", plcAccu, bumpNorm, accuVec, accuStrength ) ); + meta->addStatement( new GenOp( " @ = saturate( dot( @.xyz, @.xyz * pow(@, 5) ) );\r\n", plcAccu, bumpNorm, accuVec, accuStrength ) ); // add coverage meta->addStatement( new GenOp( " @.a += (2 * pow(@/2, 5)) - 0.5;\r\n", accuPlc, accuCoverage ) );