mirror of
https://github.com/Q3Rally-Team/q3rally.git
synced 2024-12-17 07:42:06 +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
144 lines
5.5 KiB
C
144 lines
5.5 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.
|
|
*/
|
|
|
|
#ifndef SDL_shape_h_
|
|
#define SDL_shape_h_
|
|
|
|
#include "SDL_stdinc.h"
|
|
#include "SDL_pixels.h"
|
|
#include "SDL_rect.h"
|
|
#include "SDL_surface.h"
|
|
#include "SDL_video.h"
|
|
|
|
#include "begin_code.h"
|
|
/* Set up for C function definitions, even when using C++ */
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/** \file SDL_shape.h
|
|
*
|
|
* Header file for the shaped window API.
|
|
*/
|
|
|
|
#define SDL_NONSHAPEABLE_WINDOW -1
|
|
#define SDL_INVALID_SHAPE_ARGUMENT -2
|
|
#define SDL_WINDOW_LACKS_SHAPE -3
|
|
|
|
/**
|
|
* \brief Create a window that can be shaped with the specified position, dimensions, and flags.
|
|
*
|
|
* \param title The title of the window, in UTF-8 encoding.
|
|
* \param x The x position of the window, ::SDL_WINDOWPOS_CENTERED, or
|
|
* ::SDL_WINDOWPOS_UNDEFINED.
|
|
* \param y The y position of the window, ::SDL_WINDOWPOS_CENTERED, or
|
|
* ::SDL_WINDOWPOS_UNDEFINED.
|
|
* \param w The width of the window.
|
|
* \param h The height of the window.
|
|
* \param flags The flags for the window, a mask of SDL_WINDOW_BORDERLESS with any of the following:
|
|
* ::SDL_WINDOW_OPENGL, ::SDL_WINDOW_INPUT_GRABBED,
|
|
* ::SDL_WINDOW_HIDDEN, ::SDL_WINDOW_RESIZABLE,
|
|
* ::SDL_WINDOW_MAXIMIZED, ::SDL_WINDOW_MINIMIZED,
|
|
* ::SDL_WINDOW_BORDERLESS is always set, and ::SDL_WINDOW_FULLSCREEN is always unset.
|
|
*
|
|
* \return The window created, or NULL if window creation failed.
|
|
*
|
|
* \sa SDL_DestroyWindow()
|
|
*/
|
|
extern DECLSPEC SDL_Window * SDLCALL SDL_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags);
|
|
|
|
/**
|
|
* \brief Return whether the given window is a shaped window.
|
|
*
|
|
* \param window The window to query for being shaped.
|
|
*
|
|
* \return SDL_TRUE if the window is a window that can be shaped, SDL_FALSE if the window is unshaped or NULL.
|
|
*
|
|
* \sa SDL_CreateShapedWindow
|
|
*/
|
|
extern DECLSPEC SDL_bool SDLCALL SDL_IsShapedWindow(const SDL_Window *window);
|
|
|
|
/** \brief An enum denoting the specific type of contents present in an SDL_WindowShapeParams union. */
|
|
typedef enum {
|
|
/** \brief The default mode, a binarized alpha cutoff of 1. */
|
|
ShapeModeDefault,
|
|
/** \brief A binarized alpha cutoff with a given integer value. */
|
|
ShapeModeBinarizeAlpha,
|
|
/** \brief A binarized alpha cutoff with a given integer value, but with the opposite comparison. */
|
|
ShapeModeReverseBinarizeAlpha,
|
|
/** \brief A color key is applied. */
|
|
ShapeModeColorKey
|
|
} WindowShapeMode;
|
|
|
|
#define SDL_SHAPEMODEALPHA(mode) (mode == ShapeModeDefault || mode == ShapeModeBinarizeAlpha || mode == ShapeModeReverseBinarizeAlpha)
|
|
|
|
/** \brief A union containing parameters for shaped windows. */
|
|
typedef union {
|
|
/** \brief A cutoff alpha value for binarization of the window shape's alpha channel. */
|
|
Uint8 binarizationCutoff;
|
|
SDL_Color colorKey;
|
|
} SDL_WindowShapeParams;
|
|
|
|
/** \brief A struct that tags the SDL_WindowShapeParams union with an enum describing the type of its contents. */
|
|
typedef struct SDL_WindowShapeMode {
|
|
/** \brief The mode of these window-shape parameters. */
|
|
WindowShapeMode mode;
|
|
/** \brief Window-shape parameters. */
|
|
SDL_WindowShapeParams parameters;
|
|
} SDL_WindowShapeMode;
|
|
|
|
/**
|
|
* \brief Set the shape and parameters of a shaped window.
|
|
*
|
|
* \param window The shaped window whose parameters should be set.
|
|
* \param shape A surface encoding the desired shape for the window.
|
|
* \param shape_mode The parameters to set for the shaped window.
|
|
*
|
|
* \return 0 on success, SDL_INVALID_SHAPE_ARGUMENT on an invalid shape argument, or SDL_NONSHAPEABLE_WINDOW
|
|
* if the SDL_Window given does not reference a valid shaped window.
|
|
*
|
|
* \sa SDL_WindowShapeMode
|
|
* \sa SDL_GetShapedWindowMode.
|
|
*/
|
|
extern DECLSPEC int SDLCALL SDL_SetWindowShape(SDL_Window *window,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode);
|
|
|
|
/**
|
|
* \brief Get the shape parameters of a shaped window.
|
|
*
|
|
* \param window The shaped window whose parameters should be retrieved.
|
|
* \param shape_mode An empty shape-mode structure to fill, or NULL to check whether the window has a shape.
|
|
*
|
|
* \return 0 if the window has a shape and, provided shape_mode was not NULL, shape_mode has been filled with the mode
|
|
* data, SDL_NONSHAPEABLE_WINDOW if the SDL_Window given is not a shaped window, or SDL_WINDOW_LACKS_SHAPE if
|
|
* the SDL_Window given is a shapeable window currently lacking a shape.
|
|
*
|
|
* \sa SDL_WindowShapeMode
|
|
* \sa SDL_SetWindowShape
|
|
*/
|
|
extern DECLSPEC int SDLCALL SDL_GetShapedWindowMode(SDL_Window *window,SDL_WindowShapeMode *shape_mode);
|
|
|
|
/* Ends C function definitions when using C++ */
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#include "close_code.h"
|
|
|
|
#endif /* SDL_shape_h_ */
|