Skip to content

Commit 0977a88

Browse files
MartinPulecMartinPulec
committed
vdisp/sdl3: check all calls returning bool
1 parent 4a4decc commit 0977a88

File tree

1 file changed

+34
-34
lines changed

1 file changed

+34
-34
lines changed

‎src/video_display/sdl3.c‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -248,11 +248,11 @@ display_frame(struct state_sdl3 *s, struct video_frame *frame)
248248
s->cs_data->convert(frame, tex_data, pitch);
249249
}
250250

251-
SDL_RenderClear(s->renderer);
251+
SDL_CHECK(SDL_RenderClear(s->renderer));
252252
SDL_UnlockTexture(frame_data->texture);
253253
SDL_CHECK(
254254
SDL_RenderTexture(s->renderer, frame_data->texture, NULL, NULL));
255-
SDL_RenderPresent(s->renderer);
255+
SDL_CHECK(SDL_RenderPresent(s->renderer));
256256

257257
if (s->cs_data->convert == NULL) {
258258
SDL_CHECK(SDL_LockTexture(frame_data->texture, NULL,
@@ -334,7 +334,7 @@ display_sdl3_process_key(struct state_sdl3 *s, int64_t key)
334334
return true;
335335
case 'f':
336336
s->fs = !s->fs;
337-
SDL_SetWindowFullscreen(s->window, s->fs);
337+
SDL_CHECK(SDL_SetWindowFullscreen(s->window, s->fs));
338338
return true;
339339
case 'q':
340340
exit_uv(0);
@@ -384,9 +384,9 @@ display_sdl3_run(void *arg)
384384
int key;
385385
if (strstr(msg->text, "win-title ") ==
386386
msg->text) {
387-
SDL_SetWindowTitle(
387+
SDL_CHECK(SDL_SetWindowTitle(
388388
s->window,
389-
msg->text + strlen("win-title "));
389+
msg->text + strlen("win-title ")));
390390
r = new_response(RESPONSE_OK, NULL);
391391
} else if (sscanf(msg->text, "%d", &key) == 1) {
392392
if (!display_sdl3_process_key(s, key)) {
@@ -439,13 +439,13 @@ display_sdl3_run(void *arg)
439439
int height = sqrt(
440440
area / ((double) s->current_display_desc.width /
441441
s->current_display_desc.height));
442-
SDL_SetWindowSize(s->window, width, height);
442+
SDL_CHECK(SDL_SetWindowSize(s->window, width, height));
443443
MSG(DEBUG, "resizing to %d x %d\n", width, height);
444444
} else if (sdl_event.type == SDL_EVENT_WINDOW_RESIZED) {
445445
// clear both buffers
446-
SDL_RenderClear(s->renderer);
446+
SDL_CHECK(SDL_RenderClear(s->renderer));
447447
display_frame(s, s->last_frame);
448-
SDL_RenderClear(s->renderer);
448+
SDL_CHECK(SDL_RenderClear(s->renderer));
449449
display_frame(s, s->last_frame);
450450
} else if (sdl_event.type == SDL_EVENT_QUIT) {
451451
exit_uv(0);
@@ -491,7 +491,7 @@ static void
491491
show_help(const char *driver, bool full)
492492
{
493493
if (driver != NULL) {
494-
SDL_SetHint(SDL_HINT_VIDEO_DRIVER, driver);
494+
SDL_CHECK(SDL_SetHint(SDL_HINT_VIDEO_DRIVER, driver));
495495
}
496496
SDL_CHECK(SDL_InitSubSystem(SDL_INIT_VIDEO));
497497
printf("SDL options:\n");
@@ -703,35 +703,34 @@ recreate_textures(struct state_sdl3 *s, struct video_desc desc)
703703

704704
for (int i = 0; i < BUFFER_COUNT; ++i) {
705705
SDL_PropertiesID prop = SDL_CreateProperties();
706-
SDL_SetNumberProperty(prop,
707-
SDL_PROP_TEXTURE_CREATE_FORMAT_NUMBER,
708-
s->cs_data->sdl_tex_fmt);
709-
SDL_SetNumberProperty(prop,
710-
SDL_PROP_TEXTURE_CREATE_ACCESS_NUMBER,
711-
SDL_TEXTUREACCESS_STREAMING);
712-
SDL_SetNumberProperty(prop,
713-
SDL_PROP_TEXTURE_CREATE_WIDTH_NUMBER,
714-
desc.width);
715-
SDL_SetNumberProperty(prop,
706+
SDL_CHECK(SDL_SetNumberProperty(
707+
prop, SDL_PROP_TEXTURE_CREATE_FORMAT_NUMBER,
708+
s->cs_data->sdl_tex_fmt));
709+
SDL_CHECK(SDL_SetNumberProperty(
710+
prop, SDL_PROP_TEXTURE_CREATE_ACCESS_NUMBER,
711+
SDL_TEXTUREACCESS_STREAMING));
712+
SDL_CHECK(SDL_SetNumberProperty(
713+
prop, SDL_PROP_TEXTURE_CREATE_WIDTH_NUMBER, desc.width));
714+
SDL_CHECK(SDL_SetNumberProperty(prop,
716715
SDL_PROP_TEXTURE_CREATE_HEIGHT_NUMBER,
717-
desc.height);
716+
desc.height));
718717
if (!codec_is_a_rgb(desc.color_spec)) {
719718
const enum SDL_Colorspace cs =
720719
get_commandline_param("color-601") != NULL
721720
? SDL_COLORSPACE_BT601_LIMITED
722721
: SDL_COLORSPACE_BT709_LIMITED;
723-
SDL_SetNumberProperty(
722+
SDL_CHECK(SDL_SetNumberProperty(
724723
prop, SDL_PROP_TEXTURE_CREATE_COLORSPACE_NUMBER,
725-
cs);
724+
cs));
726725
}
727726
if (desc.color_spec == R10k) {
728-
SDL_SetNumberProperty(
727+
SDL_CHECK(SDL_SetNumberProperty(
729728
prop, SDL_PROP_TEXTURE_CREATE_COLORSPACE_NUMBER,
730-
SDL_COLORSPACE_SRGB);
729+
SDL_COLORSPACE_SRGB));
731730
}
732731
SDL_Texture *texture =
733732
SDL_CreateTextureWithProperties(s->renderer, prop);
734-
SDL_SetTextureBlendMode(texture, s->req_blend_mode);
733+
SDL_CHECK(SDL_SetTextureBlendMode(texture, s->req_blend_mode));
735734
SDL_DestroyProperties(prop);
736735
if (!texture) {
737736
log_msg(LOG_LEVEL_ERROR,
@@ -859,9 +858,9 @@ display_sdl3_reconfigure_real(void *state, struct video_desc desc)
859858
SDL_SetPointerProperty(
860859
renderer_prop, SDL_PROP_RENDERER_CREATE_WINDOW_POINTER, s->window);
861860
if (strlen(s->req_renderers_name) > 0) {
862-
SDL_SetStringProperty(renderer_prop,
863-
SDL_PROP_RENDERER_CREATE_NAME_STRING,
864-
s->req_renderers_name);
861+
SDL_CHECK(SDL_SetStringProperty(
862+
renderer_prop, SDL_PROP_RENDERER_CREATE_NAME_STRING,
863+
s->req_renderers_name));
865864
}
866865
s->renderer = SDL_CreateRendererWithProperties(renderer_prop);
867866
SDL_DestroyProperties(renderer_prop);
@@ -894,8 +893,9 @@ display_sdl3_reconfigure_real(void *state, struct video_desc desc)
894893
MSG(VERBOSE, "Setting SDL3 pix fmt: %s\n",
895894
SDL_GetPixelFormatName(s->cs_data->sdl_tex_fmt));
896895

897-
SDL_SetRenderLogicalPresentation(s->renderer, desc.width, desc.height,
898-
SDL_LOGICAL_PRESENTATION_LETTERBOX);
896+
SDL_CHECK(SDL_SetRenderLogicalPresentation(
897+
s->renderer, desc.width, desc.height,
898+
SDL_LOGICAL_PRESENTATION_LETTERBOX));
899899

900900
if (!recreate_textures(s, desc)) {
901901
return false;
@@ -1079,7 +1079,7 @@ display_sdl3_init(struct module *parent, const char *fmt, unsigned int flags)
10791079
#endif // defined __linux__
10801080

10811081
if (driver != NULL) {
1082-
SDL_SetHint(SDL_HINT_VIDEO_DRIVER, driver);
1082+
SDL_CHECK(SDL_SetHint(SDL_HINT_VIDEO_DRIVER, driver));
10831083
}
10841084
if (!SDL_InitSubSystem(SDL_INIT_VIDEO)) {
10851085
MSG(ERROR, "Unable to initialize SDL3 video: %s\n",
@@ -1095,8 +1095,8 @@ display_sdl3_init(struct module *parent, const char *fmt, unsigned int flags)
10951095
}
10961096
MSG(NOTICE, "Using driver: %s\n", SDL_GetCurrentVideoDriver());
10971097

1098-
SDL_HideCursor();
1099-
SDL_DisableScreenSaver();
1098+
SDL_CHECK(SDL_HideCursor());
1099+
SDL_CHECK(SDL_DisableScreenSaver());
11001100

11011101
module_init_default(&s->mod);
11021102
s->mod.new_message = display_sdl3_new_message;
@@ -1154,7 +1154,7 @@ display_sdl3_done(void *state)
11541154
SDL_DestroyWindow(s->window);
11551155
}
11561156

1157-
SDL_ShowCursor();
1157+
SDL_CHECK(SDL_ShowCursor());
11581158

11591159
SDL_QuitSubSystem(SDL_INIT_VIDEO);
11601160
SDL_QuitSubSystem(SDL_INIT_EVENTS);

0 commit comments

Comments
 (0)