diff options
| author | sfan5 <sfan5@live.de> | 2022-05-21 15:19:57 +0200 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2022-05-21 15:26:38 +0200 |
| commit | 593103a26148b7154b159b9ae728fd53b4e7ca84 (patch) | |
| tree | e36f3a85315d090d050a681fab10f15c36ffd703 /source/Irrlicht/COpenGLDriver.cpp | |
| parent | 0732807cc8c52881287c53963b836b2fc445dd9f (diff) | |
| download | irrlicht-593103a26148b7154b159b9ae728fd53b4e7ca84.tar.xz | |
Refactor SDL device to use the same abstraction as other devices
In particular this makes the OpenGL procedure stuff work.
fixes https://github.com/minetest/minetest/issues/12265
Diffstat (limited to 'source/Irrlicht/COpenGLDriver.cpp')
| -rw-r--r-- | source/Irrlicht/COpenGLDriver.cpp | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/source/Irrlicht/COpenGLDriver.cpp b/source/Irrlicht/COpenGLDriver.cpp index c03ac34..8883a3e 100644 --- a/source/Irrlicht/COpenGLDriver.cpp +++ b/source/Irrlicht/COpenGLDriver.cpp @@ -20,10 +20,6 @@ #include "mt_opengl.h"
-#ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
-#include "CIrrDeviceSDL.h"
-#endif
-
namespace irr
{
namespace video
@@ -32,7 +28,6 @@ namespace video // Statics variables
const u16 COpenGLDriver::Quad2DIndices[4] = { 0, 1, 2, 3 };
-#if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_) || defined(_IRR_COMPILE_WITH_X11_DEVICE_) || defined(_IRR_COMPILE_WITH_OSX_DEVICE_)
COpenGLDriver::COpenGLDriver(const SIrrlichtCreationParameters& params, io::IFileSystem* io, IContextManager* contextManager)
: CNullDriver(io, params.WindowSize), COpenGLExtensionHandler(), CacheHandler(0), CurrentRenderMode(ERM_NONE), ResetRenderStates(true),
Transformation3DChanged(true), AntiAlias(params.AntiAlias), ColorFormat(ECF_R8G8B8), FixedPipelineState(EOFPS_ENABLE), Params(params),
@@ -42,23 +37,6 @@ COpenGLDriver::COpenGLDriver(const SIrrlichtCreationParameters& params, io::IFil setDebugName("COpenGLDriver");
#endif
}
-#endif
-
-#ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
-COpenGLDriver::COpenGLDriver(const SIrrlichtCreationParameters& params, io::IFileSystem* io, CIrrDeviceSDL* device)
- : CNullDriver(io, params.WindowSize), COpenGLExtensionHandler(), CacheHandler(0),
- CurrentRenderMode(ERM_NONE), ResetRenderStates(true), Transformation3DChanged(true),
- AntiAlias(params.AntiAlias), ColorFormat(ECF_R8G8B8), FixedPipelineState(EOFPS_ENABLE),
- Params(params), SDLDevice(device), ContextManager(0)
-{
-#ifdef _DEBUG
- setDebugName("COpenGLDriver");
-#endif
-
- genericDriverInit();
-}
-
-#endif
bool COpenGLDriver::initDriver()
{
@@ -267,11 +245,6 @@ bool COpenGLDriver::beginScene(u16 clearFlag, SColor clearColor, f32 clearDepth, if (ContextManager)
ContextManager->activateContext(videoData, true);
-#if defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
- if (SDLDevice)
- glFrontFace(GL_CW);
-#endif
-
clearBuffers(clearFlag, clearColor, clearDepth, clearStencil);
return true;
@@ -288,14 +261,6 @@ bool COpenGLDriver::endScene() if (ContextManager)
status = ContextManager->swapBuffers();
-#ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
- if (SDLDevice)
- {
- SDLDevice->SwapWindow();
- status = true;
- }
-#endif
-
// todo: console device present
return status;
@@ -4437,7 +4402,6 @@ namespace irr namespace video
{
-#if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_) || defined(_IRR_COMPILE_WITH_X11_DEVICE_) || defined(_IRR_COMPILE_WITH_OSX_DEVICE_)
IVideoDriver* createOpenGLDriver(const SIrrlichtCreationParameters& params, io::IFileSystem* io, IContextManager* contextManager)
{
#ifdef _IRR_COMPILE_WITH_OPENGL_
@@ -4454,22 +4418,6 @@ namespace video return 0;
#endif
}
-#endif
-
-// -----------------------------------
-// SDL VERSION
-// -----------------------------------
-#ifdef _IRR_COMPILE_WITH_SDL_DEVICE_
-IVideoDriver* createOpenGLDriver(const SIrrlichtCreationParameters& params,
- io::IFileSystem* io, CIrrDeviceSDL* device)
-{
-#ifdef _IRR_COMPILE_WITH_OPENGL_
- return new COpenGLDriver(params, io, device);
-#else
- return 0;
-#endif // _IRR_COMPILE_WITH_OPENGL_
-}
-#endif // _IRR_COMPILE_WITH_SDL_DEVICE_
} // end namespace
} // end namespace
|