D3D11: _create2DTex() with mSurface.

OGRECave · Jan 14, 2025 · 520d211 · 520d211
1 parent 7cd7063
commit 520d211
Show file tree

Hide file tree

Showing 6 changed files with 521 additions and 610 deletions.
diff --git a/OgreMain/include/OgreTexture.h b/OgreMain/include/OgreTexture.h
@@ -109,8 +109,6 @@ namespace Ogre {
         TEX_TYPE_2D_ARRAY = 5,
         /// GLES2 only OES texture type
         TEX_TYPE_EXTERNAL_OES = 6,
-        /// 2D texture, used when you already have a surface
-        TEX_TYPE_2D_WITH_SURFACE = 7
     };
 
     /** Enum identifying special mipmap numbers
@@ -150,7 +148,7 @@ namespace Ogre {
 
         /** Sets the surface when you already have one
          */
-        void setSurface(void* surface) { mSurface = surface; }
+        virtual void _setSurface(void* surface) { mSurface = surface; }
 
         /** Gets the surface
          */

diff --git a/OgreMain/include/OgreTextureManager.h b/OgreMain/include/OgreTextureManager.h
@@ -262,13 +262,7 @@ namespace Ogre {
             TextureType texType, uint width, uint height, uint depth, 
             int numMipmaps, PixelFormat format, int usage = TU_DEFAULT, ManualResourceLoader* loader = 0,
             bool hwGammaCorrection = false, uint fsaa = 0, const String& fsaaHint = BLANKSTRING);
-
-        TexturePtr createManualWithSurface(const String& name, const String& group, TextureType texType, uint width,
-                                           uint height, uint depth, int numMipmaps, PixelFormat format,
-                                           int usage = TU_DEFAULT, void* surface = nullptr,
-                                           ManualResourceLoader* loader = 0, bool hwGammaCorrection = false,
-                                           uint fsaa = 0, const String& fsaaHint = BLANKSTRING);
-
+
         /** @overload
         */
         TexturePtr createManual(const String & name, const String& group,
@@ -278,18 +272,7 @@ namespace Ogre {
         {
             return createManual(name, group, texType, width, height, 1, 
                 numMipmaps, format, usage, loader, hwGammaCorrection, fsaa, fsaaHint);
-        }
-
-        TexturePtr createManualWithSurface(const String& name, const String& group, TextureType texType, uint width,
-                                           uint height, int numMipmaps, PixelFormat format, int usage = TU_DEFAULT,
-                                           void* surface = nullptr, ManualResourceLoader* loader = 0,
-                                           bool hwGammaCorrection = false, uint fsaa = 0,
-                                           const String& fsaaHint = BLANKSTRING)
-        {
-            return createManualWithSurface(name, group, texType, width, height, 1, numMipmaps, format, usage, surface,
-                                           loader, hwGammaCorrection, fsaa, fsaaHint);
-        }
-
+        }        
         /** Sets preferred bit depth for integer pixel format textures.
         @param
             bits Number of bits. Available values: 0, 16 and 32, where 0 (the default) means keep

diff --git a/OgreMain/src/OgreTextureManager.cpp b/OgreMain/src/OgreTextureManager.cpp
@@ -216,41 +216,6 @@ namespace Ogre {
         return ret;
     }
     //-----------------------------------------------------------------------
-    TexturePtr TextureManager::createManualWithSurface(const String& name, const String& group, TextureType texType,
-                                                       uint width, uint height, uint depth, int numMipmaps,
-                                                       PixelFormat format, int usage, void* surface,
-                                                       ManualResourceLoader* loader, bool hwGamma, uint fsaa,
-                                                       const String& fsaaHint)
-    {
-        TexturePtr ret;
-
-        OgreAssert(width && height && depth, "total size of texture must not be zero");
-
-        // Check for texture support
-        const auto caps = Root::getSingleton().getRenderSystem()->getCapabilities();
-        if (((texType == TEX_TYPE_3D) && !caps->hasCapability(RSC_TEXTURE_3D)) ||
-            ((texType == TEX_TYPE_2D_ARRAY) && !caps->hasCapability(RSC_TEXTURE_2D_ARRAY)))
-            return ret;
-
-        ret = create(name, group, true, loader);
-
-        if (!ret)
-            return ret;
-
-        ret->setSurface(surface);
-        ret->setTextureType(texType);
-        ret->setWidth(width);
-        ret->setHeight(height);
-        ret->setDepth(depth);
-        ret->setNumMipmaps((numMipmaps == MIP_DEFAULT) ? mDefaultNumMipmaps : static_cast<uint32>(numMipmaps));
-        ret->setFormat(format);
-        ret->setUsage(usage);
-        ret->setHardwareGammaEnabled(hwGamma);
-        ret->setFSAA(fsaa, fsaaHint);
-        ret->createInternalResources();
-        return ret;
-    }
-    //-----------------------------------------------------------------------
     void TextureManager::setPreferredIntegerBitDepth(ushort bits, bool reloadTextures)
     {
         mPreferredIntegerBitDepth = bits;

diff --git a/RenderSystems/Direct3D11/include/OgreD3D11Texture.h b/RenderSystems/Direct3D11/include/OgreD3D11Texture.h
@@ -93,9 +93,7 @@ namespace Ogre {
         /// internal method, create a blank normal 1D Dtexture
         void _create1DTex();
         /// internal method, create a blank normal 2D texture
-        void _create2DTex();
-        /// internal method, use a normal 2D texture
-        void _create2DTexWithSurface();
+        void _create2DTex();       
         /// internal method, create a blank cube texture
         void _create3DTex();
 

diff --git a/RenderSystems/Direct3D11/src/OgreD3D11HardwarePixelBuffer.cpp b/RenderSystems/Direct3D11/src/OgreD3D11HardwarePixelBuffer.cpp
@@ -52,7 +52,6 @@ namespace Ogre {
 			case TEX_TYPE_1D:                       return "1D texture";
 			case TEX_TYPE_CUBE_MAP:                 return "cube map texture";
 			case TEX_TYPE_2D:                       return "2D texture";
-			case TEX_TYPE_2D_WITH_SURFACE:          return "2D texture with surface";
 			case TEX_TYPE_2D_ARRAY:                 return "2D texture array";
 			case TEX_TYPE_3D:                       return "3D texture";
 			default:                                return "texture";
@@ -482,7 +481,6 @@ namespace Ogre {
             }                   
             break;
         case TEX_TYPE_2D:
-        case TEX_TYPE_2D_WITH_SURFACE:
         case TEX_TYPE_CUBE_MAP:
         case TEX_TYPE_2D_ARRAY:
             {