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

OpenGL Intel - Fix a error on DOF_DownSample_P.glsl.

Browse source
This commit is contained in:
LuisAntonRebollo 2014-12-11 22:58:02 +01:00
parent d000a1e7c5
commit 0718875ac3
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Templates/Empty/game/shaders/common/postFx/dof/gl/DOF_DownSample_P.glsl
View file

@ -84,13 +84,16 @@ void main()
// The CoC will be 1 if the depth is negative, so use "min" to pick // The CoC will be 1 if the depth is negative, so use "min" to pick
// between "sceneCoc" and "viewCoc". // between "sceneCoc" and "viewCoc".
coc = half4(0);
for ( int i = 0; i < 4; i++ ) for ( int i = 0; i < 4; i++ )
{ {
depth[0] = prepassUncondition( depthSampler, ( IN_tcDepth0.xy + rowOfs[i] ) ).w; depth[0] = prepassUncondition( depthSampler, ( IN_tcDepth0.xy + rowOfs[i] ) ).w;
depth[1] = prepassUncondition( depthSampler, ( IN_tcDepth1.xy + rowOfs[i] ) ).w; depth[1] = prepassUncondition( depthSampler, ( IN_tcDepth1.xy + rowOfs[i] ) ).w;
depth[2] = prepassUncondition( depthSampler, ( IN_tcDepth2.xy + rowOfs[i] ) ).w; depth[2] = prepassUncondition( depthSampler, ( IN_tcDepth2.xy + rowOfs[i] ) ).w;
depth[3] = prepassUncondition( depthSampler, ( IN_tcDepth3.xy + rowOfs[i] ) ).w; depth[3] = prepassUncondition( depthSampler, ( IN_tcDepth3.xy + rowOfs[i] ) ).w;
coc[i] = clamp( dofEqWorld.x * depth + dofEqWorld.y, 0.0, maxWorldCoC );
// @todo OPENGL INTEL need review
coc = max( coc, clamp( half4(dofEqWorld.x) * depth + half4(dofEqWorld.y), half4(0.0), half4(maxWorldCoC) ) );
} }
/* /*

5
Templates/Full/game/shaders/common/postFx/dof/gl/DOF_DownSample_P.glsl
View file

@ -84,13 +84,16 @@ void main()
// The CoC will be 1 if the depth is negative, so use "min" to pick // The CoC will be 1 if the depth is negative, so use "min" to pick
// between "sceneCoc" and "viewCoc". // between "sceneCoc" and "viewCoc".
coc = half4(0);
for ( int i = 0; i < 4; i++ ) for ( int i = 0; i < 4; i++ )
{ {
depth[0] = prepassUncondition( depthSampler, ( IN_tcDepth0.xy + rowOfs[i] ) ).w; depth[0] = prepassUncondition( depthSampler, ( IN_tcDepth0.xy + rowOfs[i] ) ).w;
depth[1] = prepassUncondition( depthSampler, ( IN_tcDepth1.xy + rowOfs[i] ) ).w; depth[1] = prepassUncondition( depthSampler, ( IN_tcDepth1.xy + rowOfs[i] ) ).w;
depth[2] = prepassUncondition( depthSampler, ( IN_tcDepth2.xy + rowOfs[i] ) ).w; depth[2] = prepassUncondition( depthSampler, ( IN_tcDepth2.xy + rowOfs[i] ) ).w;
depth[3] = prepassUncondition( depthSampler, ( IN_tcDepth3.xy + rowOfs[i] ) ).w; depth[3] = prepassUncondition( depthSampler, ( IN_tcDepth3.xy + rowOfs[i] ) ).w;
coc[i] = clamp( dofEqWorld.x * depth + dofEqWorld.y, 0.0, maxWorldCoC );
// @todo OPENGL INTEL need review
coc = max( coc, clamp( half4(dofEqWorld.x) * depth + half4(dofEqWorld.y), half4(0.0), half4(maxWorldCoC) ) );
} }
/* /*