ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2025-01-25 21:30:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added support for SDL_RENDERER_PRESENTVSYNC to the software renderer

Browse source 
This fixes https://github.com/libsdl-org/SDL/issues/4612
This commit is contained in:
Sam Lantinga 2021-08-10 12:02:17 -07:00
parent ea9bece5ed
commit fcfd19db86
3 changed files with 50 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/render/SDL_render.c
View file

@ -833,7 +833,8 @@ SDL_CreateRenderer(SDL_Window * window, int index, Uint32 flags)
goto error; goto error;
} }
if (SDL_GetHint(SDL_HINT_RENDER_VSYNC)) { hint = SDL_GetHint(SDL_HINT_RENDER_VSYNC);
if (hint && *hint) {
if (SDL_GetHintBoolean(SDL_HINT_RENDER_VSYNC, SDL_TRUE)) { if (SDL_GetHintBoolean(SDL_HINT_RENDER_VSYNC, SDL_TRUE)) {
flags |= SDL_RENDERER_PRESENTVSYNC; flags |= SDL_RENDERER_PRESENTVSYNC;
} else { } else {

15
src/render/software/SDL_render_sw.c
View file

@ -859,9 +859,22 @@ SW_CreateRendererForSurface(SDL_Surface * surface)
static SDL_Renderer * static SDL_Renderer *
SW_CreateRenderer(SDL_Window * window, Uint32 flags) SW_CreateRenderer(SDL_Window * window, Uint32 flags)
{ {
const char *hint;
SDL_Surface *surface; SDL_Surface *surface;
/* Set the vsync hint based on our flags, if it's not already set */
hint = SDL_GetHint(SDL_HINT_RENDER_VSYNC);
if (!hint || !*hint) {
SDL_SetHint(SDL_HINT_RENDER_VSYNC, (flags & SDL_RENDERER_PRESENTVSYNC) ? "1" : "0");
}
surface = SDL_GetWindowSurface(window); surface = SDL_GetWindowSurface(window);
/* Reset the vsync hint if we set it above */
if (!hint || !*hint) {
SDL_SetHint(SDL_HINT_RENDER_VSYNC, "");
}
if (!surface) { if (!surface) {
return NULL; return NULL;
} }
@ -872,7 +885,7 @@ SDL_RenderDriver SW_RenderDriver = {
SW_CreateRenderer, SW_CreateRenderer,
{ {
"software", "software",
SDL_RENDERER_SOFTWARE | SDL_RENDERER_TARGETTEXTURE, SDL_RENDERER_SOFTWARE | SDL_RENDERER_PRESENTVSYNC | SDL_RENDERER_TARGETTEXTURE,
8, 8,
{ {
SDL_PIXELFORMAT_ARGB8888, SDL_PIXELFORMAT_ARGB8888,

68
src/video/SDL_video.c
View file

@ -172,6 +172,39 @@ typedef struct {
int bytes_per_pixel; int bytes_per_pixel;
} SDL_WindowTextureData; } SDL_WindowTextureData;
#if SDL_VIDEO_OPENGL
static SDL_bool
HasAcceleratedOpenGL()
{
SDL_Window *window;
SDL_GLContext context;
SDL_bool hasAcceleratedOpenGL = SDL_FALSE;
window = SDL_CreateWindow("OpenGL test", -32, -32, 32, 32, SDL_WINDOW_OPENGL|SDL_WINDOW_HIDDEN);
if (window) {
context = SDL_GL_CreateContext(window);
if (context) {
const GLubyte *(APIENTRY * glGetStringFunc) (GLenum);
const char *vendor = NULL;
glGetStringFunc = SDL_GL_GetProcAddress("glGetString");
if (glGetStringFunc) {
vendor = (const char *) glGetStringFunc(GL_VENDOR);
}
/* Add more vendors here at will... */
if (vendor &&
(SDL_strstr(vendor, "ATI Technologies") ||
SDL_strstr(vendor, "NVIDIA"))) {
hasAcceleratedOpenGL = SDL_TRUE;
}
SDL_GL_DeleteContext(context);
}
SDL_DestroyWindow(window);
}
return hasAcceleratedOpenGL;
}
#endif /* SDL_VIDEO_OPENGL */
static SDL_bool static SDL_bool
ShouldUseTextureFramebuffer() ShouldUseTextureFramebuffer()
{ {
@ -187,14 +220,6 @@ ShouldUseTextureFramebuffer()
return SDL_FALSE; return SDL_FALSE;
} }
/* If the user has specified a software renderer we can't use a
texture framebuffer, or renderer creation will go recursive.
*/
hint = SDL_GetHint(SDL_HINT_RENDER_DRIVER);
if (hint && SDL_strcasecmp(hint, "software") == 0) {
return SDL_FALSE;
}
/* See if the user or application wants a specific behavior */ /* See if the user or application wants a specific behavior */
hint = SDL_GetHint(SDL_HINT_FRAMEBUFFER_ACCELERATION); hint = SDL_GetHint(SDL_HINT_FRAMEBUFFER_ACCELERATION);
if (hint) { if (hint) {
@ -218,33 +243,8 @@ ShouldUseTextureFramebuffer()
#elif defined(__LINUX__) #elif defined(__LINUX__)
/* Properly configured OpenGL drivers are faster than MIT-SHM */ /* Properly configured OpenGL drivers are faster than MIT-SHM */
#if SDL_VIDEO_OPENGL #if SDL_VIDEO_OPENGL
/* Ugh, find a way to cache this value! */
{ {
SDL_Window *window; static SDL_bool hasAcceleratedOpenGL = HasAcceleratedOpenGL();
SDL_GLContext context;
SDL_bool hasAcceleratedOpenGL = SDL_FALSE;
window = SDL_CreateWindow("OpenGL test", -32, -32, 32, 32, SDL_WINDOW_OPENGL|SDL_WINDOW_HIDDEN);
if (window) {
context = SDL_GL_CreateContext(window);
if (context) {
const GLubyte *(APIENTRY * glGetStringFunc) (GLenum);
const char *vendor = NULL;
glGetStringFunc = SDL_GL_GetProcAddress("glGetString");
if (glGetStringFunc) {
vendor = (const char *) glGetStringFunc(GL_VENDOR);
}
/* Add more vendors here at will... */
if (vendor &&
(SDL_strstr(vendor, "ATI Technologies") ||
SDL_strstr(vendor, "NVIDIA"))) {
hasAcceleratedOpenGL = SDL_TRUE;
}
SDL_GL_DeleteContext(context);
}
SDL_DestroyWindow(window);
}
return hasAcceleratedOpenGL; return hasAcceleratedOpenGL;
} }
#elif SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2 #elif SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2