Properly recreate Rectangle2D(v2) on device lost

OGRECave · Nov 20, 2024 · 759d2f8 · 759d2f8
1 parent 77084da
commit 759d2f8
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 21 deletions.
diff --git a/Components/Atmosphere/include/OgreAtmosphereNpr.h b/Components/Atmosphere/include/OgreAtmosphereNpr.h
@@ -32,6 +32,7 @@ THE SOFTWARE.
 
 #include "OgreAtmosphereComponent.h"
 #include "OgreColourValue.h"
+#include "OgreRenderSystem.h"
 #include "OgreSharedPtr.h"
 #include "OgreVector3.h"
 
@@ -59,7 +60,8 @@ namespace Ogre
 
         A PBR solution is iterative and requires more resources.
     */
-    class _OgreAtmosphereExport AtmosphereNpr final : public AtmosphereComponent
+    class _OgreAtmosphereExport AtmosphereNpr final : public AtmosphereComponent,
+                                                      public RenderSystem::Listener
     {
     public:
         struct Preset
@@ -202,6 +204,9 @@ namespace Ogre
         AtmosphereNpr( VaoManager *vaoManager );
         ~AtmosphereNpr() override;
 
+        /// @see RenderSystem::Listener
+        void eventOccurred( const String &eventName, const NameValuePairList *parameters ) override;
+
         void setSky( Ogre::SceneManager *sceneManager, bool bEnabled );
         void destroySky( Ogre::SceneManager *sceneManager );
 

diff --git a/Components/Atmosphere/src/OgreAtmosphereNpr.cpp b/Components/Atmosphere/src/OgreAtmosphereNpr.cpp
@@ -77,10 +77,14 @@ namespace Ogre
     {
         mHlmsBuffer = vaoManager->createConstBuffer( sizeof( AtmoSettingsGpu ), BT_DEFAULT, 0, false );
         createMaterial();
+
+        RenderSystem::addSharedListener( this );
     }
     //-------------------------------------------------------------------------
     AtmosphereNpr::~AtmosphereNpr()
     {
+        RenderSystem::removeSharedListener( this );
+
         std::map<Ogre::SceneManager *, Rectangle2D *>::const_iterator itor = mSkies.begin();
         std::map<Ogre::SceneManager *, Rectangle2D *>::const_iterator endt = mSkies.end();
 
@@ -90,7 +94,7 @@ namespace Ogre
                 itor->first->_setAtmosphere( nullptr );
 
             itor->second->detachFromParent();
-            OGRE_DELETE itor->second;
+            itor->first->destroyRectangle2D( itor->second );
 
             ++itor;
         }
@@ -109,6 +113,20 @@ namespace Ogre
         mHlmsBuffer = 0;
     }
     //-------------------------------------------------------------------------
