aljaz/scrcpy
1
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2026-02-14 10:24:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move renderer from sc_display to sc_screen

Browse Source 
Make sc_screen the owner of both the SDL window and the SDL renderer.
This is the first step toward limiting the role of sc_display to texture
management.
This commit is contained in:
Romain Vimont
2026-01-24 22:40:54 +01:00
parent 3b13a68c7a
commit 9ca85aadef
4 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/display.c
View File

@@ -33,15 +33,9 @@ sc_display_init_novideo_icon(struct sc_display *display,
}
bool
sc_display_init(struct sc_display *display, SDL_Window *window,
sc_display_init(struct sc_display *display, SDL_Renderer *renderer,
SDL_Surface *icon_novideo, bool mipmaps) {
display->renderer = SDL_CreateRenderer(window, NULL);
if (!display->renderer) {
LOGE("Could not create renderer: %s", SDL_GetError());
return false;
}
const char *renderer_name = SDL_GetRendererName(display->renderer);
const char *renderer_name = SDL_GetRendererName(renderer);
LOGI("Renderer: %s", renderer_name ? renderer_name : "(unknown)");
display->mipmaps = false;
@@ -67,7 +61,6 @@ sc_display_init(struct sc_display *display, SDL_Window *window,
display->gl_context = SDL_GL_CreateContext(window);
if (!display->gl_context) {
LOGE("Could not create OpenGL context: %s", SDL_GetError());
SDL_DestroyRenderer(display->renderer);
return false;
}
#endif
@@ -95,6 +88,7 @@ sc_display_init(struct sc_display *display, SDL_Window *window,
LOGD("Trilinear filtering disabled (not an OpenGL renderer)");
}
display->renderer = renderer;
display->texture = NULL;
if (icon_novideo) {
@@ -104,7 +98,6 @@ sc_display_init(struct sc_display *display, SDL_Window *window,
#ifdef SC_DISPLAY_FORCE_OPENGL_CORE_PROFILE
SDL_GL_DestroyContext(display->gl_context);
#endif
SDL_DestroyRenderer(display->renderer);
return false;
}
}
@@ -120,7 +113,6 @@ sc_display_destroy(struct sc_display *display) {
if (display->texture) {
SDL_DestroyTexture(display->texture);
}
SDL_DestroyRenderer(display->renderer);
}
static enum SDL_Colorspace

4
app/src/display.h
View File

@@ -17,7 +17,7 @@
#endif
struct sc_display {
SDL_Renderer *renderer;
SDL_Renderer *renderer; // owned by the caller
SDL_Texture *texture;
struct sc_opengl gl;
@@ -30,7 +30,7 @@ struct sc_display {
};
bool
sc_display_init(struct sc_display *display, SDL_Window *window,
sc_display_init(struct sc_display *display, SDL_Renderer *renderer,
SDL_Surface *icon_novideo, bool mipmaps);
void

13
app/src/screen.c
View File

@@ -389,15 +389,21 @@ sc_screen_init(struct sc_screen *screen,
goto error_destroy_window;
}
screen->renderer = SDL_CreateRenderer(screen->window, NULL);
if (!screen->renderer) {
LOGE("Could not create renderer: %s", SDL_GetError());
goto error_destroy_window;
}
SDL_Surface *icon_novideo = params->video ? NULL : icon;
bool mipmaps = params->video && params->mipmaps;
ok = sc_display_init(&screen->display, screen->window, icon_novideo,
ok = sc_display_init(&screen->display, screen->renderer, icon_novideo,
mipmaps);
if (icon) {
scrcpy_icon_destroy(icon);
}
if (!ok) {
goto error_destroy_window;
goto error_destroy_renderer;
}
screen->frame = av_frame_alloc();
@@ -461,6 +467,8 @@ sc_screen_init(struct sc_screen *screen,
error_destroy_display:
sc_display_destroy(&screen->display);
error_destroy_renderer:
SDL_DestroyRenderer(screen->renderer);
error_destroy_window:
SDL_DestroyWindow(screen->window);
error_destroy_fps_counter:
@@ -524,6 +532,7 @@ sc_screen_destroy(struct sc_screen *screen) {
#endif
sc_display_destroy(&screen->display);
av_frame_free(&screen->frame);
SDL_DestroyRenderer(screen->renderer);
SDL_DestroyWindow(screen->window);
sc_fps_counter_destroy(&screen->fps_counter);
sc_frame_buffer_destroy(&screen->fb);

1
app/src/screen.h
View File

@@ -49,6 +49,7 @@ struct sc_screen {
} req;
SDL_Window *window;
SDL_Renderer *renderer;
struct sc_size frame_size;
struct sc_size content_size; // rotated frame_size