Drop obsolete stuff

diff --git a/source/Irrlicht/OpenGL/Driver.cpp b/source/Irrlicht/OpenGL/Driver.cpp
index 5e697e54fe0044de049d7b2b7d8154569c1769db..eb4150c5554d61a391f6bbbe85518d1f0d332c04 100644 (file)
--- a/source/Irrlicht/OpenGL/Driver.cpp
+++ b/source/Irrlicht/OpenGL/Driver.cpp
@@ -2133,38 +2133,6 @@ COpenGL3Driver::~COpenGL3Driver()
                return blendTable[factor];\r
        }\r
 \r
-       GLenum COpenGL3Driver::getZBufferBits() const\r
-       {\r
-               // TODO: never used, so not sure what this was really about (zbuffer used by device? Or for RTT's?)\r
-\r
-               GLenum bits = 0;\r
-\r
-               switch (Params.ZBufferBits)\r
-               {\r
-               case 24:\r
-#if defined(GL_OES_depth24)\r
-                       if (queryGLESFeature(COGLESCoreExtensionHandler::IRR_GL_OES_depth24))\r
-                               bits = GL_DEPTH_COMPONENT24_OES;\r
-                       else\r
-#endif\r
-                               bits = GL_DEPTH_COMPONENT16;\r
-                       break;\r
-               case 32:\r
-#if defined(GL_OES_depth32)\r
-                       if (queryGLESFeature(COGLESCoreExtensionHandler::IRR_GL_OES_depth32))\r
-                               bits = GL_DEPTH_COMPONENT32_OES;\r
-                       else\r
-#endif\r
-                               bits = GL_DEPTH_COMPONENT16;\r
-                       break;\r
-               default:\r
-                       bits = GL_DEPTH_COMPONENT16;\r
-                       break;\r
-               }\r
-\r
-               return bits;\r
-       }\r
-\r
        bool COpenGL3Driver::getColorFormatParameters(ECOLOR_FORMAT format, GLint& internalFormat, GLenum& pixelFormat,\r
                GLenum& pixelType, void(**converter)(const void*, s32, void*)) const\r
        {\r
@@ -2212,16 +2180,12 @@ COpenGL3Driver::~COpenGL3Driver()
                        pixelFormat = GL_RGBA;\r
                        pixelType = GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;\r
                        break;\r
-#endif\r
-#ifdef GL_EXT_texture_compression_s3tc\r
                case ECF_DXT2:\r
                case ECF_DXT3:\r
                        supported = true;\r
                        pixelFormat = GL_RGBA;\r
                        pixelType = GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;\r
                        break;\r
-#endif\r
-#ifdef GL_EXT_texture_compression_s3tc\r
                case ECF_DXT4:\r
                case ECF_DXT5:\r
                        supported = true;\r
@@ -2229,48 +2193,6 @@ COpenGL3Driver::~COpenGL3Driver()
                        pixelType = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;\r
                        break;\r
 #endif\r
-#ifdef GL_IMG_texture_compression_pvrtc\r
-               case ECF_PVRTC_RGB2:\r
-                       supported = true;\r
-                       pixelFormat = GL_RGB;\r
-                       pixelType = GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG;\r
-                       break;\r
-#endif\r
-#ifdef GL_IMG_texture_compression_pvrtc\r
-               case ECF_PVRTC_ARGB2:\r
-                       supported = true;\r
-                       pixelFormat = GL_RGBA;\r
-                       pixelType = GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG;\r
-                       break;\r
-#endif\r
-#ifdef GL_IMG_texture_compression_pvrtc\r
-               case ECF_PVRTC_RGB4:\r
-                       supported = true;\r
-                       pixelFormat = GL_RGB;\r
-                       pixelType = GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG;\r
-                       break;\r
-#endif\r
-#ifdef GL_IMG_texture_compression_pvrtc\r
-               case ECF_PVRTC_ARGB4:\r
-                       supported = true;\r
-                       pixelFormat = GL_RGBA;\r
-                       pixelType = GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG;\r
-                       break;\r
-#endif\r
-#ifdef GL_IMG_texture_compression_pvrtc2\r
-               case ECF_PVRTC2_ARGB2:\r
-                       supported = true;\r
-                       pixelFormat = GL_RGBA;\r
-                       pixelType = GL_COMPRESSED_RGBA_PVRTC_2BPPV2_IMG;\r
-                       break;\r
-#endif\r
-#ifdef GL_IMG_texture_compression_pvrtc2\r
-               case ECF_PVRTC2_ARGB4:\r
-                       supported = true;\r
-                       pixelFormat = GL_RGBA;\r
-                       pixelType = GL_COMPRESSED_RGBA_PVRTC_4BPPV2_IMG;\r
-                       break;\r
-#endif\r
 #ifdef GL_OES_compressed_ETC1_RGB8_texture\r
                case ECF_ETC1:\r
                        supported = true;\r

diff --git a/source/Irrlicht/OpenGL/Driver.h b/source/Irrlicht/OpenGL/Driver.h
index dc2929738812c7825be08e9a2cfa03a9498458f9..b73259548b47f4758c5abf28129cdb3aed53dd3c 100644 (file)
--- a/source/Irrlicht/OpenGL/Driver.h
+++ b/source/Irrlicht/OpenGL/Driver.h
@@ -273,9 +273,6 @@ namespace video
                //! Convert E_BLEND_FACTOR to OpenGL equivalent\r
                GLenum getGLBlend(E_BLEND_FACTOR factor) const;\r
 \r
-               //! Get ZBuffer bits.\r
-               virtual GLenum getZBufferBits() const;\r
-\r
                virtual bool getColorFormatParameters(ECOLOR_FORMAT format, GLint& internalFormat, GLenum& pixelFormat,\r
                        GLenum& pixelType, void(**converter)(const void*, s32, void*)) const;\r
 \r