scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-22 12:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

sdl2: include + SDL_CHECK add action

Browse Source 
include inttypes.h

SDL_CHECK can now have an optional action (using ellipsis) + handle
return value of SDL_LockTesxture using that (currently fails on Arch
Linux with sdl2-compat 2.30.50-1 and sdl3 3.2.0-1 and YCbCr textures).
This commit is contained in:
Martin Pulec
2025-01-29 15:14:59 +01:00
parent a525f474c1
commit a15c14f2a4
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/video_display/sdl2.c
View File

@@ -53,6 +53,7 @@
#include <assert.h> // for assert
#include <ctype.h> // for toupper
#include <inttypes.h> // for PRIu8
#include <math.h> // for sqrt
#include <pthread.h> // for pthread_mutex_unlock, pthread_mutex_lock
#include <stdbool.h> // for true, bool, false
@@ -149,7 +150,15 @@ static const struct {
{'q', "quit"},
};
#define SDL_CHECK(cmd) do { int ret = cmd; if (ret < 0) { log_msg(LOG_LEVEL_ERROR, MOD_NAME "Error (%s): %s\n", #cmd, SDL_GetError());} } while(0)
#define SDL_CHECK(cmd, ...) \
do { \
int ret = cmd; \
if (ret < 0) { \
log_msg(LOG_LEVEL_ERROR, MOD_NAME "Error (%s): %s\n", \
#cmd, SDL_GetError()); \
__VA_ARGS__; \
} \
} while (0)
static void display_frame(struct state_sdl2 *s, struct video_frame *frame)
{
@@ -475,7 +484,10 @@ static bool recreate_textures(struct state_sdl2 *s, struct video_desc desc) {
}
struct video_frame *f = vf_alloc_desc(desc);
f->callbacks.dispose_udata = (void *) texture;
SDL_CHECK(SDL_LockTexture(texture, NULL, (void **) &f->tiles[0].data, &s->texture_pitch));
SDL_CHECK(SDL_LockTexture(texture, NULL,
(void **) &f->tiles[0].data,
&s->texture_pitch),
return false);
f->tiles[0].data_len = desc.height * s->texture_pitch;
f->callbacks.data_deleter = vf_sdl_texture_data_deleter;
simple_linked_list_append(s->free_frame_queue, f);