Support GLES2

diff --git a/source/Irrlicht/COpenGLCoreRenderTarget.h b/source/Irrlicht/COpenGLCoreRenderTarget.h
index 7dff3c9276569e9f1274819503c0bf6787f7a37f..f893c17416a64e90c062547db17eeda55ba69c72 100644 (file)
--- a/source/Irrlicht/COpenGLCoreRenderTarget.h
+++ b/source/Irrlicht/COpenGLCoreRenderTarget.h
@@ -10,6 +10,14 @@
 \r
 #include "IRenderTarget.h"\r
 \r
+#ifndef GL_FRAMEBUFFER_INCOMPLETE_FORMATS\r
+#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT\r
+#endif\r
+\r
+#ifndef GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS\r
+#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT\r
+#endif\r
+\r
 namespace irr\r
 {\r
 namespace video\r
@@ -351,10 +359,10 @@ protected:
                        case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:\r
                                os::Printer::log("FBO has one or several incomplete image attachments", ELL_ERROR);\r
                                break;\r
-                       case GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT:\r
+                       case GL_FRAMEBUFFER_INCOMPLETE_FORMATS:\r
                                os::Printer::log("FBO has one or several image attachments with different internal formats", ELL_ERROR);\r
                                break;\r
-                       case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT:\r
+                       case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS:\r
                                os::Printer::log("FBO has one or several image attachments with different dimensions", ELL_ERROR);\r
                                break;\r
                        case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:\r

diff --git a/source/Irrlicht/COpenGLCoreTexture.h b/source/Irrlicht/COpenGLCoreTexture.h
index c19215b85e73a57fd5ed6b9ba4c990ca9edfd40e..2ad8af128ebd12a4a34cf7affefd4fd3923d8087 100644 (file)
--- a/source/Irrlicht/COpenGLCoreTexture.h
+++ b/source/Irrlicht/COpenGLCoreTexture.h
@@ -433,9 +433,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