mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-13 23:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change return type from void to int, for functions that set an error

Browse Source 
(SDL_SetError(), SDL_OutOfMemory(), SDL_Unsupported(), SDL_InvalidParam())

Update prototype to forward errors to generic layer, for the functions:
MoveCursor, WarpMouse, GL_DeleteContext, GetDisplayModes.

Check invalid parameter in SDL_SetTextInputRect() generic layer.
This commit is contained in:
Sylvain
2023-02-06 20:24:12 +01:00
committed by Sam Lantinga
parent 6c37d5b57f
commit c5c94a6be6
100 changed files with 472 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/render/SDL_render.c
View File

@@ -2013,12 +2013,12 @@ static void SDL_UnlockTextureNative(SDL_Texture *texture)
SDL_UnlockTexture(native);
}
void SDL_UnlockTexture(SDL_Texture *texture)
int SDL_UnlockTexture(SDL_Texture *texture)
{
CHECK_TEXTURE_MAGIC(texture, );
CHECK_TEXTURE_MAGIC(texture, -1);
if (texture->access != SDL_TEXTUREACCESS_STREAMING) {
return;
return 0;
}
#if SDL_HAVE_YUV
if (texture->yuv) {
@@ -2034,6 +2034,7 @@ void SDL_UnlockTexture(SDL_Texture *texture)
SDL_DestroySurface(texture->locked_surface);
texture->locked_surface = NULL;
return 0;
}
static int SDL_SetRenderTargetInternal(SDL_Renderer *renderer, SDL_Texture *texture)
@@ -4002,11 +4003,11 @@ static void SDL_RenderLogicalBorders(SDL_Renderer *renderer)
}
}
void SDL_RenderPresent(SDL_Renderer *renderer)
int SDL_RenderPresent(SDL_Renderer *renderer)
{
SDL_bool presented = SDL_TRUE;
CHECK_RENDERER_MAGIC(renderer, );
CHECK_RENDERER_MAGIC(renderer, -1);
if (renderer->logical_target) {
SDL_SetRenderTargetInternal(renderer, NULL);
@@ -4034,13 +4035,14 @@ void SDL_RenderPresent(SDL_Renderer *renderer)
(!presented && renderer->wanted_vsync)) {
SDL_SimulateRenderVSync(renderer);
}
return 0;
}
static void SDL_DestroyTextureInternal(SDL_Texture *texture, SDL_bool is_destroying)
static int SDL_DestroyTextureInternal(SDL_Texture *texture, SDL_bool is_destroying)
{
SDL_Renderer *renderer;
CHECK_TEXTURE_MAGIC(texture, );
CHECK_TEXTURE_MAGIC(texture, -1);
renderer = texture->renderer;
if (is_destroying) {
@@ -4084,11 +4086,12 @@ static void SDL_DestroyTextureInternal(SDL_Texture *texture, SDL_bool is_destroy
texture->locked_surface = NULL;
SDL_free(texture);
return 0;
}
void SDL_DestroyTexture(SDL_Texture *texture)
int SDL_DestroyTexture(SDL_Texture *texture)
{
SDL_DestroyTextureInternal(texture, SDL_FALSE /* is_destroying */);
return SDL_DestroyTextureInternal(texture, SDL_FALSE /* is_destroying */);
}
static void SDL_DiscardAllCommands(SDL_Renderer *renderer)
@@ -4113,9 +4116,9 @@ static void SDL_DiscardAllCommands(SDL_Renderer *renderer)
}
}
void SDL_DestroyRenderer(SDL_Renderer *renderer)
int SDL_DestroyRenderer(SDL_Renderer *renderer)
{
CHECK_RENDERER_MAGIC(renderer, );
CHECK_RENDERER_MAGIC(renderer, -1);
SDL_DelEventWatch(SDL_RendererEventWatch, renderer);
@@ -4144,6 +4147,7 @@ void SDL_DestroyRenderer(SDL_Renderer *renderer)
/* Free the renderer instance */
renderer->DestroyRenderer(renderer);
return 0;
}
int SDL_GL_BindTexture(SDL_Texture *texture, float *texw, float *texh)