fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-04-21 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'sdl2' into sdl2-xcodeproj

Browse source
This commit is contained in:
Eric Wasylishen 2014-05-19 21:12:33 -06:00
commit 99dc56836e
2 changed files with 72 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
Quake/gl_vidsdl.c
View file

@ -412,6 +412,38 @@ static qboolean VID_ValidMode (int width, int height, int bpp, qboolean fullscre
#endif
}
#if defined(USE_SDL2)
/*
================
VID_SDL2_GetDisplayMode
Returns a pointer to a statically allocated SDL_DisplayMode structure
if there is one with the requested params on the default display.
Otherwise returns NULL.
This is passed to SDL_SetWindowDisplayMode to specify a pixel format
with the requested bpp. If we didn't care about bpp we could just pass NULL.
================
*/
static SDL_DisplayMode *VID_SDL2_GetDisplayMode(int width, int height, int bpp)
{
static SDL_DisplayMode mode;
const int sdlmodes = SDL_GetNumDisplayModes(0);
int i;
for (i = 0; i < sdlmodes; i++)
{
if (SDL_GetDisplayMode(0, i, &mode) == 0
&& mode.w == width && mode.h == height
&& SDL_BITSPERPIXEL(mode.format) == bpp)
{
return &mode;
}
}
return NULL;
}
#endif
/*
================
VID_SetMode
@ -433,41 +465,42 @@ static int VID_SetMode (int width, int height, int bpp, qboolean fullscreen)
q_snprintf(caption, sizeof(caption), "QuakeSpasm %1.2f.%d", (float)FITZQUAKE_VERSION, QUAKESPASM_VER_PATCH);
#if defined(USE_SDL2)
if (!window) // Create a new window
/* Create the window if needed, hidden */
if (!window)
{
flags = SDL_WINDOW_OPENGL;
if (fullscreen)
flags |= SDL_WINDOW_FULLSCREEN;
window = SDL_CreateWindow(caption,
SDL_WINDOWPOS_CENTERED,
SDL_WINDOWPOS_CENTERED,
width, height, flags);
window = SDL_CreateWindow (caption,
SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
width, height, SDL_WINDOW_OPENGL | SDL_WINDOW_HIDDEN);
if (!window)
Sys_Error ("Couldn't set video mode");
draw_context = SDL_GL_CreateContext(window);
}
else // A window already exists
{
if (VID_GetFullscreen())
{
if (SDL_SetWindowFullscreen(window, 0) != 0)
Sys_Error ("Couldn't set fullscreen state mode");
}
SDL_SetWindowSize(window, width, height);
SDL_SetWindowPosition(window, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);
if (fullscreen)
{
if (SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN) != 0)
Sys_Error ("Couldn't set fullscreen state mode");
}
draw_context = SDL_GL_CreateContext (window);
}
/* Ensure the window is not fullscreen */
if (VID_GetFullscreen ())
{
if (SDL_SetWindowFullscreen (window, 0) != 0)
Sys_Error("Couldn't set fullscreen state mode");
}
/* Set window size and display mode */
SDL_SetWindowSize (window, width, height);
SDL_SetWindowPosition (window, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);
SDL_SetWindowDisplayMode (window, VID_SDL2_GetDisplayMode(width, height, bpp));
/* Make window fullscreen if needed, and show the window */
if (fullscreen)
{
if (SDL_SetWindowFullscreen (window, SDL_WINDOW_FULLSCREEN) != 0)
Sys_Error ("Couldn't set fullscreen state mode");
}
SDL_ShowWindow (window);
gl_swap_control = true;
if (SDL_GL_SetSwapInterval((vid_vsync.value) ? 1 : 0) == -1)
if (SDL_GL_SetSwapInterval ((vid_vsync.value) ? 1 : 0) == -1)
gl_swap_control = false;
#else
flags = DEFAULT_SDL_FLAGS;

21
Quake/snd_sdl.c
View file

@ -22,6 +22,7 @@
*/
#include "quakedef.h"
#include "arch_def.h"
#if defined(SDL_FRAMEWORK) || defined(NO_SDL_CONFIG)
#if defined(USE_SDL2)
@ -89,6 +90,11 @@ qboolean SNDDMA_Init (dma_t *dma)
return false;
}
#if defined(USE_SDL2) && defined(PLATFORM_WINDOWS)
/* Workaround for https://bugzilla.libsdl.org/show_bug.cgi?id=2551 */
SDL_AudioInit("directsound");
#endif
/* Set up the desired format */
desired.freq = tmp = sndspeed.value;
desired.format = (loadas8bit.value) ? AUDIO_U8 : AUDIO_S16SYS;
@ -156,16 +162,11 @@ qboolean SNDDMA_Init (dma_t *dma)
obtained.freq, obtained.samples, obtained.channels);
#if defined(USE_SDL2)
{
const char *drivername_temp = SDL_GetAudioDeviceName(0, SDL_FALSE);
if (drivername_temp == NULL)
{
strcpy(drivername, "(UNKNOWN)");
}
else
{
strncpy(drivername, drivername_temp, sizeof(drivername) - 1);
drivername[sizeof(drivername) - 1] = '\0';
}
const char *driver = SDL_GetCurrentAudioDriver();
const char *device = SDL_GetAudioDeviceName(0, SDL_FALSE);
q_snprintf(drivername, sizeof(drivername), "%s - %s",
driver != NULL ? driver : "(UNKNOWN)",
device != NULL ? device : "(UNKNOWN)");
}
#else
if (SDL_AudioDriverName(drivername, sizeof(drivername)) == NULL)