+    void AtmosphereNpr::eventOccurred( const String &eventName, const NameValuePairList *parameters )
+    {
+        if( eventName == "DeviceLost" )
+        {
+            mVaoManager->destroyConstBuffer( mHlmsBuffer );
+            mHlmsBuffer = 0;
+        }
+        else if( eventName == "DeviceRestored" )
+        {
+            mHlmsBuffer =
+                mVaoManager->createConstBuffer( sizeof( AtmoSettingsGpu ), BT_DEFAULT, 0, false );
+        }
+    }
+    //-------------------------------------------------------------------------
     void AtmosphereNpr::createMaterial()
     {
         OGRE_ASSERT_LOW( !mMaterial );
@@ -226,9 +244,7 @@ namespace Ogre
         std::map<Ogre::SceneManager *, Rectangle2D *>::iterator itor = mSkies.find( sceneManager );
         if( itor == mSkies.end() )
         {
-            sky = OGRE_NEW Rectangle2D( Id::generateNewId<MovableObject>(),
-                                        &sceneManager->_getEntityMemoryManager( SCENE_STATIC ),
-                                        sceneManager );
+            sky = sceneManager->createRectangle2D( SCENE_STATIC );
             // We can't use BT_DYNAMIC_* because the scene may be rendered from multiple cameras
             // in the same frame, and dynamic supports only one set of values per frame
             sky->initialize( BT_DEFAULT,
@@ -259,7 +275,7 @@ namespace Ogre
         std::map<Ogre::SceneManager *, Rectangle2D *>::iterator itor = mSkies.find( sceneManager );
         if( itor != mSkies.end() )
         {
-            OGRE_DELETE itor->second;
+            sceneManager->destroyRectangle2D( itor->second );
             mSkies.erase( itor );
         }
     }

diff --git a/OgreMain/include/OgreRectangle2D2.h b/OgreMain/include/OgreRectangle2D2.h
@@ -81,6 +81,11 @@ namespace Ogre
         Rectangle2D( IdType id, ObjectMemoryManager *objectMemoryManager, SceneManager *manager );
         ~Rectangle2D() override;
 
+        /** @copydoc MovableObject::_releaseManualHardwareResources */
+        void _releaseManualHardwareResources() override;
+        /** @copydoc MovableObject::_restoreManualHardwareResources */
+        void _restoreManualHardwareResources() override;
+
         bool       isQuad() const;
         bool       isStereo() const;
         bool       hasNormals() const;

diff --git a/OgreMain/src/OgreRadialDensityMask.cpp b/OgreMain/src/OgreRadialDensityMask.cpp
@@ -65,9 +65,7 @@ namespace Ogre
     {
         memcpy( mRadius, radius, sizeof( mRadius ) );
 
-        mRectangle =
-            OGRE_NEW Rectangle2D( Id::generateNewId<MovableObject>(),
-                                  &sceneManager->_getEntityMemoryManager( SCENE_STATIC ), sceneManager );
+        mRectangle = sceneManager->createRectangle2D( SCENE_STATIC );
 
         mRectangle->setHollowRectRadius( mRadius[0] );
         mRectangle->setGeometry( mLeftEyeCenter, mRightEyeCenter );
@@ -142,7 +140,8 @@ namespace Ogre
         MaterialPtr material = mRectangle->getMaterial();
         MaterialManager::getSingleton().remove( material );
 
-        OGRE_DELETE mRectangle;
+        SceneManager *sceneManager = mRectangle->_getManager();
+        sceneManager->destroyRectangle2D( mRectangle );
         mRectangle = 0;
     }
     //-------------------------------------------------------------------------
@@ -224,10 +223,9 @@ namespace Ogre
             MaterialPtr material = mRectangle->getMaterial();
             SceneManager *sceneManager = mRectangle->_getManager();
 
-            OGRE_DELETE mRectangle;
-            mRectangle = OGRE_NEW Rectangle2D( Id::generateNewId<MovableObject>(),
-                                               &sceneManager->_getEntityMemoryManager( SCENE_STATIC ),
-                                               sceneManager );
+            sceneManager->destroyRectangle2D( mRectangle );
+            mRectangle = 0;
+            mRectangle = sceneManager->createRectangle2D( SCENE_STATIC );
 
             mRectangle->setHollowRectRadius( mRadius[0] );
             mRectangle->initialize(

diff --git a/OgreMain/src/OgreRectangle2D2.cpp b/OgreMain/src/OgreRectangle2D2.cpp
@@ -60,7 +60,9 @@ namespace Ogre
         mRenderables.push_back( this );
     }
     //-----------------------------------------------------------------------------------
-    Rectangle2D::~Rectangle2D()
+    Rectangle2D::~Rectangle2D() { _releaseManualHardwareResources(); }
+    //-----------------------------------------------------------------------------------
+    void Rectangle2D::_releaseManualHardwareResources()
     {
         VaoManager *vaoManager = mManager->getDestinationRenderSystem()->getVaoManager();
 
@@ -88,8 +90,11 @@ namespace Ogre
 
             ++itor;
         }
+        mVaoPerLod->clear();
     }
     //-----------------------------------------------------------------------------------
+    void Rectangle2D::_restoreManualHardwareResources() { createBuffers(); }
+    //-----------------------------------------------------------------------------------
     bool Rectangle2D::isQuad() const { return ( mGeometryFlags & GeometryFlagQuad ) != 0u; }
     //-----------------------------------------------------------------------------------
     bool Rectangle2D::isStereo() const { return ( mGeometryFlags & GeometryFlagStereo ) != 0u; }

diff --git a/OgreMain/src/OgreSceneManager.cpp b/OgreMain/src/OgreSceneManager.cpp
@@ -277,8 +277,11 @@ namespace Ogre
         mForwardPlusSystem = 0;
         mForwardPlusImpl = 0;
 
-        OGRE_DELETE mSky;
-        mSky = 0;
+        if( mSky )
+        {
+            destroyRectangle2D( mSky );
+            mSky = 0;
+        }
 
         OGRE_DELETE mRadialDensityMask;
         mRadialDensityMask = 0;
@@ -1080,8 +1083,7 @@ namespace Ogre
         {
             if( !mSky )
             {
-                mSky = OGRE_NEW Rectangle2D( Id::generateNewId<MovableObject>(),
-                                             &mEntityMemoryManager[SCENE_STATIC], this );
+                mSky = createRectangle2D( SCENE_STATIC );
                 // We can't use BT_DYNAMIC_* because the scene may be rendered from multiple cameras
                 // in the same frame, and dynamic supports only one set of values per frame
                 mSky->initialize( BT_DEFAULT,
@@ -1146,9 +1148,11 @@ namespace Ogre
         else
         {
             if( mSky )
+            {
                 mSky->detachFromParent();
-            OGRE_DELETE mSky;
-            mSky = 0;
+                destroyRectangle2D( mSky );
+                mSky = 0;
+            }
             if( mSkyMaterial )
             {
                 materialManager.remove( mSkyMaterial );