yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-01-19 07:51:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove SDL 1.2 from the GL1 SDL backend.

Browse source
This commit is contained in:
Yamagi Burmeister 2018-07-18 20:35:20 +02:00
parent cc15f0c10c
commit 1b68da9a0f
1 changed files with 5 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/client/refresh/gl1/gl1_sdl.c
View file

@ -27,11 +27,7 @@
#include "header/local.h" #include "header/local.h"
#ifdef SDL2
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
#else // SDL1.2
#include <SDL/SDL.h>
#endif //SDL2
#if defined(__APPLE__) #if defined(__APPLE__)
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
@ -39,15 +35,11 @@
#include <GL/gl.h> #include <GL/gl.h>
#endif #endif
#if SDL_VERSION_ATLEAST(2, 0, 0) static qboolean vsyncActive = false;
static SDL_Window* window = NULL; static SDL_Window* window = NULL;
static SDL_GLContext context = NULL; static SDL_GLContext context = NULL;
#else
static SDL_Surface* window = NULL;
#endif
qboolean have_stencil = false; qboolean have_stencil = false;
static qboolean vsyncActive = false;
/* /*
* Returns the adress of a GL function * Returns the adress of a GL function
@ -67,7 +59,7 @@ void CalculateGammaRamp(float gamma, Uint16* ramp, int len)
int i; int i;
/* Input validation */ /* Input validation */
if (gamma < 0.0f ) { if (gamma < 0.0f ){
return; return;
} }
if (ramp == NULL) { if (ramp == NULL) {
@ -107,11 +99,8 @@ UpdateHardwareGamma(void)
Uint16 ramp[256]; Uint16 ramp[256];
CalculateGammaRamp(gamma, ramp, 256); CalculateGammaRamp(gamma, ramp, 256);
#if SDL_VERSION_ATLEAST(2, 0, 0)
if(SDL_SetWindowGammaRamp(window, ramp, ramp, ramp) != 0) { if(SDL_SetWindowGammaRamp(window, ramp, ramp, ramp) != 0) {
#else
if(SDL_SetGammaRamp(ramp, ramp, ramp) < 0) {
#endif
R_Printf(PRINT_ALL, "Setting gamma failed: %s\n", SDL_GetError()); R_Printf(PRINT_ALL, "Setting gamma failed: %s\n", SDL_GetError());
} }
} }
@ -138,11 +127,6 @@ int RI_PrepareForWindow(void)
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8); SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8);
#if !SDL_VERSION_ATLEAST(2, 0, 0)
/* Set vsync - For SDL1.2, this must be done before creating the window */
SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, r_vsync->value ? 1 : 0);
#endif
if (gl_msaa_samples->value) if (gl_msaa_samples->value)
{ {
msaa_samples = gl_msaa_samples->value; msaa_samples = gl_msaa_samples->value;
@ -169,24 +153,16 @@ int RI_PrepareForWindow(void)
} }
/* Initiate the flags */ /* Initiate the flags */
#if SDL_VERSION_ATLEAST(2, 0, 0)
flags = SDL_WINDOW_OPENGL; flags = SDL_WINDOW_OPENGL;
#else // SDL 1.2
flags = SDL_OPENGL;
#endif
return flags; return flags;
} }
void RI_SetSwapInterval(void) void RI_SetSwapInterval(void)
{ {
#if SDL_VERSION_ATLEAST(2, 0, 0)
/* Set vsync - TODO: -1 could be set for "late swap tearing" */ /* Set vsync - TODO: -1 could be set for "late swap tearing" */
SDL_GL_SetSwapInterval(r_vsync->value ? 1 : 0); SDL_GL_SetSwapInterval(r_vsync->value ? 1 : 0);
vsyncActive = SDL_GL_GetSwapInterval() != 0; vsyncActive = SDL_GL_GetSwapInterval() != 0;
#else
R_Printf(PRINT_ALL, "SDL1.2 requires a vid_restart to apply changes to r_vsync (vsync)!\n");
#endif
} }
int RI_InitContext(void* win) int RI_InitContext(void* win)
@ -200,7 +176,6 @@ int RI_InitContext(void* win)
return false; return false;
} }
#if SDL_VERSION_ATLEAST(2, 0, 0)
window = (SDL_Window*)win; window = (SDL_Window*)win;
context = SDL_GL_CreateContext(window); context = SDL_GL_CreateContext(window);
@ -210,12 +185,6 @@ int RI_InitContext(void* win)
window = NULL; window = NULL;
return false; return false;
} }
#else // SDL 1.2
window = (SDL_Surface*)win;
// context is created implicitly with window, nothing to do here
#endif
const char* glver = (char *)glGetString(GL_VERSION); const char* glver = (char *)glGetString(GL_VERSION);
sscanf(glver, "%d.%d", &gl_config.major_version, &gl_config.minor_version); sscanf(glver, "%d.%d", &gl_config.major_version, &gl_config.minor_version);
@ -233,12 +202,8 @@ int RI_InitContext(void* win)
} }
} }
#if SDL_VERSION_ATLEAST(2, 0, 0)
/* For SDL2, this must be done after creating the window */ /* For SDL2, this must be done after creating the window */
RI_SetSwapInterval(); RI_SetSwapInterval();
#else // SDL1.2 - set vsyncActive to whatever is configured, hoping it was actually set
vsyncActive = r_vsync->value ? 1 : 0;
#endif
/* Initialize the stencil buffer */ /* Initialize the stencil buffer */
if (!SDL_GL_GetAttribute(SDL_GL_STENCIL_SIZE, &stencil_bits)) if (!SDL_GL_GetAttribute(SDL_GL_STENCIL_SIZE, &stencil_bits))
@ -256,11 +221,7 @@ int RI_InitContext(void* win)
/* Window title - set here so we can display renderer name in it */ /* Window title - set here so we can display renderer name in it */
snprintf(title, sizeof(title), "Yamagi Quake II %s - OpenGL 1.x", YQ2VERSION); snprintf(title, sizeof(title), "Yamagi Quake II %s - OpenGL 1.x", YQ2VERSION);
#if SDL_VERSION_ATLEAST(2, 0, 0)
SDL_SetWindowTitle(window, title); SDL_SetWindowTitle(window, title);
#else
SDL_WM_SetCaption(title, title);
#endif
return true; return true;
} }
@ -276,11 +237,7 @@ qboolean RI_IsVSyncActive(void)
void void
RI_EndFrame(void) RI_EndFrame(void)
{ {
#if SDL_VERSION_ATLEAST(2, 0, 0)
SDL_GL_SwapWindow(window); SDL_GL_SwapWindow(window);
#else
SDL_GL_SwapBuffers();
#endif
} }
/* /*
@ -297,7 +254,6 @@ RI_ShutdownWindow(qboolean contextOnly)
Only do this if we have a context, though. */ Only do this if we have a context, though. */
if (window) if (window)
{ {
#if SDL_VERSION_ATLEAST(2, 0, 0)
if(context) if(context)
{ {
glClearColor(0.0, 0.0, 0.0, 0.0); glClearColor(0.0, 0.0, 0.0, 0.0);
@ -307,11 +263,6 @@ RI_ShutdownWindow(qboolean contextOnly)
SDL_GL_DeleteContext(context); SDL_GL_DeleteContext(context);
context = NULL; context = NULL;
} }
#else // SDL 1.2
glClearColor(0.0, 0.0, 0.0, 0.0);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
RI_EndFrame();
#endif
} }
window = NULL; window = NULL;