eden-emu/SDL
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Define SDL_PLATFORM_* macros instead of underscored ones (#8875)

Browse source
This commit is contained in:
Anonymous Maarten 2024-01-24 02:40:51 +01:00 • committed by GitHub
parent ceccf24519
commit 31d133db40
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
208 changed files with 1293 additions and 1138 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/render/opengl/SDL_render_gl.c
View file

@ -27,7 +27,7 @@
#include "SDL_shaders_gl.h"
#include "../../SDL_utils_c.h"
#ifdef __MACOS__
#ifdef SDL_PLATFORM_MACOS
#include <OpenGL/OpenGL.h>
#endif
@ -427,7 +427,7 @@ static SDL_bool convert_format(GL_RenderData *renderdata, Uint32 pixel_format,
*format = GL_LUMINANCE;
*type = GL_UNSIGNED_BYTE;
break;
#ifdef __MACOS__
#ifdef SDL_PLATFORM_MACOS
case SDL_PIXELFORMAT_UYVY:
*internalFormat = GL_RGB8;
*format = GL_YCBCR_422_APPLE;
@ -552,7 +552,7 @@ static int GL_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture, SDL_Pr
renderdata->glTexParameteri(textype, GL_TEXTURE_WRAP_T,
GL_CLAMP_TO_EDGE);
}
#ifdef __MACOS__
#ifdef SDL_PLATFORM_MACOS
#ifndef GL_TEXTURE_STORAGE_HINT_APPLE
#define GL_TEXTURE_STORAGE_HINT_APPLE 0x85BC
#endif
@ -1238,7 +1238,7 @@ static int GL_RunCommandQueue(SDL_Renderer *renderer, SDL_RenderCommand *cmd, vo
}
}
#ifdef __MACOS__
#ifdef SDL_PLATFORM_MACOS
// On macOS on older systems, the OpenGL view change and resize events aren't
// necessarily synchronized, so just always reset it.
// Workaround for: https://discourse.libsdl.org/t/sdl-2-0-22-prerelease/35306/6
@ -1642,13 +1642,13 @@ static SDL_bool GL_IsProbablyAccelerated(const GL_RenderData *data)
/*const char *vendor = (const char *) data->glGetString(GL_VENDOR);*/
const char *renderer = (const char *)data->glGetString(GL_RENDERER);
#if defined(__WINDOWS__) || defined(__WINGDK__)
#if defined(SDL_PLATFORM_WINDOWS) || defined(SDL_PLATFORM_WINGDK)
if (SDL_strcmp(renderer, "GDI Generic") == 0) {
return SDL_FALSE; /* Microsoft's fallback software renderer. Fix your system! */
}
#endif
#ifdef __APPLE__
#ifdef SDL_PLATFORM_APPLE
if (SDL_strcmp(renderer, "Apple Software Renderer") == 0) {
return SDL_FALSE; /* (a probably very old) Apple software-based OpenGL. */
}
@ -1760,7 +1760,7 @@ static SDL_Renderer *GL_CreateRenderer(SDL_Window *window, SDL_PropertiesID crea
renderer->info.flags |= SDL_RENDERER_ACCELERATED;
}
#ifdef __MACOS__
#ifdef SDL_PLATFORM_MACOS
/* Enable multi-threaded rendering */
/* Disabled until Ryan finishes his VBO/PBO code...
CGLEnable(CGLGetCurrentContext(), kCGLCEMPEngine);
@ -1867,7 +1867,7 @@ static SDL_Renderer *GL_CreateRenderer(SDL_Window *window, SDL_PropertiesID crea
renderer->info.texture_formats[renderer->info.num_texture_formats++] = SDL_PIXELFORMAT_NV21;
}
#endif
#ifdef __MACOS__
#ifdef SDL_PLATFORM_MACOS
renderer->info.texture_formats[renderer->info.num_texture_formats++] = SDL_PIXELFORMAT_UYVY;
#endif