mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-17 15:21:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle error return value for SDL_GetSwapInterval

Browse Source
This commit is contained in:
Sylvain Becker
2023-01-01 17:20:41 +01:00
committed by GitHub
parent a515f51ac0
commit 8a13533949
7 changed files with 68 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dynapi/SDL_dynapi_procs.h
View File

@@ -224,7 +224,7 @@ SDL_DYNAPI_PROC(SDL_GLContext,SDL_GL_GetCurrentContext,(void),(),return)
SDL_DYNAPI_PROC(SDL_Window*,SDL_GL_GetCurrentWindow,(void),(),return)
SDL_DYNAPI_PROC(void,SDL_GL_GetDrawableSize,(SDL_Window *a, int *b, int *c),(a,b,c),)
SDL_DYNAPI_PROC(void*,SDL_GL_GetProcAddress,(const char *a),(a),return)
SDL_DYNAPI_PROC(int,SDL_GL_GetSwapInterval,(void),(),return)
SDL_DYNAPI_PROC(int,SDL_GL_GetSwapInterval,(int *a),(a),return)
SDL_DYNAPI_PROC(int,SDL_GL_LoadLibrary,(const char *a),(a),return)
SDL_DYNAPI_PROC(int,SDL_GL_MakeCurrent,(SDL_Window *a, SDL_GLContext b),(a,b),return)
SDL_DYNAPI_PROC(void,SDL_GL_ResetAttributes,(void),(),)

21
src/render/opengl/SDL_render_gl.c
View File

@@ -1651,6 +1651,7 @@ static int GL_UnbindTexture(SDL_Renderer *renderer, SDL_Texture *texture)
static int GL_SetVSync(SDL_Renderer *renderer, const int vsync)
{
int retval;
int interval = 0;
if (vsync) {
retval = SDL_GL_SetSwapInterval(1);
} else {
@@ -1659,7 +1660,13 @@ static int GL_SetVSync(SDL_Renderer *renderer, const int vsync)
if (retval != 0) {
return retval;
}
if (SDL_GL_GetSwapInterval() > 0) {
retval = SDL_GL_GetSwapInterval(&interval);
if (retval < 0) {
return retval;
}
if (interval > 0) {
renderer->info.flags |= SDL_RENDERER_PRESENTVSYNC;
} else {
renderer->info.flags &= ~SDL_RENDERER_PRESENTVSYNC;
@@ -1804,8 +1811,16 @@ static SDL_Renderer *GL_CreateRenderer(SDL_Window *window, Uint32 flags)
} else {
SDL_GL_SetSwapInterval(0);
}
if (SDL_GL_GetSwapInterval() > 0) {
renderer->info.flags |= SDL_RENDERER_PRESENTVSYNC;
{
int interval = 0;
if (SDL_GL_GetSwapInterval(&interval) < 0) {
/* Error */
} else {
if (interval > 0) {
renderer->info.flags |= SDL_RENDERER_PRESENTVSYNC;
}
}
}
/* Check for debug output support */

21
src/render/opengles2/SDL_render_gles2.c
View File

@@ -1962,6 +1962,7 @@ static int GLES2_RenderPresent(SDL_Renderer *renderer)
static int GLES2_SetVSync(SDL_Renderer *renderer, const int vsync)
{
int retval;
int interval = 0;
if (vsync) {
retval = SDL_GL_SetSwapInterval(1);
} else {
@@ -1970,7 +1971,13 @@ static int GLES2_SetVSync(SDL_Renderer *renderer, const int vsync)
if (retval != 0) {
return retval;
}
if (SDL_GL_GetSwapInterval() > 0) {
retval = SDL_GL_GetSwapInterval(&interval);
if (retval < 0) {
return retval;
}
if (interval > 0) {
renderer->info.flags |= SDL_RENDERER_PRESENTVSYNC;
} else {
renderer->info.flags &= ~SDL_RENDERER_PRESENTVSYNC;
@@ -2131,8 +2138,16 @@ static SDL_Renderer *GLES2_CreateRenderer(SDL_Window *window, Uint32 flags)
} else {
SDL_GL_SetSwapInterval(0);
}
if (SDL_GL_GetSwapInterval() > 0) {
renderer->info.flags |= SDL_RENDERER_PRESENTVSYNC;
{
int interval = 0;
if (SDL_GL_GetSwapInterval(&interval) < 0) {
/* Error */
} else {
if (interval > 0) {
renderer->info.flags |= SDL_RENDERER_PRESENTVSYNC;
}
}
}
/* Check for debug output support */

19
src/video/SDL_video.c
View File

@@ -4053,16 +4053,25 @@ int SDL_GL_SetSwapInterval(int interval)
}
}
int SDL_GL_GetSwapInterval(void)
int SDL_GL_GetSwapInterval(int *interval)
{
if (interval == NULL) {
return SDL_InvalidParamError("interval");
}
*interval = 0;
if (_this == NULL) {
return 0;
return SDL_SetError("no video driver");;
} else if (SDL_GL_GetCurrentContext() == NULL) {
return 0;
return SDL_SetError("no current context");;
} else if (_this->GL_GetSwapInterval) {
return _this->GL_GetSwapInterval(_this);
} else {
int val = _this->GL_GetSwapInterval(_this);
*interval = val;
return 0;
} else {
return SDL_SetError("not implemented");;
}
}