diff --git a/OgreMain/include/OgreRenderTexture.h b/OgreMain/include/OgreRenderTexture.h index 0aa0fe89174..89eedd4ef3f 100644 --- a/OgreMain/include/OgreRenderTexture.h +++ b/OgreMain/include/OgreRenderTexture.h @@ -80,8 +80,7 @@ namespace Ogre - Not all bound surfaces have the same size - Not all bound surfaces have the same internal format */ - - virtual void bindSurface(size_t attachment, RenderTexture *target); + void bindSurface(size_t attachment, RenderTexture *target); /** Unbind attachment. */ diff --git a/RenderSystems/Direct3D11/src/OgreD3D11MultiRenderTarget.cpp b/RenderSystems/Direct3D11/src/OgreD3D11MultiRenderTarget.cpp index d672abb0645..30e35a6cacc 100644 --- a/RenderSystems/Direct3D11/src/OgreD3D11MultiRenderTarget.cpp +++ b/RenderSystems/Direct3D11/src/OgreD3D11MultiRenderTarget.cpp @@ -66,10 +66,7 @@ namespace Ogre if(mRenderTargets[y]->getWidth() != target->getWidth() || mRenderTargets[y]->getHeight() != target->getHeight()) { - OGRE_EXCEPT(Exception::ERR_INVALIDPARAMS, - "MultiRenderTarget surfaces are not of same size", - "D3D11MultiRenderTarget::bindSurface" - ); + OGRE_EXCEPT(Exception::ERR_INVALIDPARAMS, "MultiRenderTarget surfaces are not of same size"); } } diff --git a/RenderSystems/Direct3D9/src/OgreD3D9MultiRenderTarget.cpp b/RenderSystems/Direct3D9/src/OgreD3D9MultiRenderTarget.cpp index 4a6e4fdfc79..a41ce7caf91 100755 --- a/RenderSystems/Direct3D9/src/OgreD3D9MultiRenderTarget.cpp +++ b/RenderSystems/Direct3D9/src/OgreD3D9MultiRenderTarget.cpp @@ -70,21 +70,15 @@ namespace Ogre if (mRenderTargets[y]->getWidth() != buffer->getWidth() || mRenderTargets[y]->getHeight() != buffer->getHeight()) { - OGRE_EXCEPT( - Exception::ERR_INVALIDPARAMS, - "MultiRenderTarget surfaces are not of same size", - "D3D9MultiRenderTarget::bindSurface"); + OGRE_EXCEPT(Exception::ERR_INVALIDPARAMS, "MultiRenderTarget surfaces are not of same size"); } if (Root::getSingleton().getRenderSystem()->getCapabilities()->hasCapability(RSC_MRT_SAME_BIT_DEPTHS) && (PixelUtil::getNumElemBits(mRenderTargets[y]->getFormat()) != PixelUtil::getNumElemBits(buffer->getFormat()))) { - OGRE_EXCEPT( - Exception::ERR_INVALIDPARAMS, - "MultiRenderTarget surfaces are not of same bit depth and hardware requires it", - "D3D9MultiRenderTarget::bindSurface" - ); + OGRE_EXCEPT(Exception::ERR_INVALIDPARAMS, + "MultiRenderTarget surfaces are not of same bit depth and hardware requires it"); } } diff --git a/RenderSystems/Metal/src/OgreMetalMultiRenderTarget.mm b/RenderSystems/Metal/src/OgreMetalMultiRenderTarget.mm index bd2e677ea20..89b1bf15c8a 100644 --- a/RenderSystems/Metal/src/OgreMetalMultiRenderTarget.mm +++ b/RenderSystems/Metal/src/OgreMetalMultiRenderTarget.mm @@ -62,9 +62,7 @@ of this software and associated documentation files (the "Software"), to deal if( mWidth != target->getWidth() && mHeight != target->getHeight() && mFSAA != target->getFSAA() ) { - OGRE_EXCEPT( Exception::ERR_INVALIDPARAMS, - "MultiRenderTarget surfaces are not of same size", - "MetalMultiRenderTarget::bindSurface" ); + OGRE_EXCEPT(Exception::ERR_INVALIDPARAMS, "MultiRenderTarget surfaces are not of same size"); } }