mirror of
https://github.com/Q3Rally-Team/q3rally.git
synced 2024-11-26 22:01:50 +00:00
96a9e2a9aa
This updates from SDL 2.0.4 to SDL 2.0.8. Fix nullptr dereference in front of nullptr check in FS_CheckPak0 Fix undefined behaviour due to shifting signed in snd_mem.c Fix shifting bits out of byte in tr_font.c Fix shift into sign in cl_cin.c Fix signed bit operations in MSG_ReadBits Add missing address operator in cm_polylib.c OpenGL1: Decay float[8] to float * in tr_marks.c Avoid srcList[-1] in snd_openal.c Fix the behaviour of CVAR_LATCH|CVAR_CHEAT cvars Maximize cURL buffer size Fix mouse grab after toggling fullscreen Fix q3history buffer not cleared between mods and OOB-access Revert "Removed "Color Depth" from q3_ui system settings, it didn't control anything." Fix displayed color/depth/stencil bits values Restore setting r_colorbits in q3_ui Make setting r_stencilbits more consistent in Team Arena UI Fix map list in Team Arena start server menu after entering SP menu Support SDL audio devices that require float32 samples. sdl_snd.c should just initialize SDL audio without checking SDL_WasInit(). There's no need to SDL_PauseAudio(1) before calling SDL_CloseAudio(). Added audio capture support to SDL backend. Use the SDL2 audio device interface instead of the legacy 1.2 API. Disable SDL audio capture until prebuilt SDL libraries are updated to 2.0.8. Update SDL2 to 2.0.8 Add SDL 2.0.1 headers for macOS PPC Make macOS Universal Bundle target 10.6 for x86 and x86_64 Fix possible bot goal state NULL pointer dereference Fix uninitialized bot_goal_t fields Remove unnecessary NULL pointer check in Cmd_RemoveCommand Make UI_DrawProportionalString handle NULL string Fix compiling against macOS system OpenAL and SDL2 frameworks Fix array index in CanDamage() function - discovered by MARTY Fix compiling Makefile (broke in macOS frameworks commit) Fix clearing keys for control in Team Arena UI Make s_useOpenAL be CVAR_LATCH Improvements for dedicated camera followers (team follow1/2) Fix not closing description.txt and fix path seperator Fix duplicate bots displayed in Team Arena ingame add bot menu OpenGL2: Fix parsing specularScale in shaders Don't allow SDL audio capture using pulseaudio Isolate the Altivec code so non-Altivec PPC targets can use the same binary. Limit -maltivec to specific source files on OpenBSD too (untested) Use SDL 2.0.1 headers for macOS ppc64 Fix console offset while Team Arena voiceMenu is open OpenGL2: Readd r_deluxeSpecular. Fix client kicked as unpure when missing the latest cgame/ui pk3s Don't create multiple windows when GL context creation fails Require OpenGL 1.2 for GL_CLAMP_TO_EDGE Fix Linux uninstaller requiring Bash Fix Linux uninstaller redirecting stderr to stdout in preuninstall.sh Reported by @illwieckz. Fix in_restart causing fatal error while video is shutdown Allow pkg-config binary to be overridden with PKG_CONFIG Make testgun command without argument disable test gun model Remove unused renderer_buffer variable Don't upload 8 bit grayscale images as 16 bit luminance OpenGL1: Use RE_UploadCinematic() instead of duplicate code Don't load non-core GL functions for OpenGL 3.2 core context Load OpenGL ES 2.0 function procs Don't check fixed function GL extensions when using shader pipeline OpenGL2: Fix world VAO cache drawing when glIndex_t is unsigned short OpenGL2: Misc fixes and cleanup Fix IQM root joint backlerp when joint number is more than 0 Improve IQM loading Improve IQM CPU vertex skinning performance OpenGL2: Add GPU vertex skinning for IQM models
188 lines
4.8 KiB
C
188 lines
4.8 KiB
C
/*
|
|
Simple DirectMedia Layer
|
|
Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
|
|
|
|
This software is provided 'as-is', without any express or implied
|
|
warranty. In no event will the authors be held liable for any damages
|
|
arising from the use of this software.
|
|
|
|
Permission is granted to anyone to use this software for any purpose,
|
|
including commercial applications, and to alter it and redistribute it
|
|
freely, subject to the following restrictions:
|
|
|
|
1. The origin of this software must not be misrepresented; you must not
|
|
claim that you wrote the original software. If you use this software
|
|
in a product, an acknowledgment in the product documentation would be
|
|
appreciated but is not required.
|
|
2. Altered source versions must be plainly marked as such, and must not be
|
|
misrepresented as being the original software.
|
|
3. This notice may not be removed or altered from any source distribution.
|
|
*/
|
|
|
|
/**
|
|
* \file SDL_test_common.h
|
|
*
|
|
* Include file for SDL test framework.
|
|
*
|
|
* This code is a part of the SDL2_test library, not the main SDL library.
|
|
*/
|
|
|
|
/* Ported from original test\common.h file. */
|
|
|
|
#ifndef SDL_test_common_h_
|
|
#define SDL_test_common_h_
|
|
|
|
#include "SDL.h"
|
|
|
|
#if defined(__PSP__)
|
|
#define DEFAULT_WINDOW_WIDTH 480
|
|
#define DEFAULT_WINDOW_HEIGHT 272
|
|
#else
|
|
#define DEFAULT_WINDOW_WIDTH 640
|
|
#define DEFAULT_WINDOW_HEIGHT 480
|
|
#endif
|
|
|
|
#define VERBOSE_VIDEO 0x00000001
|
|
#define VERBOSE_MODES 0x00000002
|
|
#define VERBOSE_RENDER 0x00000004
|
|
#define VERBOSE_EVENT 0x00000008
|
|
#define VERBOSE_AUDIO 0x00000010
|
|
|
|
typedef struct
|
|
{
|
|
/* SDL init flags */
|
|
char **argv;
|
|
Uint32 flags;
|
|
Uint32 verbose;
|
|
|
|
/* Video info */
|
|
const char *videodriver;
|
|
int display;
|
|
const char *window_title;
|
|
const char *window_icon;
|
|
Uint32 window_flags;
|
|
int window_x;
|
|
int window_y;
|
|
int window_w;
|
|
int window_h;
|
|
int window_minW;
|
|
int window_minH;
|
|
int window_maxW;
|
|
int window_maxH;
|
|
int logical_w;
|
|
int logical_h;
|
|
float scale;
|
|
int depth;
|
|
int refresh_rate;
|
|
int num_windows;
|
|
SDL_Window **windows;
|
|
|
|
/* Renderer info */
|
|
const char *renderdriver;
|
|
Uint32 render_flags;
|
|
SDL_bool skip_renderer;
|
|
SDL_Renderer **renderers;
|
|
SDL_Texture **targets;
|
|
|
|
/* Audio info */
|
|
const char *audiodriver;
|
|
SDL_AudioSpec audiospec;
|
|
|
|
/* GL settings */
|
|
int gl_red_size;
|
|
int gl_green_size;
|
|
int gl_blue_size;
|
|
int gl_alpha_size;
|
|
int gl_buffer_size;
|
|
int gl_depth_size;
|
|
int gl_stencil_size;
|
|
int gl_double_buffer;
|
|
int gl_accum_red_size;
|
|
int gl_accum_green_size;
|
|
int gl_accum_blue_size;
|
|
int gl_accum_alpha_size;
|
|
int gl_stereo;
|
|
int gl_multisamplebuffers;
|
|
int gl_multisamplesamples;
|
|
int gl_retained_backing;
|
|
int gl_accelerated;
|
|
int gl_major_version;
|
|
int gl_minor_version;
|
|
int gl_debug;
|
|
int gl_profile_mask;
|
|
} SDLTest_CommonState;
|
|
|
|
#include "begin_code.h"
|
|
/* Set up for C function definitions, even when using C++ */
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/* Function prototypes */
|
|
|
|
/**
|
|
* \brief Parse command line parameters and create common state.
|
|
*
|
|
* \param argv Array of command line parameters
|
|
* \param flags Flags indicating which subsystem to initialize (i.e. SDL_INIT_VIDEO | SDL_INIT_AUDIO)
|
|
*
|
|
* \returns Returns a newly allocated common state object.
|
|
*/
|
|
SDLTest_CommonState *SDLTest_CommonCreateState(char **argv, Uint32 flags);
|
|
|
|
/**
|
|
* \brief Process one common argument.
|
|
*
|
|
* \param state The common state describing the test window to create.
|
|
* \param index The index of the argument to process in argv[].
|
|
*
|
|
* \returns The number of arguments processed (i.e. 1 for --fullscreen, 2 for --video [videodriver], or -1 on error.
|
|
*/
|
|
int SDLTest_CommonArg(SDLTest_CommonState * state, int index);
|
|
|
|
/**
|
|
* \brief Returns common usage information
|
|
*
|
|
* \param state The common state describing the test window to create.
|
|
*
|
|
* \returns String with usage information
|
|
*/
|
|
const char *SDLTest_CommonUsage(SDLTest_CommonState * state);
|
|
|
|
/**
|
|
* \brief Open test window.
|
|
*
|
|
* \param state The common state describing the test window to create.
|
|
*
|
|
* \returns True if initialization succeeded, false otherwise
|
|
*/
|
|
SDL_bool SDLTest_CommonInit(SDLTest_CommonState * state);
|
|
|
|
/**
|
|
* \brief Common event handler for test windows.
|
|
*
|
|
* \param state The common state used to create test window.
|
|
* \param event The event to handle.
|
|
* \param done Flag indicating we are done.
|
|
*
|
|
*/
|
|
void SDLTest_CommonEvent(SDLTest_CommonState * state, SDL_Event * event, int *done);
|
|
|
|
/**
|
|
* \brief Close test window.
|
|
*
|
|
* \param state The common state used to create test window.
|
|
*
|
|
*/
|
|
void SDLTest_CommonQuit(SDLTest_CommonState * state);
|
|
|
|
|
|
/* Ends C function definitions when using C++ */
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#include "close_code.h"
|
|
|
|
#endif /* SDL_test_common_h_ */
|
|
|
|
/* vi: set ts=4 sw=4 expandtab: */
|