forked from len0rd/rockbox
sdl: Keep texture around, upload LCD-parts only
No need to create a new texture for every rendered frame, unless the scaling method has been adjusted. We also don't need to upload the (unchanged) player interface to GPU memory repeatedly. + Remove unused lcd_display_redraw & having_new_lcd variables Change-Id: I5bff6aa2d54347a3f2c3afba8d8d7eb9e39f77f7
This commit is contained in:
Christian Soffke
parent
7aaa722a5d
commit
400452180d
8 changed files with 279 additions and 186 deletions
223
firmware/target/hosted/sdl/window-sdl.c
Normal file
223
firmware/target/hosted/sdl/window-sdl.c
Normal file
|
|
@ -0,0 +1,223 @@
|
|||
/***************************************************************************
|
||||
* __________ __ ___.
|
||||
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
|
||||
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
|
||||
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
|
||||
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
|
||||
* \/ \/ \/ \/ \/
|
||||
* $Id$
|
||||
*
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
||||
* KIND, either express or implied.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
#include <SDL.h>
|
||||
#include "sim-ui-defines.h"
|
||||
#include "window-sdl.h"
|
||||
#include "lcd-sdl.h"
|
||||
#include "misc.h"
|
||||
#include "panic.h"
|
||||
|
||||
extern SDL_Surface *lcd_surface;
|
||||
#ifdef HAVE_REMOTE_LCD
|
||||
extern SDL_Surface *remote_surface;
|
||||
#endif
|
||||
|
||||
SDL_Texture *gui_texture;
|
||||
SDL_Surface *sim_lcd_surface;
|
||||
|
||||
static SDL_Window *window;
|
||||
static SDL_Renderer *sdlRenderer;
|
||||
static SDL_Surface *picture_surface;
|
||||
|
||||
static bool new_gui_texture_needed = true;
|
||||
static bool window_adjustment_needed;
|
||||
double display_zoom = 1;
|
||||
|
||||
static void get_window_dimensions(int *w, int *h)
|
||||
{
|
||||
if (background)
|
||||
{
|
||||
*w = UI_WIDTH;
|
||||
*h = UI_HEIGHT;
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef HAVE_REMOTE_LCD
|
||||
if (showremote)
|
||||
{
|
||||
*w = SIM_LCD_WIDTH > SIM_REMOTE_WIDTH ? SIM_LCD_WIDTH : SIM_REMOTE_WIDTH;
|
||||
*h = SIM_LCD_HEIGHT + SIM_REMOTE_HEIGHT;
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
*w = SIM_LCD_WIDTH;
|
||||
*h = SIM_LCD_HEIGHT;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#define SNAP_MARGIN 50
|
||||
static void restore_aspect_ratio(int w, int h)
|
||||
{
|
||||
float aspect_ratio = (float) h / w;
|
||||
int original_height = h;
|
||||
int original_width = w;
|
||||
|
||||
if ((SDL_GetWindowFlags(window) & (SDL_WINDOW_MAXIMIZED | SDL_WINDOW_FULLSCREEN))
|
||||
|| display_zoom)
|
||||
return;
|
||||
|
||||
SDL_GetWindowSize(window, &w, &h);
|
||||
if (w != original_width || h != original_height)
|
||||
{
|
||||
if (abs(original_width - w) < SNAP_MARGIN)
|
||||
{
|
||||
w = original_width;
|
||||
h = original_height;
|
||||
}
|
||||
else
|
||||
h = w * aspect_ratio;
|
||||
|
||||
SDL_SetWindowSize(window, w, h);
|
||||
}
|
||||
}
|
||||
|
||||
static void rebuild_gui_texture(void)
|
||||
{
|
||||
SDL_Surface *gui_surface;
|
||||
int w, h, depth = LCD_DEPTH < 8 ? 16 : LCD_DEPTH;
|
||||
|
||||
get_window_dimensions(&w, &h);
|
||||
SDL_RenderSetLogicalSize(sdlRenderer, w, h);
|
||||
if ((gui_texture = SDL_CreateTexture(sdlRenderer, SDL_MasksToPixelFormatEnum(depth,
|
||||
0, 0, 0, 0), SDL_TEXTUREACCESS_STATIC, w, h)) == NULL)
|
||||
panicf("%s", SDL_GetError());
|
||||
|
||||
if (SDL_GetWindowFlags(window) & SDL_WINDOW_RESIZABLE)
|
||||
restore_aspect_ratio(w, h);
|
||||
|
||||
if (background && picture_surface &&
|
||||
(gui_surface = SDL_ConvertSurface(picture_surface, sim_lcd_surface->format, 0)))
|
||||
{
|
||||
SDL_UpdateTexture(gui_texture, NULL, gui_surface->pixels, gui_surface->pitch);
|
||||
SDL_FreeSurface(gui_surface);
|
||||
}
|
||||
|
||||
sdl_gui_update(lcd_surface, 0, 0, SIM_LCD_WIDTH, SIM_LCD_HEIGHT,
|
||||
SIM_LCD_WIDTH, SIM_LCD_HEIGHT,
|
||||
background ? UI_LCD_POSX : 0, background? UI_LCD_POSY : 0);
|
||||
|
||||
#ifdef HAVE_REMOTE_LCD
|
||||
sdl_gui_update(remote_surface, 0, 0, LCD_REMOTE_WIDTH, LCD_REMOTE_HEIGHT,
|
||||
LCD_REMOTE_WIDTH, LCD_REMOTE_HEIGHT,
|
||||
background ? UI_REMOTE_POSX : 0,
|
||||
background? UI_REMOTE_POSY : LCD_HEIGHT);
|
||||
#endif
|
||||
}
|
||||
|
||||
void sdl_window_render(void)
|
||||
{
|
||||
if (new_gui_texture_needed)
|
||||
{
|
||||
new_gui_texture_needed = false;
|
||||
if (gui_texture)
|
||||
SDL_DestroyTexture(gui_texture);
|
||||
rebuild_gui_texture();
|
||||
}
|
||||
else
|
||||
{
|
||||
SDL_RenderClear(sdlRenderer);
|
||||
SDL_RenderCopy(sdlRenderer, gui_texture, NULL, NULL);
|
||||
SDL_RenderPresent(sdlRenderer);
|
||||
}
|
||||
}
|
||||
|
||||
bool sdl_window_adjust(void)
|
||||
{
|
||||
int w, h;
|
||||
|
||||
if (!window_adjustment_needed)
|
||||
return false;
|
||||
window_adjustment_needed = false;
|
||||
|
||||
get_window_dimensions(&w, &h);
|
||||
|
||||
if (!(SDL_GetWindowFlags(window) & (SDL_WINDOW_MAXIMIZED | SDL_WINDOW_FULLSCREEN))
|
||||
&& display_zoom)
|
||||
{
|
||||
SDL_SetWindowSize(window, display_zoom * w, display_zoom * h);
|
||||
}
|
||||
#if defined(__APPLE__) || defined(__WIN32)
|
||||
restore_aspect_ratio(w, h);
|
||||
#endif
|
||||
display_zoom = 0;
|
||||
sdl_window_render();
|
||||
return true;
|
||||
}
|
||||
|
||||
void sdl_window_adjustment_needed(bool destroy_texture)
|
||||
{
|
||||
window_adjustment_needed = true;
|
||||
new_gui_texture_needed = destroy_texture;
|
||||
|
||||
/* For MacOS and Windows, we're on a main or
|
||||
display thread already, and can immediately
|
||||
adjust the window.
|
||||
On Linux, we have to defer the update, until
|
||||
it is handled by the main thread later. */
|
||||
#if defined (__APPLE__) || defined(__WIN32)
|
||||
sdl_window_adjust();
|
||||
#endif
|
||||
}
|
||||
|
||||
void sdl_window_setup(void)
|
||||
{
|
||||
int width, height;
|
||||
int depth = LCD_DEPTH < 8 ? 16 : LCD_DEPTH;
|
||||
Uint32 flags = SDL_WINDOW_ALLOW_HIGHDPI;
|
||||
|
||||
#if (CONFIG_PLATFORM & (PLATFORM_MAEMO|PLATFORM_PANDORA))
|
||||
/* Fullscreen mode for maemo app */
|
||||
flags |= SDL_WINDOW_FULLSCREEN;
|
||||
#else
|
||||
if (display_zoom == 1)
|
||||
flags |= SDL_WINDOW_RESIZABLE;
|
||||
#endif
|
||||
|
||||
if (!(picture_surface = SDL_LoadBMP("UI256.bmp")))
|
||||
background = false;
|
||||
|
||||
get_window_dimensions(&width, &height);
|
||||
|
||||
if ((window = SDL_CreateWindow(UI_TITLE, SDL_WINDOWPOS_CENTERED,
|
||||
SDL_WINDOWPOS_CENTERED, width * display_zoom,
|
||||
height * display_zoom , flags)) == NULL)
|
||||
panicf("%s", SDL_GetError());
|
||||
if ((sdlRenderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_PRESENTVSYNC)) == NULL)
|
||||
panicf("%s", SDL_GetError());
|
||||
|
||||
/* Surface for LCD content only. Needs to fit largest LCD */
|
||||
if ((sim_lcd_surface = SDL_CreateRGBSurface(0,
|
||||
#ifdef HAVE_REMOTE_LCD
|
||||
SIM_LCD_WIDTH > SIM_REMOTE_WIDTH ?
|
||||
SIM_LCD_WIDTH : SIM_REMOTE_WIDTH,
|
||||
SIM_LCD_HEIGHT > SIM_REMOTE_HEIGHT ?
|
||||
SIM_LCD_HEIGHT : SIM_REMOTE_HEIGHT,
|
||||
#else
|
||||
SIM_LCD_WIDTH, SIM_LCD_HEIGHT,
|
||||
#endif
|
||||
depth, 0, 0, 0, 0)) == NULL)
|
||||
panicf("%s", SDL_GetError());
|
||||
|
||||
SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, display_zoom == 1 ? "best" : "nearest");
|
||||
display_zoom = 0; /* reset to 0 unless/until user requests a scale level change */
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue