minetest
/
irrlicht
mirror of https://github.com/minetest/irrlicht.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix OpenGL3 driver to compile standalone 

also test this configuration in CI
This commit is contained in:
sfan5 2023-04-06 12:07:53 +02:00
parent e850bd102a
commit ca5f005b74
8 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build.yml vendored
View File

@ -97,7 +97,7 @@ jobs:
- name: Build - name: Build
run: | 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 make -j2
- name: Test (headless) - name: Test (headless)
@ -124,7 +124,7 @@ jobs:
- name: Build - name: Build
run: | 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 make -j2
- name: Test (headless) - name: Test (headless)
@ -135,7 +135,7 @@ jobs:
- name: Test (Xvfb) - name: Test (Xvfb)
run: | run: |
cd bin/Linux cd bin/Linux
LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest gles2 LIBGL_ALWAYS_SOFTWARE=true xvfb-run ./AutomatedTest ogles2
win32: win32:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04

2
source/Irrlicht/CMakeLists.txt
View File

@ -260,7 +260,7 @@ endif()
if(ENABLE_GLES2) if(ENABLE_GLES2)
find_package(OpenGLES2 REQUIRED) find_package(OpenGLES2 REQUIRED)
endif() endif()
if(ENABLE_OPENGL) if(ENABLE_OPENGL OR ENABLE_OPENGL3)
set(OpenGL_GL_PREFERENCE "LEGACY") set(OpenGL_GL_PREFERENCE "LEGACY")
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
endif() endif()

3
source/Irrlicht/COpenGLCoreCacheHandler.h
View File

@ -6,8 +6,6 @@
#define __C_OGLCORE_CACHE_HANDLER_H_INCLUDED__ #define __C_OGLCORE_CACHE_HANDLER_H_INCLUDED__
#if defined(_IRR_COMPILE_WITH_OPENGL_) || defined(_IRR_COMPILE_WITH_OGLES1_) || defined(_IRR_COMPILE_WITH_OGLES2_)
#include "SMaterial.h" #include "SMaterial.h"
#include "ITexture.h" #include "ITexture.h"
@ -643,4 +641,3 @@ protected:
} }
#endif #endif
#endif

3
source/Irrlicht/COpenGLCoreFeature.h
View File

@ -6,8 +6,6 @@
#define __C_OGLCORE_FEATURE_H_INCLUDED__ #define __C_OGLCORE_FEATURE_H_INCLUDED__
#if defined(_IRR_COMPILE_WITH_OPENGL_) || defined(_IRR_COMPILE_WITH_OGLES1_) || defined(_IRR_COMPILE_WITH_OGLES2_)
#include "irrTypes.h" #include "irrTypes.h"
namespace irr namespace irr
@ -37,4 +35,3 @@ public:
} }
#endif #endif
#endif

3
source/Irrlicht/COpenGLCoreRenderTarget.h
View File

@ -6,8 +6,6 @@
#define __C_OGLCORE_RENDER_TARGET_H_INCLUDED__ #define __C_OGLCORE_RENDER_TARGET_H_INCLUDED__
#if defined(_IRR_COMPILE_WITH_OPENGL_) || defined(_IRR_COMPILE_WITH_OGLES1_) || defined(_IRR_COMPILE_WITH_OGLES2_)
#include "IRenderTarget.h" #include "IRenderTarget.h"
#ifndef GL_FRAMEBUFFER_INCOMPLETE_FORMATS #ifndef GL_FRAMEBUFFER_INCOMPLETE_FORMATS
@ -400,4 +398,3 @@ protected:
} }
#endif #endif
#endif

3
source/Irrlicht/COpenGLCoreTexture.h
View File

@ -6,8 +6,6 @@
#define __C_OGLCORE_TEXTURE_H_INCLUDED__ #define __C_OGLCORE_TEXTURE_H_INCLUDED__
#if defined(_IRR_COMPILE_WITH_OPENGL_) || defined(_IRR_COMPILE_WITH_OGLES1_) || defined(_IRR_COMPILE_WITH_OGLES2_)
#include "irrArray.h" #include "irrArray.h"
#include "SMaterialLayer.h" #include "SMaterialLayer.h"
#include "ITexture.h" #include "ITexture.h"
@ -666,4 +664,3 @@ protected:
} }
#endif #endif
#endif

4
source/Irrlicht/CSDLManager.cpp
View File

@ -4,7 +4,7 @@
#include "CSDLManager.h" #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 "CIrrDeviceSDL.h"
#include "COpenGLCommon.h" #include "COpenGLCommon.h"
@ -34,8 +34,6 @@ const SExposedVideoData& CSDLManager::getContext() const
bool CSDLManager::activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero) bool CSDLManager::activateContext(const SExposedVideoData& videoData, bool restorePrimaryOnZero)
{ {
// unclear if this is still needed:
glFrontFace(GL_CW);
return true; return true;
} }

2
source/Irrlicht/CSDLManager.h
View File

@ -6,7 +6,7 @@
#define __C_SDL_MANAGER_H_INCLUDED__ #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" #include "IContextManager.h"