limit_screen_updates = enable;
}
-static void FinalizeScreen()
+static void FinalizeScreen(int draw_target)
{
// copy global animations to render target buffer, if defined (below border)
if (gfx.draw_global_anim_function != NULL)
- gfx.draw_global_anim_function(DRAW_GLOBAL_ANIM_STAGE_1);
+ gfx.draw_global_anim_function(draw_target, DRAW_GLOBAL_ANIM_STAGE_1);
// copy global masked border to render target buffer, if defined
if (gfx.draw_global_border_function != NULL)
- gfx.draw_global_border_function(DRAW_BORDER_TO_SCREEN);
+ gfx.draw_global_border_function(draw_target);
// copy global animations to render target buffer, if defined (above border)
if (gfx.draw_global_anim_function != NULL)
- gfx.draw_global_anim_function(DRAW_GLOBAL_ANIM_STAGE_2);
+ gfx.draw_global_anim_function(draw_target, DRAW_GLOBAL_ANIM_STAGE_2);
}
static void UpdateScreenExt(SDL_Rect *rect, boolean with_frame_delay)
BlitBitmap(backbuffer, gfx.final_screen_bitmap, 0, 0,
gfx.win_xsize, gfx.win_ysize, 0, 0);
- FinalizeScreen();
+ FinalizeScreen(DRAW_TO_SCREEN);
screen = gfx.final_screen_bitmap->surface;
#if defined(TARGET_SDL2)
SDL_Texture *sdl_texture = sdl_texture_stream;
+ // deactivate use of target texture if render targets are not supported
+ if ((video.screen_rendering_mode == SPECIAL_RENDERING_TARGET ||
+ video.screen_rendering_mode == SPECIAL_RENDERING_DOUBLE) &&
+ sdl_texture_target == NULL)
+ video.screen_rendering_mode = SPECIAL_RENDERING_OFF;
+
if (video.screen_rendering_mode == SPECIAL_RENDERING_TARGET)
sdl_texture = sdl_texture_target;
SDL_RenderCopy(sdl_renderer, sdl_texture_stream, NULL, NULL);
if (video.screen_rendering_mode != SPECIAL_RENDERING_BITMAP)
- FinalizeScreen();
+ FinalizeScreen(DRAW_TO_SCREEN);
// when using target texture, copy it to screen buffer
if (video.screen_rendering_mode == SPECIAL_RENDERING_TARGET ||
{
video.window_scaling_percent = setup.window_scaling_percent;
video.window_scaling_quality = setup.window_scaling_quality;
- video.screen_rendering_mode =
- (strEqual(setup.screen_rendering_mode, STR_SPECIAL_RENDERING_BITMAP) ?
- SPECIAL_RENDERING_BITMAP :
- strEqual(setup.screen_rendering_mode, STR_SPECIAL_RENDERING_TARGET) ?
- SPECIAL_RENDERING_TARGET:
- strEqual(setup.screen_rendering_mode, STR_SPECIAL_RENDERING_DOUBLE) ?
- SPECIAL_RENDERING_DOUBLE : SPECIAL_RENDERING_OFF);
+
+ SDLSetScreenRenderingMode(setup.screen_rendering_mode);
#if defined(TARGET_SDL2)
// SDL 2.0: support for (desktop) fullscreen mode available
int surface_flags_fullscreen = SURFACE_FLAGS; // (no fullscreen in SDL 1.2)
#endif
+#if defined(TARGET_SDL2)
+#if 1
+ int renderer_flags = SDL_RENDERER_ACCELERATED | SDL_RENDERER_TARGETTEXTURE;
+#else
+ /* If SDL_CreateRenderer() is called from within a VirtualBox Windows VM
+ _without_ enabling 2D/3D acceleration and/or guest additions installed,
+ it will crash if flags are *not* set to SDL_RENDERER_SOFTWARE (because
+ it will try to use accelerated graphics and apparently fails miserably) */
+ int renderer_flags = SDL_RENDERER_SOFTWARE;
+#endif
+#endif
+
int width = video.width;
int height = video.height;
int surface_flags = (fullscreen ? surface_flags_fullscreen :
if (sdl_window != NULL)
{
-#if 0
- /* if SDL_CreateRenderer() is called from within a VirtualBox Windows VM
- *without* enabling 2D/3D acceleration and/or guest additions installed,
- it will crash if flags are *not* set to SDL_RENDERER_SOFTWARE (because
- it will try to use accelerated graphics and apparently fails miserably) */
if (sdl_renderer == NULL)
- sdl_renderer = SDL_CreateRenderer(sdl_window, -1, SDL_RENDERER_SOFTWARE);
-#else
- if (sdl_renderer == NULL)
- sdl_renderer = SDL_CreateRenderer(sdl_window, -1, 0);
-#endif
+ sdl_renderer = SDL_CreateRenderer(sdl_window, -1, renderer_flags);
if (sdl_renderer != NULL)
{
SDL_TEXTUREACCESS_STREAMING,
width, height);
- sdl_texture_target = SDL_CreateTexture(sdl_renderer,
- SDL_PIXELFORMAT_ARGB8888,
- SDL_TEXTUREACCESS_TARGET,
- width, height);
+ if (SDL_RenderTargetSupported(sdl_renderer))
+ sdl_texture_target = SDL_CreateTexture(sdl_renderer,
+ SDL_PIXELFORMAT_ARGB8888,
+ SDL_TEXTUREACCESS_TARGET,
+ width, height);
- if (sdl_texture_stream != NULL &&
- sdl_texture_target != NULL)
+ if (sdl_texture_stream != NULL)
{
// use SDL default values for RGB masks and no alpha channel
new_surface = SDL_CreateRGBSurface(0, width, height, 32, 0,0,0, 0);
video.fullscreen_enabled = FALSE;
video.window_scaling_percent = setup.window_scaling_percent;
video.window_scaling_quality = setup.window_scaling_quality;
- video.screen_rendering_mode =
- (strEqual(setup.screen_rendering_mode, STR_SPECIAL_RENDERING_BITMAP) ?
- SPECIAL_RENDERING_BITMAP :
- strEqual(setup.screen_rendering_mode, STR_SPECIAL_RENDERING_TARGET) ?
- SPECIAL_RENDERING_TARGET:
- strEqual(setup.screen_rendering_mode, STR_SPECIAL_RENDERING_DOUBLE) ?
- SPECIAL_RENDERING_DOUBLE : SPECIAL_RENDERING_OFF);
+
+ SDLSetScreenRenderingMode(setup.screen_rendering_mode);
}
}
{
SDL_Texture *new_texture;
- if (sdl_texture_stream == NULL ||
- sdl_texture_target == NULL)
+ if (sdl_texture_stream == NULL)
return;
SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, window_scaling_quality);
sdl_texture_stream = new_texture;
}
- new_texture = SDL_CreateTexture(sdl_renderer,
- SDL_PIXELFORMAT_ARGB8888,
- SDL_TEXTUREACCESS_TARGET,
- video.width, video.height);
+ if (SDL_RenderTargetSupported(sdl_renderer))
+ new_texture = SDL_CreateTexture(sdl_renderer,
+ SDL_PIXELFORMAT_ARGB8888,
+ SDL_TEXTUREACCESS_TARGET,
+ video.width, video.height);
+ else
+ new_texture = NULL;
if (new_texture != NULL)
{
video.window_scaling_quality = window_scaling_quality;
}
-void SDLSetScreenRenderingMode(char *screen_rendering_mode)
-{
- video.screen_rendering_mode =
- (strEqual(screen_rendering_mode, STR_SPECIAL_RENDERING_BITMAP) ?
- SPECIAL_RENDERING_BITMAP :
- strEqual(screen_rendering_mode, STR_SPECIAL_RENDERING_TARGET) ?
- SPECIAL_RENDERING_TARGET:
- strEqual(screen_rendering_mode, STR_SPECIAL_RENDERING_DOUBLE) ?
- SPECIAL_RENDERING_DOUBLE : SPECIAL_RENDERING_OFF);
-}
-
void SDLSetWindowFullscreen(boolean fullscreen)
{
if (sdl_window == NULL)
video.fullscreen_initial = FALSE;
}
}
+#endif
+
+void SDLSetScreenRenderingMode(char *screen_rendering_mode)
+{
+#if defined(TARGET_SDL2)
+ video.screen_rendering_mode =
+ (strEqual(screen_rendering_mode, STR_SPECIAL_RENDERING_BITMAP) ?
+ SPECIAL_RENDERING_BITMAP :
+ strEqual(screen_rendering_mode, STR_SPECIAL_RENDERING_TARGET) ?
+ SPECIAL_RENDERING_TARGET:
+ strEqual(screen_rendering_mode, STR_SPECIAL_RENDERING_DOUBLE) ?
+ SPECIAL_RENDERING_DOUBLE : SPECIAL_RENDERING_OFF);
+#else
+ video.screen_rendering_mode = SPECIAL_RENDERING_BITMAP;
+#endif
+}
void SDLRedrawWindow()
{
UpdateScreen_WithoutFrameDelay(NULL);
}
-#endif
void SDLCreateBitmapContent(Bitmap *bitmap, int width, int height,
int depth)
UpdateScreen_WithFrameDelay(&rect);
}
-void SDLFadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height,
+void PrepareFadeBitmap(int draw_target)
+{
+ Bitmap *fade_bitmap =
+ (draw_target == DRAW_TO_FADE_SOURCE ? gfx.fade_bitmap_source :
+ draw_target == DRAW_TO_FADE_TARGET ? gfx.fade_bitmap_target : NULL);
+
+ if (fade_bitmap == NULL)
+ return;
+
+ // copy backbuffer to fading buffer
+ BlitBitmap(backbuffer, fade_bitmap, 0, 0, gfx.win_xsize, gfx.win_ysize, 0, 0);
+
+ // add border and animations to fading buffer
+ FinalizeScreen(draw_target);
+}
+
+void SDLFadeRectangle(int x, int y, int width, int height,
int fade_mode, int fade_delay, int post_delay,
void (*draw_border_function)(void))
{
+ SDL_Surface *surface_backup = gfx.fade_bitmap_backup->surface;
SDL_Surface *surface_source = gfx.fade_bitmap_source->surface;
SDL_Surface *surface_target = gfx.fade_bitmap_target->surface;
SDL_Surface *surface_black = gfx.fade_bitmap_black->surface;
SDL_Surface *surface_screen = backbuffer->surface;
- SDL_Surface *surface_cross = (bitmap_cross ? bitmap_cross->surface : NULL);
SDL_Rect src_rect, dst_rect;
SDL_Rect dst_rect2;
int src_x = x, src_y = y;
dst_rect2 = dst_rect;
+ // before fading in, store backbuffer (without animation graphics)
+ if (fade_mode & (FADE_TYPE_FADE_IN | FADE_TYPE_TRANSFORM))
+ SDL_BlitSurface(surface_screen, &dst_rect, surface_backup, &src_rect);
+
/* copy source and target surfaces to temporary surfaces for fading */
if (fade_mode & FADE_TYPE_TRANSFORM)
{
- SDL_BlitSurface(surface_cross, &src_rect, surface_source, &src_rect);
- SDL_BlitSurface(surface_screen, &dst_rect, surface_target, &src_rect);
-
- draw_global_border_function(DRAW_BORDER_TO_FADE_SOURCE);
- draw_global_border_function(DRAW_BORDER_TO_FADE_TARGET);
+ // (source and target fading buffer already prepared)
}
else if (fade_mode & FADE_TYPE_FADE_IN)
{
+ // (target fading buffer already prepared)
SDL_BlitSurface(surface_black, &src_rect, surface_source, &src_rect);
- SDL_BlitSurface(surface_screen, &dst_rect, surface_target, &src_rect);
-
- draw_global_border_function(DRAW_BORDER_TO_FADE_TARGET);
}
else /* FADE_TYPE_FADE_OUT */
{
- SDL_BlitSurface(surface_screen, &dst_rect, surface_source, &src_rect);
+ // (source fading buffer already prepared)
SDL_BlitSurface(surface_black, &src_rect, surface_target, &src_rect);
-
- draw_global_border_function(DRAW_BORDER_TO_FADE_SOURCE);
}
time_current = SDL_GetTicks();
// restore function for drawing global masked border
gfx.draw_global_border_function = draw_global_border_function;
+
+ // after fading in, restore backbuffer (without animation graphics)
+ if (fade_mode & (FADE_TYPE_FADE_IN | FADE_TYPE_TRANSFORM))
+ SDL_BlitSurface(surface_backup, &dst_rect, surface_screen, &src_rect);
}
void SDLDrawSimpleLine(Bitmap *dst_bitmap, int from_x, int from_y,