D3D9: drop D3DPOOL_MANAGED for buffers & discard HBU_DETAIL_DISCARDABLE

D3DPOOL_MANAGED, does not give us anything after the multi-monitor
rework and is not available with D3D9Ex - thus only complicating code.

Consequently *_DISCARDABLE usage was only needed to punch through
D3DPOOL_MANAGED and is now gone too.

Author: paroj

OgreMain/include/OgreHardwareBuffer.h

@@ -120,34 +120,14 @@ namespace Ogre {
                 HBU_DYNAMIC = HBU_CPU_ONLY,
                 /// @deprecated use #HBU_DETAIL_WRITE_ONLY
                 HBU_WRITE_ONLY = HBU_DETAIL_WRITE_ONLY,
-                /** Indicates that the application will be refilling the contents
-                of the buffer regularly (not just updating, but generating the
-                contents from scratch), and therefore does not mind if the contents
-                of the buffer are lost somehow and need to be recreated. This
-                allows and additional level of optimisation on the buffer.
-                This option only really makes sense when combined with
-                #HBU_CPU_TO_GPU.
-                */
-                HBU_DETAIL_DISCARDABLE = 8,
-                /// @deprecated use HBU_DETAIL_DISCARDABLE
-                HBU_DISCARDABLE = HBU_DETAIL_DISCARDABLE,
+                /// @deprecated do not use
+                HBU_DISCARDABLE = 8,
                 /// same as #HBU_GPU_ONLY
                 HBU_STATIC_WRITE_ONLY = HBU_GPU_ONLY,
                 /// same as #HBU_CPU_TO_GPU
                 HBU_DYNAMIC_WRITE_ONLY = HBU_CPU_TO_GPU,
-                /** Indicates that the application replaces the entire contents of the buffer on an
-                 regular basis.
-                 Combination of #HBU_CPU_TO_GPU and #HBU_DETAIL_DISCARDABLE.
-
-                 By selecting this option, you
-                 free the system up from having to be concerned about losing the existing contents
-                 of the buffer at any time, because if it does lose them, you will be replacing them
-                 next frame anyway. On D3D9 this can make a significant performance
-                 difference, so you should try to use this whenever you have a buffer you need to
-                 update regularly. Note that if you create a buffer this way, you should use the
-                 HBL_DISCARD flag when locking the contents of it for writing.
-                 */
-                HBU_DYNAMIC_WRITE_ONLY_DISCARDABLE = HBU_CPU_TO_GPU | HBU_DETAIL_DISCARDABLE,
+                /// @deprecated do not use
+                HBU_DYNAMIC_WRITE_ONLY_DISCARDABLE = HBU_CPU_TO_GPU,
             };
             /// Locking options
             enum LockOptions

OgreMain/include/OgreTexture.h

