Merge branch 'OGRECave:master' into patch-3

Docs/src/manual/Ogre3.0.Changes.md

@@ -18,13 +18,13 @@ When enabled, the project names will be `OgreNext` instead of `Ogre`. e.g. the f
 
 | Old Name                   | New Name                       |
 |----------------------------|--------------------------------|
-| OgreMain.dll               | OgreMain.dll                   |
+| OgreMain.dll               | OgreNextMain.dll               |
 | OgreHlmsPbs.dll            | OgreNextHlmsPbs.dll            |
 | OgreHlmsUnlit.dll          | OgreNextHlmsUnlit.dll          |
 | OgreMeshLodGenerator.dll   | OgreNextMeshLodGenerator.dll   |
 | OgreOverlay.dll            | OgreNextOverlay.dll            |
 | OgreSceneFormat.dll        | OgreNextSceneFormat.dll        |
-| libOgreMain.so             | libOgreMain.so                 |
+| libOgreMain.so             | libOgreNextMain.so             |
 | libOgreHlmsPbs.so          | libOgreNextHlmsPbs.so          |
 | libOgreHlmsUnlit.so        | libOgreNextHlmsUnlit.so        |
 | libOgreMeshLodGenerator.so | libOgreNextMeshLodGenerator.so |

OgreMain/src/OgreHlms.cpp

@@ -2278,6 +2278,12 @@ namespace Ogre
 
                 codeCache.shaders[i] =
                     compileShaderCode( source[i], "", uniqueName, static_cast<ShaderType>( i ), tid );
+
+                if( mDebugOutput )
+                {
+                    debugDumpFile.write( source[i].c_str(),
+                                         static_cast<std::streamsize>( source[i].size() ) );
+                }
             }
         }
 

README.md

@@ -142,7 +142,8 @@ pacman -S freeimage freetype2 libxaw libxrandr mesa zziplib cmake gcc
 
 We provide quick download-build scripts under the [Scripts/BuildScripts/output](Scripts/BuildScripts/output) folder.
 
-You can download all of these scripts [as a compressed 7zip file](https://bintray.com/darksylinc/ogre-next/download_file?file_path=build_ogre_scripts-master.7z)
+You can download all of these scripts [as a compressed 7zip file](https://github.com/OGRECave/ogre-next/releases/download/bin-releases/build_ogre_scripts-master.7z).
+We also have an archive if you're looking for [scripts to build older versions](https://github.com/OGRECave/ogre-next/releases/bin-releases/).
 
 If you're on Linux, make sure to first install the dependencies (i.e. run the sudo apt-get above)
 

RenderSystems/Direct3D11/src/OgreD3D11RenderSystem.cpp

@@ -909,6 +909,7 @@ namespace Ogre
         SAFE_DELETE( mDriverList );
         mActiveD3DDriver = D3D11Driver();
         mDevice.ReleaseAll();
+        SAFE_DELETE( mVendorExtension );
         LogManager::getSingleton().logMessage( "D3D11: Shutting down cleanly." );
         SAFE_DELETE( mHardwareBufferManager );
         SAFE_DELETE( mGpuProgramManager );

RenderSystems/GL3Plus/include/GLSL/OgreGLSLPreprocessor.h

@@ -521,6 +521,16 @@ namespace Ogre
          */
         char *Parse( const char *iSource, size_t iLength, size_t &oLength );
 
+        /** Parse the input string as a preamble (i.e. to define a lot of enums).
+        @param iSource
+            The source text containing preamble macros.
+        @param iLength
+            The length of iSource text in characters.
+        @return
+            False on errors. True on success.
+        */
+        bool ParsePreamble( const char *iSource, size_t iLength );
+
         /**
          * An error handler function type.
          * The default implementation just drops a note to stderr and

RenderSystems/GL3Plus/src/GLSL/OgreGLSLPreprocessor.cpp

@@ -1437,4 +1437,10 @@ namespace Ogre
         return retval.Buffer;
     }
 
+    bool CPreprocessor::ParsePreamble( const char *iSource, size_t iLength )
+    {
+        Token retval = Parse( Token( Token::TK_TEXT, iSource, iLength ) );
+        return retval.Type != Token::TK_ERROR;
+    }
+
 }  // namespace Ogre

RenderSystems/GL3Plus/src/GLSL/OgreGLSLShader.cpp

@@ -163,7 +163,6 @@ namespace Ogre
             replaceVersionMacros();
 
         // Mask out vulkan_layout() macros
-        size_t unusedVal = 0;
         const String preamble =
             "#define vulkan_layout(x)\n"
             "#define vulkan( x )\n"
@@ -180,7 +179,7 @@ namespace Ogre
             "#define vkSampler2DArray( a, b ) a\n"
             "#define vkSampler3D( a, b ) a\n"
             "#define vkSamplerCube( a, b ) a\n";
-        cpp.Parse( preamble.c_str(), preamble.size(), unusedVal );
+        cpp.ParsePreamble( preamble.c_str(), preamble.size() );
 
         // Pass all user-defined macros to preprocessor
         if( !mPreprocessorDefines.empty() )
@@ -240,6 +239,7 @@ namespace Ogre
         const char *src = mSource.c_str();
         size_t src_len = mSource.size();
         char *out = cpp.Parse( src, src_len, out_size );
+
         if( !out || !out_size )
         {
             mCompileError = true;

RenderSystems/Vulkan/include/Windowing/Android/OgreVulkanAndroidWindow.h

@@ -82,7 +82,7 @@ namespace Ogre
             /// While this sounds convenient, beware that Swappy will often downgrade vSyncInterval
             /// until it finds something that can be met & sustained.
             /// That means if your game runs between 40fps and 60fps on a 60hz screen, after some time
-            /// swappy will downgrade vSyncInterval to 2 so that the game render at perfect 30fps.
+            /// Swappy will downgrade vSyncInterval to 2 so that the game renders at perfect 30fps.
             ///
             /// This may result in a better experience considering framerates jump a lot due to
             /// thermal throttling on phones. But it may also cause undesired or unexplainable

Samples/Media/Hlms/Terra/Any/500.Structs_piece_vs_piece_ps.any

@@ -96,6 +96,7 @@ struct CellData
 
 @undefpiece( DeclareObjLightMask )
 @property( hlms_fine_light_mask || hlms_forwardplus_fine_light_mask )
+	// Currently unimplemented (also makes little sense since there's nothing fine granularity to do).
 	@property( syntax == metal )
 		@piece( DeclareObjLightMask )uint objLightMask = 0xFFFFFFFFu;@end
 	@else

Samples/Media/Hlms/Terra/Any/800.VertexShader_piece_vs.any

@@ -136,11 +136,14 @@
 
 @property( syntax == metal || lower_gpu_overhead )
 	@property( hlms_fine_light_mask || hlms_forwardplus_fine_light_mask )
-		outVs.objLightMask = worldMaterialIdx[inVs_drawId].z;
+		// Currently unimplemented (also makes little sense since there's nothing fine granularity to do).
+		outVs.objLightMask = 0xFFFFFFFF;
+		// outVs.objLightMask = worldMaterialIdx[inVs_drawId].z;
 	@end
 
 	@property( use_planar_reflections )
-		outVs.planarReflectionIdx = (ushort)(worldMaterialIdx[inVs_drawId].w);
+		#error "Unimplemented Feature: Using Terra as Planar Reflections"
+		// outVs.planarReflectionIdx = (ushort)(worldMaterialIdx[inVs_drawId].w);
 	@end
 @else
 	@property( (!hlms_shadowcaster || alpha_test) && !lower_gpu_overhead )