Commit: e305aa1074100dd98bf5255843a60edbd6c9a05f - HotshotOgreIOS (hg)

Commit MetaInfo

• Revision: e305aa1074100dd98bf5255843a60edbd6c9a05f (tree)
• Time: 2017-10-11 00:49:33
• Author: al2950 <anguslauriepile@gmai...>
• Commiter: al2950

Log Message

[Metal] Fixes for Forward+ rendering for metal

Change Summary

• modified: OgreMain/src/OgreForward3D.cpp
• modified: OgreMain/src/OgreForwardClustered.cpp
• modified: Samples/Media/Hlms/Pbs/Metal/Forward3D_piece_ps.metal

Incremental Difference

diff -r 3d6143658b0b -r e305aa107410 OgreMain/src/OgreForward3D.cpp
--- a/OgreMain/src/OgreForward3D.cpp	Fri Sep 22 17:56:59 2017 +0100
+++ b/OgreMain/src/OgreForward3D.cpp	Tue Oct 10 16:49:33 2017 +0100
@@ -430,8 +430,8 @@
         //The way ogre represents viewports is top = 0 bottom = 1. As a result if 'texture flipping' is required 
         //all is ok. However if it is not required then viewport offsets are actually represented from the bottom up.
         //As a result we need convert our veiwport height offsets to work bottom up instead of top down;
-        //This is compounded by DirectX standard being different to OpenGl
-        if ( !renderTarget->requiresTextureFlipping() && shaderProfile != "hlsl" )
+        //This is compounded by OpenGL standard being different to DirectX and Metal
+        if ( !renderTarget->requiresTextureFlipping() && shaderProfile == "glsl" )
         {
             viewportHeightOffset = static_cast<float>( (1.0 - (viewport->getTop() + viewport->getHeight()) )
                                                                               * renderTarget->getHeight() );

diff -r 3d6143658b0b -r e305aa107410 OgreMain/src/OgreForwardClustered.cpp
--- a/OgreMain/src/OgreForwardClustered.cpp	Fri Sep 22 17:56:59 2017 +0100
+++ b/OgreMain/src/OgreForwardClustered.cpp	Tue Oct 10 16:49:33 2017 +0100
@@ -629,8 +629,8 @@
         //The way ogre represents viewports is top = 0 bottom = 1. As a result if 'texture flipping' is required 
         //all is ok. However if it is not required then viewport offsets are actually represented from the bottom up.
         //As a result we need convert our veiwport height offsets to work bottom up instead of top down;
-        //This is compounded by DirectX standard being different to OpenGl
-        if (!renderTarget->requiresTextureFlipping() && shaderProfile != "hlsl")
+        //This is compounded by OpenGL standard being different to DirectX and Metal
+        if ( !renderTarget->requiresTextureFlipping() && shaderProfile == "glsl" )
         {
             viewportHeightOffset = static_cast<float>((1.0 - (viewport->getTop() + viewport->getHeight()) )
                                                                                * renderTarget->getHeight());

diff -r 3d6143658b0b -r e305aa107410 Samples/Media/Hlms/Pbs/Metal/Forward3D_piece_ps.metal
--- a/Samples/Media/Hlms/Pbs/Metal/Forward3D_piece_ps.metal	Fri Sep 22 17:56:59 2017 +0100
+++ b/Samples/Media/Hlms/Pbs/Metal/Forward3D_piece_ps.metal	Tue Oct 10 16:49:33 2017 +0100
@@ -29,7 +29,7 @@
 		//passBuf.f3dGridHWW[slice].z = grid_width * lightsPerCell;
 		//uint sampleOffset = 0;
 		uint sampleOffset = offset +
-							uint(floor( (windowHeight - (inPs.gl_FragCoord.y - passBuf.f3dViewportOffset.y) * passBuf.f3dGridHWW[slice].y ) * passBuf.f3dGridHWW[slice].z) +
+							uint(floor( (windowHeight - (inPs.gl_FragCoord.y - passBuf.f3dViewportOffset.y) * passBuf.f3dGridHWW[slice].y )) * passBuf.f3dGridHWW[slice].z) +
 							uint(floor( (inPs.gl_FragCoord.x - passBuf.f3dViewportOffset.x ) * passBuf.f3dGridHWW[slice].x ) * lightsPerCell);
 	@end @property( hlms_forwardplus != forward3d )
 		float f3dMinDistance	= passBuf.f3dData.x;