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 UpdateScreen(SDL_Rect *rect)
+static void UpdateScreenExt(SDL_Rect *rect, boolean with_frame_delay)
{
static unsigned int update_screen_delay = 0;
unsigned int update_screen_delay_value = 50; /* (milliseconds) */
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 ||
#endif
// global synchronization point of the game to align video frame delay
- WaitUntilDelayReached(&video.frame_delay, video.frame_delay_value);
+ if (with_frame_delay)
+ WaitUntilDelayReached(&video.frame_delay, video.frame_delay_value);
#if defined(TARGET_SDL2)
// show render target buffer on screen
#endif
}
+static void UpdateScreen_WithFrameDelay(SDL_Rect *rect)
+{
+ UpdateScreenExt(rect, TRUE);
+}
+
+static void UpdateScreen_WithoutFrameDelay(SDL_Rect *rect)
+{
+ UpdateScreenExt(rect, FALSE);
+}
+
static void SDLSetWindowIcon(char *basename)
{
/* (setting the window icon on Mac OS X would replace the high-quality
format1->BytesPerPixel == format2->BytesPerPixel &&
format1->Rmask == format2->Rmask &&
format1->Gmask == format2->Gmask &&
- format1->Bmask == format2->Bmask &&
- format1->Amask == format2->Amask);
+ format1->Bmask == format2->Bmask);
}
-boolean SDLSetNativeSurface(SDL_Surface **surface)
+static Pixel SDLGetColorKey(SDL_Surface *surface)
{
- SDL_Surface *new_surface;
+ Pixel color_key;
- if (surface == NULL ||
- *surface == NULL ||
- backbuffer == NULL ||
- backbuffer->surface == NULL)
- return FALSE;
+ if (SDL_GetColorKey(surface, &color_key) != 0)
+ return -1;
- // if pixel format already optimized for destination surface, do nothing
- if (equalSDLPixelFormat((*surface)->format, backbuffer->surface->format))
- return FALSE;
+ return color_key;
+}
- new_surface = SDL_ConvertSurface(*surface, backbuffer->surface->format, 0);
+static boolean SDLHasColorKey(SDL_Surface *surface)
+{
+ return (SDLGetColorKey(surface) != -1);
+}
- if (new_surface == NULL)
- Error(ERR_EXIT, "SDL_ConvertSurface() failed: %s", SDL_GetError());
+static boolean SDLHasAlpha(SDL_Surface *surface)
+{
+ SDL_BlendMode blend_mode;
- SDL_FreeSurface(*surface);
+ if (SDL_GetSurfaceBlendMode(surface, &blend_mode) != 0)
+ return FALSE;
- *surface = new_surface;
+ return (blend_mode == SDL_BLENDMODE_BLEND);
+}
- return TRUE;
+static void SDLSetAlpha(SDL_Surface *surface, boolean set, int alpha)
+{
+ SDL_BlendMode blend_mode = (set ? SDL_BLENDMODE_BLEND : SDL_BLENDMODE_NONE);
+
+ SDL_SetSurfaceBlendMode(surface, blend_mode);
+ SDL_SetSurfaceAlphaMod(surface, alpha);
}
SDL_Surface *SDLGetNativeSurface(SDL_Surface *surface)
return new_surface;
}
-#else
-
boolean SDLSetNativeSurface(SDL_Surface **surface)
{
SDL_Surface *new_surface;
if (surface == NULL ||
*surface == NULL ||
- !video.initialized)
+ backbuffer == NULL ||
+ backbuffer->surface == NULL)
return FALSE;
- new_surface = SDL_DisplayFormat(*surface);
+ // if pixel format already optimized for destination surface, do nothing
+ if (equalSDLPixelFormat((*surface)->format, backbuffer->surface->format))
+ return FALSE;
- if (new_surface == NULL)
- Error(ERR_EXIT, "SDL_DisplayFormat() failed: %s", SDL_GetError());
+ new_surface = SDLGetNativeSurface(*surface);
SDL_FreeSurface(*surface);
return TRUE;
}
+#else
+
+static Pixel SDLGetColorKey(SDL_Surface *surface)
+{
+ if ((surface->flags & SDL_SRCCOLORKEY) == 0)
+ return -1;
+
+ return surface->format->colorkey;
+}
+
+static boolean SDLHasColorKey(SDL_Surface *surface)
+{
+ return (SDLGetColorKey(surface) != -1);
+}
+
+static boolean SDLHasAlpha(SDL_Surface *surface)
+{
+ return ((surface->flags & SDL_SRCALPHA) != 0);
+}
+
+static void SDLSetAlpha(SDL_Surface *surface, boolean set, int alpha)
+{
+ SDL_SetAlpha(surface, (set ? SDL_SRCALPHA : 0), alpha);
+}
+
SDL_Surface *SDLGetNativeSurface(SDL_Surface *surface)
{
SDL_Surface *new_surface;
- if (video.initialized)
- new_surface = SDL_DisplayFormat(surface);
- else
+ if (surface == NULL)
+ return NULL;
+
+ if (!video.initialized)
new_surface = SDL_ConvertSurface(surface, surface->format, SURFACE_FLAGS);
+ else if (SDLHasAlpha(surface))
+ new_surface = SDL_DisplayFormatAlpha(surface);
+ else
+ new_surface = SDL_DisplayFormat(surface);
if (new_surface == NULL)
Error(ERR_EXIT, "%s() failed: %s",
return new_surface;
}
+boolean SDLSetNativeSurface(SDL_Surface **surface)
+{
+ SDL_Surface *new_surface;
+
+ if (surface == NULL ||
+ *surface == NULL ||
+ !video.initialized)
+ return FALSE;
+
+ new_surface = SDLGetNativeSurface(*surface);
+
+ SDL_FreeSurface(*surface);
+
+ *surface = new_surface;
+
+ return TRUE;
+}
+
#endif
#if defined(TARGET_SDL2)
{
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
should never be drawn to directly, it would do no harm nevertheless. */
/* create additional (symbolic) buffer for double-buffering */
- ReCreateBitmap(&window, video.width, video.height, video.depth);
+ ReCreateBitmap(&window, video.width, video.height);
}
static boolean SDLCreateScreen(boolean fullscreen)
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(NULL);
+ UpdateScreen_WithoutFrameDelay(NULL);
}
-#endif
void SDLCreateBitmapContent(Bitmap *bitmap, int width, int height,
int depth)
&src_rect, real_dst_bitmap->surface, &dst_rect);
if (dst_bitmap == window)
- UpdateScreen(&dst_rect);
+ UpdateScreen_WithFrameDelay(&dst_rect);
}
void SDLBlitTexture(Bitmap *bitmap,
SDL_FillRect(real_dst_bitmap->surface, &rect, color);
if (dst_bitmap == window)
- UpdateScreen(&rect);
+ UpdateScreen_WithFrameDelay(&rect);
+}
+
+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(Bitmap *bitmap_cross, int x, int y, int width, int height,
+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();
int i;
SDL_BlitSurface(surface_source, &src_rect, surface_screen, &dst_rect);
-#if defined(TARGET_SDL2)
- SDL_SetSurfaceBlendMode(surface_target, SDL_BLENDMODE_NONE);
-#else
- SDL_SetAlpha(surface_target, 0, 0); /* disable alpha blending */
-#endif
+
+ SDLSetAlpha(surface_target, FALSE, 0); /* disable alpha blending */
ypos[0] = -GetSimpleRandom(16);
if (draw_border_function != NULL)
draw_border_function();
- UpdateScreen(&dst_rect2);
+ UpdateScreen_WithFrameDelay(&dst_rect2);
}
}
}
int xx_size = width / 2;
SDL_BlitSurface(surface_target, &src_rect, surface_screen, &dst_rect);
-#if defined(TARGET_SDL2)
- SDL_SetSurfaceBlendMode(surface_source, SDL_BLENDMODE_NONE);
-#else
- SDL_SetAlpha(surface_source, 0, 0); /* disable alpha blending */
-#endif
+
+ SDLSetAlpha(surface_source, FALSE, 0); /* disable alpha blending */
for (xx = 0; xx < xx_size;)
{
draw_border_function();
/* only update the region of the screen that is affected from fading */
- UpdateScreen(&dst_rect2);
+ UpdateScreen_WithFrameDelay(&dst_rect2);
}
}
else /* fading in, fading out or cross-fading */
SDL_BlitSurface(surface_source, &src_rect, surface_screen, &dst_rect);
/* draw new (target) image to screen buffer using alpha blending */
-#if defined(TARGET_SDL2)
- SDL_SetSurfaceAlphaMod(surface_target, alpha_final);
- SDL_SetSurfaceBlendMode(surface_target, SDL_BLENDMODE_BLEND);
-#else
- SDL_SetAlpha(surface_target, SDL_SRCALPHA, alpha_final);
-#endif
+ SDLSetAlpha(surface_target, TRUE, alpha_final);
SDL_BlitSurface(surface_target, &src_rect, surface_screen, &dst_rect);
if (draw_border_function != NULL)
draw_border_function();
/* only update the region of the screen that is affected from fading */
- UpdateScreen(&dst_rect);
+ UpdateScreen_WithFrameDelay(&dst_rect);
}
}
while (time_current < time_post_delay)
{
// updating the screen contains waiting for frame delay (non-busy)
- UpdateScreen(NULL);
+ UpdateScreen_WithFrameDelay(NULL);
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,
{
/* new source surface is 32 bit with a defined RGB ordering */
zoom_src = SDL_CreateRGBSurface(SURFACE_FLAGS, src->w, src->h, 32,
- 0x000000ff, 0x0000ff00, 0x00ff0000, 0);
+ 0x000000ff, 0x0000ff00, 0x00ff0000,
+ (src->format->Amask ? 0xff000000 : 0));
SDL_BlitSurface(src, NULL, zoom_src, NULL);
is_32bit = TRUE;
is_converted = TRUE;
zoom_dst = SDL_CreateRGBSurface(SURFACE_FLAGS, dst_width, dst_height, 32,
zoom_src->format->Rmask,
zoom_src->format->Gmask,
- zoom_src->format->Bmask, 0);
+ zoom_src->format->Bmask,
+ zoom_src->format->Amask);
}
else
{
return zoom_dst;
}
+static SDL_Surface *SDLGetOpaqueSurface(SDL_Surface *surface)
+{
+ SDL_Surface *new_surface;
+
+ if (surface == NULL)
+ return NULL;
+
+ if ((new_surface = SDLGetNativeSurface(surface)) == NULL)
+ Error(ERR_EXIT, "SDLGetNativeSurface() failed");
+
+ /* remove alpha channel from native non-transparent surface, if defined */
+ SDLSetAlpha(new_surface, FALSE, 0);
+
+ /* remove transparent color from native non-transparent surface, if defined */
+ SDL_SetColorKey(new_surface, UNSET_TRANSPARENT_PIXEL, 0);
+
+ return new_surface;
+}
+
Bitmap *SDLZoomBitmap(Bitmap *src_bitmap, int dst_width, int dst_height)
{
Bitmap *dst_bitmap = CreateBitmapStruct();
- SDL_Surface **dst_surface = &dst_bitmap->surface;
+ SDL_Surface *src_surface = src_bitmap->surface_masked;
+ SDL_Surface *dst_surface;
dst_width = MAX(1, dst_width); /* prevent zero bitmap width */
dst_height = MAX(1, dst_height); /* prevent zero bitmap height */
dst_bitmap->height = dst_height;
/* create zoomed temporary surface from source surface */
- *dst_surface = zoomSurface(src_bitmap->surface, dst_width, dst_height);
+ dst_surface = zoomSurface(src_surface, dst_width, dst_height);
/* create native format destination surface from zoomed temporary surface */
- SDLSetNativeSurface(dst_surface);
+ SDLSetNativeSurface(&dst_surface);
+
+ /* set color key for zoomed surface from source surface, if defined */
+ if (SDLHasColorKey(src_surface))
+ SDL_SetColorKey(dst_surface, SET_TRANSPARENT_PIXEL,
+ SDLGetColorKey(src_surface));
+
+ /* create native non-transparent surface for opaque blitting */
+ dst_bitmap->surface = SDLGetOpaqueSurface(dst_surface);
+
+ /* set native transparent surface for masked blitting */
+ dst_bitmap->surface_masked = dst_surface;
return dst_bitmap;
}
/* load image to temporary surface */
if ((sdl_image_tmp = IMG_Load(filename)) == NULL)
- {
- SetError("IMG_Load(): %s", SDL_GetError());
-
- return NULL;
- }
+ Error(ERR_EXIT, "IMG_Load() failed: %s", SDL_GetError());
print_timestamp_time("IMG_Load");
UPDATE_BUSY_STATE();
/* create native non-transparent surface for current image */
- if ((new_bitmap->surface = SDLGetNativeSurface(sdl_image_tmp)) == NULL)
- {
- SetError("SDL_DisplayFormat(): %s", SDL_GetError());
-
- return NULL;
- }
+ if ((new_bitmap->surface = SDLGetOpaqueSurface(sdl_image_tmp)) == NULL)
+ Error(ERR_EXIT, "SDLGetOpaqueSurface() failed");
- print_timestamp_time("SDL_DisplayFormat (opaque)");
+ print_timestamp_time("SDLGetNativeSurface (opaque)");
UPDATE_BUSY_STATE();
- /* create native transparent surface for current image */
- if (sdl_image_tmp->format->Amask == 0)
+ /* set black pixel to transparent if no alpha channel / transparent color */
+ if (!SDLHasAlpha(sdl_image_tmp) &&
+ !SDLHasColorKey(sdl_image_tmp))
SDL_SetColorKey(sdl_image_tmp, SET_TRANSPARENT_PIXEL,
SDL_MapRGB(sdl_image_tmp->format, 0x00, 0x00, 0x00));
+ /* create native transparent surface for current image */
if ((new_bitmap->surface_masked = SDLGetNativeSurface(sdl_image_tmp)) == NULL)
- {
- SetError("SDL_DisplayFormat(): %s", SDL_GetError());
-
- return NULL;
- }
+ Error(ERR_EXIT, "SDLGetNativeSurface() failed");
- print_timestamp_time("SDL_DisplayFormat (masked)");
+ print_timestamp_time("SDLGetNativeSurface (masked)");
UPDATE_BUSY_STATE();
projects / rocksndiamonds.git / blobdiff