Merge remote-tracking branch 'upstream/main' into DisableAtomShim

Code/CryEngine/RenderDll/Common/DeferredRenderUtils.h

@@ -39,4 +39,4 @@ private:
     static void SphereTessR(Vec3& v0, Vec3& v1, Vec3& v2, int depth, t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff);
 };
 
-#endif
+#endif

Code/CryEngine/RenderDll/Common/Memory/VRAMDrillerBus.h

@@ -90,4 +90,4 @@ namespace Render
 } // namespace Render
 
 #endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_MEMORY_VRAMDRILLERBUS_H
-#pragma once
+#pragma once

Code/CryEngine/RenderDll/Common/PostProcess/PostProcessUtils.cpp

@@ -685,4 +685,4 @@ Matrix44& SPostEffectsUtils::GetColorMatrix()
     return m_pColorMat;
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////////////

Code/CryEngine/RenderDll/Common/PostProcess/PostProcessUtils.h

@@ -309,4 +309,4 @@ private:
     static CTexture* m_UpscaleTarget;
 };
 
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_POSTPROCESS_POSTPROCESSUTILS_H
+#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_POSTPROCESS_POSTPROCESSUTILS_H

Code/CryEngine/RenderDll/Common/RendElements/AbstractMeshElement.cpp

@@ -71,4 +71,4 @@ void AbstractMeshElement::DrawMeshWireframe()
     gcpRendD3D->FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, nVertexBufferCount, 0, nIndexBufferCount);
 
     gcpRendD3D->FX_SetState(nState);
-}
+}

Code/CryEngine/RenderDll/Common/RendElements/CREDeferredShading.cpp

@@ -47,4 +47,4 @@ void CREDeferredShading::mfReset()
 
 void CREDeferredShading::mfActivate([[maybe_unused]] int iProcess)
 {
-}
+}

Code/CryEngine/RenderDll/Common/RendElements/CREGeomCache.cpp

@@ -240,4 +240,4 @@ bool CREGeomCache::GetGeometryInfo(SGeometryInfo &streams)
     return true;
 }
 
-#endif
+#endif

Code/CryEngine/RenderDll/Common/RendElements/CREHDRProcess.cpp

@@ -47,4 +47,4 @@ void CREHDRProcess::mfReset()
 
 void CREHDRProcess::mfActivate([[maybe_unused]] int iProcess)
 {
-}
+}

Code/CryEngine/RenderDll/Common/RendElements/OpticsFactory.cpp

@@ -58,4 +58,4 @@ IOpticsElementBase*  COpticsFactory::Create(EFlareType type) const
     default:
         return NULL;
     }
-}
+}

Code/CryEngine/RenderDll/Common/RendElements/OpticsPredef.hpp

@@ -74,4 +74,4 @@ public:
         static OpticsPredef instance;
         return &instance;
     }
-};
+};

Code/CryEngine/RenderDll/Common/RendElements/Utils/PolygonMath2D.cpp

@@ -850,4 +850,4 @@ EPolygonInCircle2D PolygonInCircle2D(const Vec2& center, const float radius, con
     }
 
     return state;
-}//-------------------------------------------------------------------------------------------------
+}//-------------------------------------------------------------------------------------------------

Code/CryEngine/RenderDll/Common/RendElements/Utils/PolygonMath2D.h

@@ -150,4 +150,4 @@ enum EPolygonInCircle2D
 
 EPolygonInCircle2D PolygonInCircle2D(const Vec2& center, const float radius, const Vec2* pPolygon, const int numPts);
 
-#endif // _POLYGON_MATH_2D_
+#endif // _POLYGON_MATH_2D_

Code/CryEngine/RenderDll/Common/RendElements/Utils/SpatialHashGrid.h

@@ -285,4 +285,4 @@ void CSpatialHashGrid<T, GridSize, BucketSize>::DebugDraw()
 #endif // !RELEASE
 
 #endif // GLASSCFG_USE_HASH_GRID
-#endif // _SPATIAL_HASH_GRID_
+#endif // _SPATIAL_HASH_GRID_

Code/CryEngine/RenderDll/Common/Shaders/ShaderStaticFlags.inl

@@ -19,4 +19,4 @@ FX_STATIC_FLAG(GMEM_RT_GREATER_FOUR)
 FX_STATIC_FLAG(NO_DEPTH_CLIPPING)
 FX_STATIC_FLAG(FEATURE_FETCH_DEPTHSTENCIL)
 FX_STATIC_FLAG(GMEM_VELOCITY_BUFFER)
-FX_STATIC_FLAG(GLES3_0)
+FX_STATIC_FLAG(GLES3_0)

Code/CryEngine/RenderDll/Common/Shaders/ShadersResourcesGroups/PerFrame.h

@@ -51,4 +51,4 @@ struct PerFrameParameters
     Vec4 m_VolumetricFogDistanceParams;
 };
 
-#endif // _PER_FRAME_RESOURCE_GROUP_
+#endif // _PER_FRAME_RESOURCE_GROUP_

Code/CryEngine/RenderDll/Common/Textures/PowerOf2BlockPacker.cpp

@@ -228,4 +228,4 @@ void CPowerOf2BlockPacker::FreeContainers()
     Clear();
     stl::free_container(m_Blocks);
     stl::free_container(m_BlockBitmap);
-}
+}

Code/CryEngine/RenderDll/Common/Textures/StereoTexture.cpp

@@ -43,4 +43,4 @@ void CStereoTexture::Apply(int nTUnit, int nState, int nTexMatSlot, int nSUnit,
     {
         AZ_Assert(true, "Invalid eye provided for rendering");
     }
-}
+}

Code/CryEngine/RenderDll/Common/Textures/StereoTexture.h

@@ -37,4 +37,4 @@ public:
     void Apply(int nTUnit, int nState = -1, int nTexMatSlot = EFTT_UNKNOWN, int nSUnit = -1, SResourceView::KeyType nResViewKey = SResourceView::DefaultView, EHWShaderClass eHWSC = eHWSC_Pixel) override;
     
     AZStd::vector<CTexture*> m_textures;
-};
+};