Main: RenderTarget - devirtualise detachDepthBuffer

OGRECave · Feb 3, 2025 · 6b856e2 · 6b856e2
1 parent c230ce6
commit 6b856e2
Show file tree

Hide file tree

Showing 14 changed files with 2 additions and 44 deletions.
diff --git a/OgreMain/include/OgreRenderTarget.h b/OgreMain/include/OgreRenderTarget.h
@@ -114,7 +114,7 @@ namespace Ogre {
         //Returns false if couldn't attach
         virtual bool attachDepthBuffer( DepthBuffer *depthBuffer );
 
-        virtual void detachDepthBuffer();
+        void detachDepthBuffer();
 
         /** Detaches DepthBuffer without notifying it from the detach.
             Useful when called from the DepthBuffer while it iterates through attached

diff --git a/OgreMain/src/OgreRenderTarget.cpp b/OgreMain/src/OgreRenderTarget.cpp
@@ -110,7 +110,7 @@ namespace Ogre {
         if( mDepthBuffer )
         {
             mDepthBuffer->_notifyRenderTargetDetached( this );
-            mDepthBuffer = 0;
+            _detachDepthBuffer();
         }
     }
 

diff --git a/RenderSystems/GL/include/OgreGLFBOMultiRenderTarget.h b/RenderSystems/GL/include/OgreGLFBOMultiRenderTarget.h
@@ -48,7 +48,6 @@ namespace Ogre {
 
         /// Override so we can attach the depth buffer to the FBO
         bool attachDepthBuffer( DepthBuffer *depthBuffer ) override;
-        void detachDepthBuffer() override;
         void _detachDepthBuffer() override;
     private:
         void bindSurfaceImpl(size_t attachment, RenderTexture *target) override;

diff --git a/RenderSystems/GL/include/OgreGLFBORenderTexture.h b/RenderSystems/GL/include/OgreGLFBORenderTexture.h
@@ -53,7 +53,6 @@ namespace Ogre {
 
         /// Override so we can attach the depth buffer to the FBO
         bool attachDepthBuffer( DepthBuffer *depthBuffer ) override;
-        void detachDepthBuffer() override;
         void _detachDepthBuffer() override;
 
         GLContext* getContext() const override { return mFB.getContext(); }

diff --git a/RenderSystems/GL/src/OgreGLFBOMultiRenderTarget.cpp b/RenderSystems/GL/src/OgreGLFBOMultiRenderTarget.cpp
@@ -83,12 +83,6 @@ namespace Ogre {
         return result;
     }
     //-----------------------------------------------------------------------------
-    void GLFBOMultiRenderTarget::detachDepthBuffer()
-    {
-        fbo.detachDepthBuffer();
-        MultiRenderTarget::detachDepthBuffer();
-    }
-    //-----------------------------------------------------------------------------
     void GLFBOMultiRenderTarget::_detachDepthBuffer()
     {
         fbo.detachDepthBuffer();

diff --git a/RenderSystems/GL/src/OgreGLFBORenderTexture.cpp b/RenderSystems/GL/src/OgreGLFBORenderTexture.cpp
@@ -83,12 +83,6 @@ namespace Ogre {
         return result;
     }
     //-----------------------------------------------------------------------------
-    void GLFBORenderTexture::detachDepthBuffer()
-    {
-        mFB.detachDepthBuffer();
-        GLRenderTexture::detachDepthBuffer();
-    }
-    //-----------------------------------------------------------------------------
     void GLFBORenderTexture::_detachDepthBuffer()
     {
         mFB.detachDepthBuffer();

diff --git a/RenderSystems/GL3Plus/include/OgreGL3PlusFBOMultiRenderTarget.h b/RenderSystems/GL3Plus/include/OgreGL3PlusFBOMultiRenderTarget.h
@@ -51,7 +51,6 @@ namespace Ogre {
 
         /// Override so we can attach the depth buffer to the FBO
         bool attachDepthBuffer( DepthBuffer *depthBuffer ) override;
-        void detachDepthBuffer() override;
         void _detachDepthBuffer() override;
     private:
         void bindSurfaceImpl(size_t attachment, RenderTexture *target) override;

diff --git a/RenderSystems/GL3Plus/include/OgreGL3PlusFBORenderTexture.h b/RenderSystems/GL3Plus/include/OgreGL3PlusFBORenderTexture.h
@@ -51,7 +51,6 @@ namespace Ogre {
 
         /// Override so we can attach the depth buffer to the FBO
         bool attachDepthBuffer( DepthBuffer *depthBuffer ) override;
-        void detachDepthBuffer() override;
         void _detachDepthBuffer() override;
 
         GLContext* getContext() const override { return mFB.getContext(); }

diff --git a/RenderSystems/GL3Plus/src/OgreGL3PlusFBOMultiRenderTarget.cpp b/RenderSystems/GL3Plus/src/OgreGL3PlusFBOMultiRenderTarget.cpp
@@ -82,12 +82,6 @@ namespace Ogre {
         return result;
     }
 
-    void GL3PlusFBOMultiRenderTarget::detachDepthBuffer()
-    {
-        fbo.detachDepthBuffer();
-        MultiRenderTarget::detachDepthBuffer();
-    }
-
     void GL3PlusFBOMultiRenderTarget::_detachDepthBuffer()
     {
         fbo.detachDepthBuffer();

diff --git a/RenderSystems/GL3Plus/src/OgreGL3PlusFBORenderTexture.cpp b/RenderSystems/GL3Plus/src/OgreGL3PlusFBORenderTexture.cpp
@@ -85,12 +85,6 @@ namespace Ogre {
         return result;
     }
 
-    void GL3PlusFBORenderTexture::detachDepthBuffer()
-    {
-        mFB.detachDepthBuffer();
-        GLRenderTexture::detachDepthBuffer();
-    }
-
     void GL3PlusFBORenderTexture::_detachDepthBuffer()
     {
         mFB.detachDepthBuffer();

diff --git a/RenderSystems/GLES2/include/OgreGLES2FBOMultiRenderTarget.h b/RenderSystems/GLES2/include/OgreGLES2FBOMultiRenderTarget.h
@@ -51,7 +51,6 @@ namespace Ogre {
 
         /// Override so we can attach the depth buffer to the FBO
         bool attachDepthBuffer( DepthBuffer *depthBuffer ) override;
-        void detachDepthBuffer() override;
         void _detachDepthBuffer() override;
     private:
         void bindSurfaceImpl(size_t attachment, RenderTexture *target) override;

diff --git a/RenderSystems/GLES2/include/OgreGLES2FBORenderTexture.h b/RenderSystems/GLES2/include/OgreGLES2FBORenderTexture.h
@@ -51,7 +51,6 @@ namespace Ogre {
 
         /// Override so we can attach the depth buffer to the FBO
         bool attachDepthBuffer( DepthBuffer *depthBuffer ) override;
-        void detachDepthBuffer() override;
         void _detachDepthBuffer() override;
 
         GLContext* getContext() const override { return mFB.getContext(); }

diff --git a/RenderSystems/GLES2/src/OgreGLES2FBOMultiRenderTarget.cpp b/RenderSystems/GLES2/src/OgreGLES2FBOMultiRenderTarget.cpp
@@ -82,12 +82,6 @@ namespace Ogre {
         return result;
     }
     //-----------------------------------------------------------------------------
-    void GLES2FBOMultiRenderTarget::detachDepthBuffer()
-    {
-        fbo.detachDepthBuffer();
-        MultiRenderTarget::detachDepthBuffer();
-    }
-    //-----------------------------------------------------------------------------
     void GLES2FBOMultiRenderTarget::_detachDepthBuffer()
     {
         fbo.detachDepthBuffer();

diff --git a/RenderSystems/GLES2/src/OgreGLES2FBORenderTexture.cpp b/RenderSystems/GLES2/src/OgreGLES2FBORenderTexture.cpp
@@ -97,12 +97,6 @@ namespace Ogre {
         return result;
     }
     //-----------------------------------------------------------------------------
-    void GLES2FBORenderTexture::detachDepthBuffer()
-    {
-        mFB.detachDepthBuffer();
-        GLRenderTexture::detachDepthBuffer();
-    }
-    //-----------------------------------------------------------------------------
     void GLES2FBORenderTexture::_detachDepthBuffer()
     {
         mFB.detachDepthBuffer();