From 142bca65781430df5e2bad2ebad2482de5e603a5 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Tue, 31 Mar 2020 16:11:31 +0100 Subject: [PATCH] Split SDL2 code from Draw.cpp --- src/Backends/Rendering/OpenGL3.cpp | 7 +++++++ src/Backends/Rendering/SDLSurface.cpp | 8 ++++++++ src/Backends/Rendering/SDLTexture.cpp | 7 +++++++ src/Backends/Rendering/Software.cpp | 8 ++++++++ src/Draw.cpp | 9 --------- 5 files changed, 30 insertions(+), 9 deletions(-) diff --git a/src/Backends/Rendering/OpenGL3.cpp b/src/Backends/Rendering/OpenGL3.cpp index 53d07fa8..4bdb524c 100644 --- a/src/Backends/Rendering/OpenGL3.cpp +++ b/src/Backends/Rendering/OpenGL3.cpp @@ -518,6 +518,13 @@ static void GlyphBatch_DestroyTexture(SPRITEBATCH_U64 texture_id, void *udata) Backend_Surface* Backend_Init(const char *window_title, int screen_width, int screen_height, BOOL fullscreen) { + puts("Available SDL2 video drivers:"); + + for (int i = 0; i < SDL_GetNumVideoDrivers(); ++i) + puts(SDL_GetVideoDriver(i)); + + printf("Selected SDL2 video driver: %s\n", SDL_GetCurrentVideoDriver()); + #ifdef USE_OPENGLES2 SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES); SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, 0); diff --git a/src/Backends/Rendering/SDLSurface.cpp b/src/Backends/Rendering/SDLSurface.cpp index 689f24ff..8adfb4c8 100644 --- a/src/Backends/Rendering/SDLSurface.cpp +++ b/src/Backends/Rendering/SDLSurface.cpp @@ -1,6 +1,7 @@ #include "../Rendering.h" #include +#include #include #include "SDL.h" @@ -43,6 +44,13 @@ static void RectToSDLRect(const RECT *rect, SDL_Rect *sdl_rect) Backend_Surface* Backend_Init(const char *window_title, int screen_width, int screen_height, BOOL fullscreen) { + puts("Available SDL2 video drivers:"); + + for (int i = 0; i < SDL_GetNumVideoDrivers(); ++i) + puts(SDL_GetVideoDriver(i)); + + printf("Selected SDL2 video driver: %s\n", SDL_GetCurrentVideoDriver()); + window = SDL_CreateWindow(window_title, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, screen_width, screen_height, 0); if (window != NULL) diff --git a/src/Backends/Rendering/SDLTexture.cpp b/src/Backends/Rendering/SDLTexture.cpp index add26dc6..57b32da5 100644 --- a/src/Backends/Rendering/SDLTexture.cpp +++ b/src/Backends/Rendering/SDLTexture.cpp @@ -116,6 +116,13 @@ static void GlyphBatch_DestroyTexture(SPRITEBATCH_U64 texture_id, void *udata) Backend_Surface* Backend_Init(const char *window_title, int screen_width, int screen_height, BOOL fullscreen) { + puts("Available SDL2 video drivers:"); + + for (int i = 0; i < SDL_GetNumVideoDrivers(); ++i) + puts(SDL_GetVideoDriver(i)); + + printf("Selected SDL2 video driver: %s\n", SDL_GetCurrentVideoDriver()); + puts("Available SDL2 render drivers:"); for (int i = 0; i < SDL_GetNumRenderDrivers(); ++i) diff --git a/src/Backends/Rendering/Software.cpp b/src/Backends/Rendering/Software.cpp index 17666c27..8b6a3c08 100644 --- a/src/Backends/Rendering/Software.cpp +++ b/src/Backends/Rendering/Software.cpp @@ -1,6 +1,7 @@ #include "../Rendering.h" #include +#include #include #include @@ -38,6 +39,13 @@ static Backend_Surface *glyph_destination_surface; Backend_Surface* Backend_Init(const char *window_title, int screen_width, int screen_height, BOOL fullscreen) { + puts("Available SDL2 video drivers:"); + + for (int i = 0; i < SDL_GetNumVideoDrivers(); ++i) + puts(SDL_GetVideoDriver(i)); + + printf("Selected SDL2 video driver: %s\n", SDL_GetCurrentVideoDriver()); + window = SDL_CreateWindow(window_title, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, screen_width, screen_height, 0); if (window != NULL) diff --git a/src/Draw.cpp b/src/Draw.cpp index b4e8e01f..e723afad 100644 --- a/src/Draw.cpp +++ b/src/Draw.cpp @@ -5,8 +5,6 @@ #include #include -#include "SDL.h" - #include "WindowsWrapper.h" #include "Backends/Rendering.h" @@ -87,13 +85,6 @@ BOOL Flip_SystemTask(void) BOOL StartDirectDraw(const char *title, int width, int height, int lMagnification) { - puts("Available SDL2 video drivers:"); - - for (int i = 0; i < SDL_GetNumVideoDrivers(); ++i) - puts(SDL_GetVideoDriver(i)); - - printf("Selected SDL2 video driver: %s\n", SDL_GetCurrentVideoDriver()); - memset(surface_metadata, 0, sizeof(surface_metadata)); switch (lMagnification)