@@ -57,8 +57,8 @@ namespace Ogre {
         TU_STATIC_WRITE_ONLY = HBU_GPU_ONLY,
         /// same as #HBU_CPU_TO_GPU
         TU_DYNAMIC_WRITE_ONLY = HBU_CPU_TO_GPU,
-        /// same as HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY_DISCARDABLE
-        TU_DYNAMIC_WRITE_ONLY_DISCARDABLE = HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY_DISCARDABLE,
+        /// @deprecated do not use
+        TU_DYNAMIC_WRITE_ONLY_DISCARDABLE = HBU_CPU_TO_GPU,
         /// Mipmaps will be automatically generated for this texture
         TU_AUTOMIPMAP = 0x10,
         /** This texture will be a render target, i.e. used as a target for render to texture

OgreMain/src/OgreVertexIndexData.cpp

@@ -461,9 +461,8 @@ namespace Ogre {
         for (unsigned short b = 0; b <= newDeclaration->getMaxSource(); ++b)
         {
             VertexDeclaration::VertexElementList destElems = newDeclaration->findElementsBySource(b);
-            // Initialise with most restrictive version 
-            // (not really a usable option, but these flags will be removed)
-            int final = HardwareBuffer::HBU_STATIC_WRITE_ONLY | HardwareBuffer::HBU_DETAIL_DISCARDABLE;
+            // Initialise with most restrictive version
+            int final = HardwareBuffer::HBU_STATIC_WRITE_ONLY;
             for (VertexElement& destelem : destElems)
             {
                 // get source
@@ -486,12 +485,6 @@ namespace Ogre {
                     // remove write only
                     final &= ~HBU_DETAIL_WRITE_ONLY;
                 }
-                if (!(srcbuf->getUsage() & HardwareBuffer::HBU_DETAIL_DISCARDABLE))
-                {
-                    // remove discardable
-                    final &= ~HardwareBuffer::HBU_DETAIL_DISCARDABLE;
-                }
-                
             }
             usages.push_back(static_cast<HardwareBuffer::Usage>(final));
         }

RenderSystems/Direct3D9/include/OgreD3D9Prerequisites.h

@@ -100,11 +100,6 @@ namespace Ogre
     typedef SharedPtr<D3D9HLSLProgram> D3D9HLSLProgramPtr;
     typedef SharedPtr<D3D9Texture>     D3D9TexturePtr;
 
-// Should we ask D3D to manage vertex/index buffers automatically?
-// Doing so avoids lost devices, but also has a performance impact
-// which is unacceptably bad when using very large buffers
-#define OGRE_D3D_MANAGE_BUFFERS 1
-
     //-------------------------------------------
     // Windows setttings
     //-------------------------------------------

RenderSystems/Direct3D9/src/OgreD3D9HardwareBufferManager.cpp

@@ -52,35 +52,6 @@ namespace Ogre {
         bool useShadowBuffer)
     {
         assert (numVerts > 0);
-#if OGRE_D3D_MANAGE_BUFFERS
-        // Override shadow buffer setting; managed buffers are automatically
-        // backed by system memory
-        // Don't override shadow buffer if discardable, since then we use
-        // unmanaged buffers for speed (avoids write-through overhead)
-        // Don't override if we use directX9EX, since then we don't have managed
-        // pool. And creating non-write only default pool causes a performance warning. 
-        if (useShadowBuffer && !(usage & HardwareBuffer::HBU_DETAIL_DISCARDABLE) &&
-            !D3D9RenderSystem::isDirectX9Ex())
-        {
-            useShadowBuffer = false;
-            // Also drop any WRITE_ONLY so we can read direct
-            if (usage == HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY)
-            {
-                usage = HardwareBuffer::HBU_DYNAMIC;
-            }
-            else if (usage == HardwareBuffer::HBU_STATIC_WRITE_ONLY)
-            {
-                usage = HardwareBuffer::HBU_STATIC;
-            }
-        }
-        //If we have write only buffers in DirectX9Ex we will turn on the discardable flag.
-        //Otherwise Ogre will operates in far less framerate
-        if (D3D9RenderSystem::isDirectX9Ex() && (usage & HBU_DETAIL_WRITE_ONLY))
-        {
-            usage = (HardwareBuffer::Usage)
-                ((unsigned int)usage | (unsigned int)HardwareBuffer::HBU_DETAIL_DISCARDABLE);
-        }
-#endif
         D3D9HardwareVertexBuffer* vbuf = OGRE_NEW D3D9HardwareVertexBuffer(
             this, vertexSize, numVerts, usage, useShadowBuffer);
         {
@@ -96,35 +67,6 @@ namespace Ogre {
         HardwareBuffer::Usage usage, bool useShadowBuffer)
     {
         assert (numIndexes > 0);
-#if OGRE_D3D_MANAGE_BUFFERS
-        // Override shadow buffer setting; managed buffers are automatically
-        // backed by system memory
-        // Don't override shadow buffer if discardable, since then we use
-        // unmanaged buffers for speed (avoids write-through overhead)
-        // Don't override if we use directX9EX, since then we don't have managed
-        // pool. And creating non-write only default pool causes a performance warning. 
-        if (useShadowBuffer && !(usage & HardwareBuffer::HBU_DETAIL_DISCARDABLE) &&
-            !D3D9RenderSystem::isDirectX9Ex())
-        {
-            useShadowBuffer = false;
-            // Also drop any WRITE_ONLY so we can read direct
-            if (usage == HardwareBuffer::HBU_DYNAMIC_WRITE_ONLY)
-            {
-                usage = HardwareBuffer::HBU_DYNAMIC;
-            }
-            else if (usage == HardwareBuffer::HBU_STATIC_WRITE_ONLY)
-            {
-                usage = HardwareBuffer::HBU_STATIC;
-            }
-        }
-        //If we have write only buffers in DirectX9Ex we will turn on the discardable flag.
-        //Otherwise Ogre will operates in far less framerate
-        if (D3D9RenderSystem::isDirectX9Ex() && (usage & HBU_DETAIL_WRITE_ONLY))
-        {
-            usage = (HardwareBuffer::Usage)
-                ((unsigned int)usage | (unsigned int)HardwareBuffer::HBU_DETAIL_DISCARDABLE);
-        }
-#endif
         D3D9HardwareIndexBuffer* idx = OGRE_NEW D3D9HardwareIndexBuffer(
             this, itype, numIndexes, usage, useShadowBuffer);
         {

RenderSystems/Direct3D9/src/OgreD3D9HardwareIndexBuffer.cpp

@@ -48,19 +48,8 @@ namespace Ogre {
    {
         D3D9_DEVICE_ACCESS_CRITICAL_SECTION
 
-        D3DPOOL eResourcePool;
-
-#if OGRE_D3D_MANAGE_BUFFERS
-        eResourcePool = usage == HBU_CPU_ONLY ? D3DPOOL_SYSTEMMEM :
-            // If not system mem, use managed pool UNLESS buffer is discardable
-            // if discardable, keeping the software backing is expensive
-            ((usage & HardwareBuffer::HBU_DETAIL_DISCARDABLE) || (D3D9RenderSystem::isDirectX9Ex())) ? D3DPOOL_DEFAULT : D3DPOOL_MANAGED;
-#else
-        eResourcePool = usage == HBU_CPU_ONLY ? D3DPOOL_SYSTEMMEM : D3DPOOL_DEFAULT;
-#endif
-
         // Set the desired memory pool.
-        mBufferDesc.Pool = eResourcePool;
+        mBufferDesc.Pool = usage == HBU_CPU_ONLY ? D3DPOOL_SYSTEMMEM : D3DPOOL_DEFAULT;
 
         // Set source buffer to NULL.
         mSourceBuffer = NULL;

RenderSystems/Direct3D9/src/OgreD3D9HardwareVertexBuffer.cpp

@@ -48,19 +48,8 @@ namespace Ogre {
     {
         D3D9_DEVICE_ACCESS_CRITICAL_SECTION
 
-        D3DPOOL eResourcePool;
-               
-#if OGRE_D3D_MANAGE_BUFFERS
-        eResourcePool = usage == HBU_CPU_ONLY ? D3DPOOL_SYSTEMMEM :
-            // If not system mem, use managed pool UNLESS buffer is discardable
-            // if discardable, keeping the software backing is expensive
-            ((usage & HardwareBuffer::HBU_DETAIL_DISCARDABLE) || (D3D9RenderSystem::isDirectX9Ex())) ? D3DPOOL_DEFAULT : D3DPOOL_MANAGED;
-#else
-        eResourcePool = usage == HBU_CPU_ONLY ? D3DPOOL_SYSTEMMEM : D3DPOOL_DEFAULT;
-#endif              
-
         // Set the desired memory pool.
-        mBufferDesc.Pool = eResourcePool;
+        mBufferDesc.Pool = usage == HBU_CPU_ONLY ? D3DPOOL_SYSTEMMEM : D3DPOOL_DEFAULT;
 
         // Set source buffer to NULL.
         mSourceBuffer = NULL;

RenderSystems/Direct3D9/src/OgreD3D9Mappings.cpp

@@ -468,14 +468,7 @@ namespace Ogre
         DWORD ret = 0;
         if (usage & HardwareBuffer::HBU_DYNAMIC)
         {
-#if OGRE_D3D_MANAGE_BUFFERS
-            // Only add the dynamic flag for default pool, and
-            // we use default pool when buffer is discardable
-            if (usage & HardwareBuffer::HBU_DETAIL_DISCARDABLE)
-                ret |= D3DUSAGE_DYNAMIC;
-#else
             ret |= D3DUSAGE_DYNAMIC;
-#endif
         }
         if (usage & HBU_DETAIL_WRITE_ONLY)
         {
@@ -489,16 +482,9 @@ namespace Ogre
         DWORD ret = 0;
         if (options == HardwareBuffer::HBL_DISCARD)
         {
-#if OGRE_D3D_MANAGE_BUFFERS
-            // Only add the discard flag for dynamic usgae and default pool
-            if ((usage & HardwareBuffer::HBU_DYNAMIC) &&
-                (usage & HardwareBuffer::HBU_DETAIL_DISCARDABLE))
-                ret |= D3DLOCK_DISCARD;
-#else
             // D3D doesn't like discard or no_overwrite on non-dynamic buffers
             if (usage & HardwareBuffer::HBU_DYNAMIC)
                 ret |= D3DLOCK_DISCARD;
-#endif
         }
         if (options == HardwareBuffer::HBL_READ_ONLY)
         {
@@ -511,16 +497,9 @@ namespace Ogre
         }
         if (options == HardwareBuffer::HBL_NO_OVERWRITE)
         {
-#if OGRE_D3D_MANAGE_BUFFERS
-            // Only add the nooverwrite flag for dynamic usgae and default pool
-            if ((usage & HardwareBuffer::HBU_DYNAMIC) &&
-                (usage & HardwareBuffer::HBU_DETAIL_DISCARDABLE))
-                ret |= D3DLOCK_NOOVERWRITE;
-#else
             // D3D doesn't like discard or no_overwrite on non-dynamic buffers
             if (usage & HardwareBuffer::HBU_DYNAMIC)
                 ret |= D3DLOCK_NOOVERWRITE;
-#endif 
         }
 
         return ret;

RenderSystems/Direct3D9/src/OgreD3D9RenderSystem.cpp

@@ -430,7 +430,7 @@ namespace Ogre
         optMultiDeviceMemHint.name = "Multi device memory hint";
         optMultiDeviceMemHint.possibleValues.push_back("Use minimum system memory");
         optMultiDeviceMemHint.possibleValues.push_back("Auto hardware buffers management");
-        optMultiDeviceMemHint.currentValue = "Use minimum system memory";
+        optMultiDeviceMemHint.currentValue = optMultiDeviceMemHint.possibleValues[1];
         optMultiDeviceMemHint.immutable = false;
 
         optEnableFixedPipeline.name = "Fixed Pipeline Enabled";

RenderSystems/Metal/src/OgreMetalHardwareBufferCommon.mm

@@ -65,7 +65,7 @@ of this software and associated documentation files (the "Software"), to deal
             resourceOptions |= MTLResourceStorageModeShared;
         }
 
-        if( !(usage & HardwareBuffer::HBU_DETAIL_DISCARDABLE) )
+        if( true )
         {
             mBuffer = [mDevice->mDevice newBufferWithLength:alignToNextMultiple( sizeBytes, 4u )
                                                     options:resourceOptions];