Fix OpenGL3 driver to compile standalone

[irrlicht.git] / source / Irrlicht / COpenGLCoreTexture.h

diff --git a/source/Irrlicht/COpenGLCoreTexture.h b/source/Irrlicht/COpenGLCoreTexture.h
index 19ab06b2d743be2348f206019763fd6bedccee70..15a827e96bd7ff71347b278af83acbabc510df00 100644 (file)
--- a/source/Irrlicht/COpenGLCoreTexture.h
+++ b/source/Irrlicht/COpenGLCoreTexture.h
@@ -5,9 +5,6 @@
 #ifndef __C_OGLCORE_TEXTURE_H_INCLUDED__\r
 #define __C_OGLCORE_TEXTURE_H_INCLUDED__\r
 \r
-#include "IrrCompileConfig.h"\r
-\r
-#if defined(_IRR_COMPILE_WITH_OPENGL_) || defined(_IRR_COMPILE_WITH_OGLES1_) || defined(_IRR_COMPILE_WITH_OGLES2_)\r
 \r
 #include "irrArray.h"\r
 #include "SMaterialLayer.h"\r
@@ -82,7 +79,7 @@ public:
                                {\r
                                        if ( OriginalSize == Size && OriginalColorFormat == ColorFormat )\r
                                        {\r
-                                               Images[i]->setMipMapsData( images[i]->getMipMapsData(), false, true);\r
+                                               Images[i]->setMipMapsData( images[i]->getMipMapsData(), false);\r
                                        }\r
                                        else\r
                                        {\r
@@ -434,9 +431,6 @@ public:
                else\r
                {\r
 #ifdef IRR_OPENGL_HAS_glGenerateMipmap\r
-       #if !defined(IRR_COMPILE_GLES2_COMMON)\r
-                       glEnable(GL_TEXTURE_2D);        // Hack some ATI cards need this glEnable according to https://www.khronos.org/opengl/wiki/Common_Mistakes\r
-       #endif\r
                        Driver->irrGlGenerateMipmap(TextureType);\r
 #endif\r
                }\r
@@ -670,4 +664,3 @@ protected:
 }\r
 \r
 #endif\r
-#endif\r