Fix OpenGL3 driver to compile standalone

also test this configuration in CI

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2cf7d603b1f34a24d1d208c91de2cc5d30295e15..4ae889f4eda424956c37c1db4bf3d580da51be15 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -97,7 +97,7 @@ jobs:
 
       - name: Build
         run: |
-          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON -DENABLE_OPENGL3=ON
+          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON -DENABLE_OPENGL=OFF -DENABLE_OPENGL3=ON
           make -j2
 
       - name: Test (headless)
@@ -124,7 +124,7 @@ jobs:
 
       - name: Build
         run: |
-          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON -DENABLE_GLES2=ON
+          cmake . -DBUILD_EXAMPLES=1 -DUSE_SDL2=ON -DENABLE_OPENGL=OFF -DENABLE_GLES2=ON
           make -j2
 
       - name: Test (headless)
@@ -135,7 +135,7 @@ jobs:
       - name: Test (Xvfb)
         run: |
           cd bin/Linux
-          LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest gles2
+          LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest ogles2
 
   win32:
     runs-on: ubuntu-20.04

diff --git a/source/Irrlicht/CMakeLists.txt b/source/Irrlicht/CMakeLists.txt
index 686b0d2978292e5014ff366428519f80b8445f53..278622ba7ea0ed9a9bb155f91d07e6a6f257879d 100644 (file)
--- a/source/Irrlicht/CMakeLists.txt
+++ b/source/Irrlicht/CMakeLists.txt
@@ -260,7 +260,7 @@ endif()
 if(ENABLE_GLES2)
        find_package(OpenGLES2 REQUIRED)
 endif()
-if(ENABLE_OPENGL)
+if(ENABLE_OPENGL OR ENABLE_OPENGL3)
        set(OpenGL_GL_PREFERENCE "LEGACY")
        find_package(OpenGL REQUIRED)
 endif()

diff --git a/source/Irrlicht/COpenGLCoreCacheHandler.h b/source/Irrlicht/COpenGLCoreCacheHandler.h
index 79b280071a15149be02aa1234f1ef635a7195d41..ebe0a19314fc54bb9cc719c81c5d12beafb1bbaf 100644 (file)
--- a/source/Irrlicht/COpenGLCoreCacheHandler.h
+++ b/source/Irrlicht/COpenGLCoreCacheHandler.h
@@ -6,8 +6,6 @@
 #define __C_OGLCORE_CACHE_HANDLER_H_INCLUDED__\r
 \r
 \r
-#if defined(_IRR_COMPILE_WITH_OPENGL_) || defined(_IRR_COMPILE_WITH_OGLES1_) || defined(_IRR_COMPILE_WITH_OGLES2_)\r
-\r
 #include "SMaterial.h"\r
 #include "ITexture.h"\r
 \r
@@ -643,4 +641,3 @@ protected:
 }\r
 \r
 #endif\r
-#endif\r

diff --git a/source/Irrlicht/COpenGLCoreFeature.h b/source/Irrlicht/COpenGLCoreFeature.h
index fe86f95524c4e3c8935fd38f47bd4caad1db1301..fa930bd057f5ae442517bd6ad1beba5cc2f9aac4 100644 (file)
--- a/source/Irrlicht/COpenGLCoreFeature.h
+++ b/source/Irrlicht/COpenGLCoreFeature.h
@@ -6,8 +6,6 @@
 #define __C_OGLCORE_FEATURE_H_INCLUDED__\r
 \r
 \r
-#if defined(_IRR_COMPILE_WITH_OPENGL_) || defined(_IRR_COMPILE_WITH_OGLES1_) || defined(_IRR_COMPILE_WITH_OGLES2_)\r
-\r
 #include "irrTypes.h"\r
 \r
 namespace irr\r
@@ -37,4 +35,3 @@ public:
 }\r
 \r
 #endif\r
-#endif\r

diff --git a/source/Irrlicht/COpenGLCoreRenderTarget.h b/source/Irrlicht/COpenGLCoreRenderTarget.h
index f893c17416a64e90c062547db17eeda55ba69c72..f96fb87d2c184594e8bf0fe0a7f63aaa73d588dd 100644 (file)
--- a/source/Irrlicht/COpenGLCoreRenderTarget.h
+++ b/source/Irrlicht/COpenGLCoreRenderTarget.h
@@ -6,8 +6,6 @@
 #define __C_OGLCORE_RENDER_TARGET_H_INCLUDED__\r
 \r
 \r
-#if defined(_IRR_COMPILE_WITH_OPENGL_) || defined(_IRR_COMPILE_WITH_OGLES1_) || defined(_IRR_COMPILE_WITH_OGLES2_)\r
-\r
 #include "IRenderTarget.h"\r
 \r
 #ifndef GL_FRAMEBUFFER_INCOMPLETE_FORMATS\r
@@ -400,4 +398,3 @@ protected:
 }\r
 \r
 #endif\r
-#endif\r

diff --git a/source/Irrlicht/COpenGLCoreTexture.h b/source/Irrlicht/COpenGLCoreTexture.h
index 2ad8af128ebd12a4a34cf7affefd4fd3923d8087..15a827e96bd7ff71347b278af83acbabc510df00 100644 (file)
--- a/source/Irrlicht/COpenGLCoreTexture.h
+++ b/source/Irrlicht/COpenGLCoreTexture.h
@@ -6,8 +6,6 @@
 #define __C_OGLCORE_TEXTURE_H_INCLUDED__\r
 \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
 #include "ITexture.h"\r
@@ -666,4 +664,3 @@ protected:
 }\r
 \r
 #endif\r
-#endif\r

diff --git a/source/Irrlicht/CSDLManager.cpp b/source/Irrlicht/CSDLManager.cpp
index 3132b60a1600fb1b37f816adb6dcc7b1fa4e2ef9..b8c61a4d17f65a4ffc89c541b86e5a2ee2cd93b2 100644 (file)
--- a/source/Irrlicht/CSDLManager.cpp
+++ b/source/Irrlicht/CSDLManager.cpp
@@ -4,7 +4,7 @@
 
 #include "CSDLManager.h"
 
-#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && defined(_IRR_COMPILE_WITH_OPENGL_)
+#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
 
 #include "CIrrDeviceSDL.h"
 #include "COpenGLCommon.h"
@@ -34,8 +34,6 @@ const SExposedVideoData& CSDLManager::getContext() const
 
 bool CSDLManager::activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero)
 {
-       // unclear if this is still needed:
-       glFrontFace(GL_CW);
        return true;
 }
 

diff --git a/source/Irrlicht/CSDLManager.h b/source/Irrlicht/CSDLManager.h
index 3d9648c6099d20f3c845f438c51f99ef08b45dc4..f14724246dee90d3c9b08de29f5d401f7be6f93c 100644 (file)
--- a/source/Irrlicht/CSDLManager.h
+++ b/source/Irrlicht/CSDLManager.h
@@ -6,7 +6,7 @@
 #define __C_SDL_MANAGER_H_INCLUDED__
 
 
-#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && defined(_IRR_COMPILE_WITH_OPENGL_)
+#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
 
 #include "IContextManager.h"