Split out the bits of sdl_common.c that are version specific. SDL2 fixes still need to be done.
This commit is contained in:
Michael Martin
@@ -1,4 +1,5 @@
|
|||||||
uqm_CFILES="opengl.c palette.c primitives.c pure.c sdl2_pure.c sdl_common.c
|
uqm_CFILES="opengl.c palette.c primitives.c pure.c sdl2_pure.c
|
||||||
|
sdl_common.c sdl1_common.c sdl2_common.c
|
||||||
scalers.c 2xscalers.c
|
scalers.c 2xscalers.c
|
||||||
2xscalers_mmx.c 2xscalers_sse.c 2xscalers_3dnow.c
|
2xscalers_mmx.c 2xscalers_sse.c 2xscalers_3dnow.c
|
||||||
nearest2x.c bilinear2x.c biadv2x.c triscan2x.c hq2x.c
|
nearest2x.c bilinear2x.c biadv2x.c triscan2x.c hq2x.c
|
||||||
|
|||||||
@@ -0,0 +1,403 @@
|
|||||||
|
//Copyright Paul Reiche, Fred Ford. 1992-2002
|
||||||
|
|
||||||
|
/*
|
||||||
|
* 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 program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "sdl_common.h"
|
||||||
|
#include "opengl.h"
|
||||||
|
#include "pure.h"
|
||||||
|
#include "primitives.h"
|
||||||
|
#include "options.h"
|
||||||
|
#include "uqmversion.h"
|
||||||
|
#include "libs/graphics/drawcmd.h"
|
||||||
|
#include "libs/graphics/dcqueue.h"
|
||||||
|
#include "libs/graphics/cmap.h"
|
||||||
|
#include "libs/input/sdl/input.h"
|
||||||
|
// for ProcessInputEvent()
|
||||||
|
#include "libs/graphics/bbox.h"
|
||||||
|
#include "port.h"
|
||||||
|
#include "libs/uio.h"
|
||||||
|
#include "libs/log.h"
|
||||||
|
#include "libs/memlib.h"
|
||||||
|
#include "libs/vidlib.h"
|
||||||
|
|
||||||
|
#if SDL_MAJOR_VERSION == 1
|
||||||
|
|
||||||
|
void
|
||||||
|
TFB_PreInit (void)
|
||||||
|
{
|
||||||
|
log_add (log_Info, "Initializing base SDL functionality.");
|
||||||
|
log_add (log_Info, "Using SDL version %d.%d.%d (compiled with "
|
||||||
|
"%d.%d.%d)", SDL_Linked_Version ()->major,
|
||||||
|
SDL_Linked_Version ()->minor, SDL_Linked_Version ()->patch,
|
||||||
|
SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL);
|
||||||
|
#if 0
|
||||||
|
if (SDL_Linked_Version ()->major != SDL_MAJOR_VERSION ||
|
||||||
|
SDL_Linked_Version ()->minor != SDL_MINOR_VERSION ||
|
||||||
|
SDL_Linked_Version ()->patch != SDL_PATCHLEVEL) {
|
||||||
|
log_add (log_Warning, "The used SDL library is not the same version "
|
||||||
|
"as the one used to compile The Ur-Quan Masters with! "
|
||||||
|
"If you experience any crashes, this would be an excellent "
|
||||||
|
"suspect.");
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if ((SDL_Init (SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE) == -1))
|
||||||
|
{
|
||||||
|
log_add (log_Fatal, "Could not initialize SDL: %s.", SDL_GetError ());
|
||||||
|
exit (EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
TFB_ReInitGraphics (int driver, int flags, int width, int height)
|
||||||
|
{
|
||||||
|
int result;
|
||||||
|
int togglefullscreen = 0;
|
||||||
|
char caption[200];
|
||||||
|
|
||||||
|
if (GfxFlags == (flags ^ TFB_GFXFLAGS_FULLSCREEN) &&
|
||||||
|
driver == GraphicsDriver &&
|
||||||
|
width == ScreenWidthActual && height == ScreenHeightActual)
|
||||||
|
{
|
||||||
|
togglefullscreen = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
GfxFlags = flags;
|
||||||
|
|
||||||
|
if (driver == TFB_GFXDRIVER_SDL_OPENGL)
|
||||||
|
{
|
||||||
|
#ifdef HAVE_OPENGL
|
||||||
|
result = TFB_GL_ConfigureVideo (driver, flags, width, height,
|
||||||
|
togglefullscreen);
|
||||||
|
#else
|
||||||
|
driver = TFB_GFXDRIVER_SDL_PURE;
|
||||||
|
log_add (log_Warning, "OpenGL support not compiled in,"
|
||||||
|
" so using pure SDL driver");
|
||||||
|
result = TFB_Pure_ConfigureVideo (driver, flags, width, height,
|
||||||
|
togglefullscreen);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
result = TFB_Pure_ConfigureVideo (driver, flags, width, height,
|
||||||
|
togglefullscreen);
|
||||||
|
}
|
||||||
|
|
||||||
|
sprintf (caption, "The Ur-Quan Masters v%d.%d.%d%s",
|
||||||
|
UQM_MAJOR_VERSION, UQM_MINOR_VERSION,
|
||||||
|
UQM_PATCH_VERSION, UQM_EXTRA_VERSION);
|
||||||
|
SDL_WM_SetCaption (caption, NULL);
|
||||||
|
|
||||||
|
if (flags & TFB_GFXFLAGS_FULLSCREEN)
|
||||||
|
SDL_ShowCursor (SDL_DISABLE);
|
||||||
|
else
|
||||||
|
SDL_ShowCursor (SDL_ENABLE);
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Probably ought to clean this away at some point. */
|
||||||
|
SDL_Surface *
|
||||||
|
TFB_DisplayFormatAlpha (SDL_Surface *surface)
|
||||||
|
{
|
||||||
|
SDL_Surface* newsurf;
|
||||||
|
SDL_PixelFormat* dstfmt;
|
||||||
|
const SDL_PixelFormat* srcfmt = surface->format;
|
||||||
|
|
||||||
|
// figure out what format to use (alpha/no alpha)
|
||||||
|
if (surface->format->Amask)
|
||||||
|
dstfmt = format_conv_surf->format;
|
||||||
|
else
|
||||||
|
dstfmt = SDL_Screen->format;
|
||||||
|
|
||||||
|
if (srcfmt->BytesPerPixel == dstfmt->BytesPerPixel &&
|
||||||
|
srcfmt->Rmask == dstfmt->Rmask &&
|
||||||
|
srcfmt->Gmask == dstfmt->Gmask &&
|
||||||
|
srcfmt->Bmask == dstfmt->Bmask &&
|
||||||
|
srcfmt->Amask == dstfmt->Amask)
|
||||||
|
return surface; // no conversion needed
|
||||||
|
|
||||||
|
newsurf = SDL_ConvertSurface (surface, dstfmt, surface->flags);
|
||||||
|
// SDL_SRCCOLORKEY and SDL_SRCALPHA cannot work at the same time,
|
||||||
|
// so we need to disable one of them
|
||||||
|
if ((surface->flags & SDL_SRCCOLORKEY) && newsurf
|
||||||
|
&& (newsurf->flags & SDL_SRCCOLORKEY)
|
||||||
|
&& (newsurf->flags & SDL_SRCALPHA))
|
||||||
|
SDL_SetAlpha (newsurf, 0, 255);
|
||||||
|
|
||||||
|
return newsurf;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
TFB_BlitSurface (SDL_Surface *src, SDL_Rect *srcrect, SDL_Surface *dst,
|
||||||
|
SDL_Rect *dstrect, int blend_numer, int blend_denom)
|
||||||
|
{
|
||||||
|
BOOLEAN has_colorkey;
|
||||||
|
int x, y, x1, y1, x2, y2, dst_x2, dst_y2, nr, ng, nb;
|
||||||
|
int srcx, srcy, w, h;
|
||||||
|
Uint8 sr, sg, sb, dr, dg, db;
|
||||||
|
Uint32 src_pixval, dst_pixval, colorkey;
|
||||||
|
GetPixelFn src_getpix, dst_getpix;
|
||||||
|
PutPixelFn putpix;
|
||||||
|
SDL_Rect fulldst;
|
||||||
|
|
||||||
|
if (blend_numer == blend_denom)
|
||||||
|
{
|
||||||
|
// normal blit: dst = src
|
||||||
|
|
||||||
|
// log_add (log_Debug, "normal blit\n");
|
||||||
|
SDL_BlitSurface (src, srcrect, dst, dstrect);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// NOTE: following clipping code is copied from SDL-1.2.4 sources
|
||||||
|
|
||||||
|
// If the destination rectangle is NULL, use the entire dest surface
|
||||||
|
if (dstrect == NULL)
|
||||||
|
{
|
||||||
|
fulldst.x = fulldst.y = 0;
|
||||||
|
dstrect = &fulldst;
|
||||||
|
}
|
||||||
|
|
||||||
|
// clip the source rectangle to the source surface
|
||||||
|
if (srcrect)
|
||||||
|
{
|
||||||
|
int maxw, maxh;
|
||||||
|
|
||||||
|
srcx = srcrect->x;
|
||||||
|
w = srcrect->w;
|
||||||
|
if (srcx < 0)
|
||||||
|
{
|
||||||
|
w += srcx;
|
||||||
|
dstrect->x -= srcx;
|
||||||
|
srcx = 0;
|
||||||
|
}
|
||||||
|
maxw = src->w - srcx;
|
||||||
|
if (maxw < w)
|
||||||
|
w = maxw;
|
||||||
|
|
||||||
|
srcy = srcrect->y;
|
||||||
|
h = srcrect->h;
|
||||||
|
if (srcy < 0)
|
||||||
|
{
|
||||||
|
h += srcy;
|
||||||
|
dstrect->y -= srcy;
|
||||||
|
srcy = 0;
|
||||||
|
}
|
||||||
|
maxh = src->h - srcy;
|
||||||
|
if (maxh < h)
|
||||||
|
h = maxh;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
srcx = 0;
|
||||||
|
srcy = 0;
|
||||||
|
w = src->w;
|
||||||
|
h = src->h;
|
||||||
|
}
|
||||||
|
|
||||||
|
// clip the destination rectangle against the clip rectangle
|
||||||
|
{
|
||||||
|
SDL_Rect *clip = &dst->clip_rect;
|
||||||
|
int dx, dy;
|
||||||
|
|
||||||
|
dx = clip->x - dstrect->x;
|
||||||
|
if (dx > 0)
|
||||||
|
{
|
||||||
|
w -= dx;
|
||||||
|
dstrect->x += dx;
|
||||||
|
srcx += dx;
|
||||||
|
}
|
||||||
|
dx = dstrect->x + w - clip->x - clip->w;
|
||||||
|
if (dx > 0)
|
||||||
|
w -= dx;
|
||||||
|
|
||||||
|
dy = clip->y - dstrect->y;
|
||||||
|
if (dy > 0)
|
||||||
|
{
|
||||||
|
h -= dy;
|
||||||
|
dstrect->y += dy;
|
||||||
|
srcy += dy;
|
||||||
|
}
|
||||||
|
dy = dstrect->y + h - clip->y - clip->h;
|
||||||
|
if (dy > 0)
|
||||||
|
h -= dy;
|
||||||
|
}
|
||||||
|
|
||||||
|
dstrect->w = w;
|
||||||
|
dstrect->h = h;
|
||||||
|
|
||||||
|
if (w <= 0 || h <= 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
x1 = srcx;
|
||||||
|
y1 = srcy;
|
||||||
|
x2 = srcx + w;
|
||||||
|
y2 = srcy + h;
|
||||||
|
|
||||||
|
if (src->flags & SDL_SRCCOLORKEY)
|
||||||
|
{
|
||||||
|
has_colorkey = TRUE;
|
||||||
|
colorkey = src->format->colorkey;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
has_colorkey = FALSE;
|
||||||
|
colorkey = 0; /* Satisfying compiler */
|
||||||
|
}
|
||||||
|
|
||||||
|
src_getpix = getpixel_for (src);
|
||||||
|
dst_getpix = getpixel_for (dst);
|
||||||
|
putpix = putpixel_for (dst);
|
||||||
|
|
||||||
|
if (blend_denom < 0)
|
||||||
|
{
|
||||||
|
// additive blit: dst = src + dst
|
||||||
|
#if 0
|
||||||
|
log_add (log_Debug, "additive blit %d %d, src %d %d %d %d dst %d %d,"
|
||||||
|
" srcbpp %d", blend_numer, blend_denom, x1, y1, x2, y2,
|
||||||
|
dstrect->x, dstrect->y, src->format->BitsPerPixel);
|
||||||
|
#endif
|
||||||
|
for (y = y1; y < y2; ++y)
|
||||||
|
{
|
||||||
|
dst_y2 = dstrect->y + (y - y1);
|
||||||
|
for (x = x1; x < x2; ++x)
|
||||||
|
{
|
||||||
|
dst_x2 = dstrect->x + (x - x1);
|
||||||
|
src_pixval = src_getpix (src, x, y);
|
||||||
|
|
||||||
|
if (has_colorkey && src_pixval == colorkey)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
dst_pixval = dst_getpix (dst, dst_x2, dst_y2);
|
||||||
|
|
||||||
|
SDL_GetRGB (src_pixval, src->format, &sr, &sg, &sb);
|
||||||
|
SDL_GetRGB (dst_pixval, dst->format, &dr, &dg, &db);
|
||||||
|
|
||||||
|
nr = sr + dr;
|
||||||
|
ng = sg + dg;
|
||||||
|
nb = sb + db;
|
||||||
|
|
||||||
|
if (nr > 255)
|
||||||
|
nr = 255;
|
||||||
|
if (ng > 255)
|
||||||
|
ng = 255;
|
||||||
|
if (nb > 255)
|
||||||
|
nb = 255;
|
||||||
|
|
||||||
|
putpix (dst, dst_x2, dst_y2,
|
||||||
|
SDL_MapRGB (dst->format, nr, ng, nb));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (blend_numer < 0)
|
||||||
|
{
|
||||||
|
// subtractive blit: dst = src - dst
|
||||||
|
#if 0
|
||||||
|
log_add (log_Debug, "subtractive blit %d %d, src %d %d %d %d"
|
||||||
|
" dst %d %d, srcbpp %d", blend_numer, blend_denom,
|
||||||
|
x1, y1, x2, y2, dstrect->x, dstrect->y,
|
||||||
|
src->format->BitsPerPixel);
|
||||||
|
#endif
|
||||||
|
for (y = y1; y < y2; ++y)
|
||||||
|
{
|
||||||
|
dst_y2 = dstrect->y + (y - y1);
|
||||||
|
for (x = x1; x < x2; ++x)
|
||||||
|
{
|
||||||
|
dst_x2 = dstrect->x + (x - x1);
|
||||||
|
src_pixval = src_getpix (src, x, y);
|
||||||
|
|
||||||
|
if (has_colorkey && src_pixval == colorkey)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
dst_pixval = dst_getpix (dst, dst_x2, dst_y2);
|
||||||
|
|
||||||
|
SDL_GetRGB (src_pixval, src->format, &sr, &sg, &sb);
|
||||||
|
SDL_GetRGB (dst_pixval, dst->format, &dr, &dg, &db);
|
||||||
|
|
||||||
|
nr = sr - dr;
|
||||||
|
ng = sg - dg;
|
||||||
|
nb = sb - db;
|
||||||
|
|
||||||
|
if (nr < 0)
|
||||||
|
nr = 0;
|
||||||
|
if (ng < 0)
|
||||||
|
ng = 0;
|
||||||
|
if (nb < 0)
|
||||||
|
nb = 0;
|
||||||
|
|
||||||
|
putpix (dst, dst_x2, dst_y2,
|
||||||
|
SDL_MapRGB (dst->format, nr, ng, nb));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// modulated blit: dst = src * (blend_numer / blend_denom)
|
||||||
|
|
||||||
|
float f = blend_numer / (float)blend_denom;
|
||||||
|
#if 0
|
||||||
|
log_add (log_Debug, "modulated blit %d %d, f %f, src %d %d %d %d"
|
||||||
|
" dst %d %d, srcbpp %d\n", blend_numer, blend_denom, f,
|
||||||
|
x1, y1, x2, y2, dstrect->x, dstrect->y,
|
||||||
|
src->format->BitsPerPixel);
|
||||||
|
#endif
|
||||||
|
for (y = y1; y < y2; ++y)
|
||||||
|
{
|
||||||
|
dst_y2 = dstrect->y + (y - y1);
|
||||||
|
for (x = x1; x < x2; ++x)
|
||||||
|
{
|
||||||
|
dst_x2 = dstrect->x + (x - x1);
|
||||||
|
src_pixval = src_getpix (src, x, y);
|
||||||
|
|
||||||
|
if (has_colorkey && src_pixval == colorkey)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
SDL_GetRGB (src_pixval, src->format, &sr, &sg, &sb);
|
||||||
|
|
||||||
|
nr = (int)(sr * f);
|
||||||
|
ng = (int)(sg * f);
|
||||||
|
nb = (int)(sb * f);
|
||||||
|
|
||||||
|
if (nr > 255)
|
||||||
|
nr = 255;
|
||||||
|
if (ng > 255)
|
||||||
|
ng = 255;
|
||||||
|
if (nb > 255)
|
||||||
|
nb = 255;
|
||||||
|
|
||||||
|
putpix (dst, dst_x2, dst_y2,
|
||||||
|
SDL_MapRGB (dst->format, nr, ng, nb));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
TFB_SetGamma (float gamma)
|
||||||
|
{
|
||||||
|
if (SDL_SetGamma (gamma, gamma, gamma) == -1)
|
||||||
|
{
|
||||||
|
log_add (log_Warning, "Unable to set gamma correction.");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
log_add (log_Info, "Gamma correction set to %1.4f.", gamma);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
@@ -0,0 +1,403 @@
|
|||||||
|
//Copyright Paul Reiche, Fred Ford. 1992-2002
|
||||||
|
|
||||||
|
/*
|
||||||
|
* 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 program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "sdl_common.h"
|
||||||
|
#include "opengl.h"
|
||||||
|
#include "pure.h"
|
||||||
|
#include "primitives.h"
|
||||||
|
#include "options.h"
|
||||||
|
#include "uqmversion.h"
|
||||||
|
#include "libs/graphics/drawcmd.h"
|
||||||
|
#include "libs/graphics/dcqueue.h"
|
||||||
|
#include "libs/graphics/cmap.h"
|
||||||
|
#include "libs/input/sdl/input.h"
|
||||||
|
// for ProcessInputEvent()
|
||||||
|
#include "libs/graphics/bbox.h"
|
||||||
|
#include "port.h"
|
||||||
|
#include "libs/uio.h"
|
||||||
|
#include "libs/log.h"
|
||||||
|
#include "libs/memlib.h"
|
||||||
|
#include "libs/vidlib.h"
|
||||||
|
|
||||||
|
#if SDL_MAJOR_VERSION > 1
|
||||||
|
|
||||||
|
void
|
||||||
|
TFB_PreInit (void)
|
||||||
|
{
|
||||||
|
log_add (log_Info, "Initializing base SDL functionality.");
|
||||||
|
log_add (log_Info, "Using SDL version %d.%d.%d (compiled with "
|
||||||
|
"%d.%d.%d)", SDL_Linked_Version ()->major,
|
||||||
|
SDL_Linked_Version ()->minor, SDL_Linked_Version ()->patch,
|
||||||
|
SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL);
|
||||||
|
#if 0
|
||||||
|
if (SDL_Linked_Version ()->major != SDL_MAJOR_VERSION ||
|
||||||
|
SDL_Linked_Version ()->minor != SDL_MINOR_VERSION ||
|
||||||
|
SDL_Linked_Version ()->patch != SDL_PATCHLEVEL) {
|
||||||
|
log_add (log_Warning, "The used SDL library is not the same version "
|
||||||
|
"as the one used to compile The Ur-Quan Masters with! "
|
||||||
|
"If you experience any crashes, this would be an excellent "
|
||||||
|
"suspect.");
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if ((SDL_Init (SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE) == -1))
|
||||||
|
{
|
||||||
|
log_add (log_Fatal, "Could not initialize SDL: %s.", SDL_GetError ());
|
||||||
|
exit (EXIT_FAILURE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
TFB_ReInitGraphics (int driver, int flags, int width, int height)
|
||||||
|
{
|
||||||
|
int result;
|
||||||
|
int togglefullscreen = 0;
|
||||||
|
char caption[200];
|
||||||
|
|
||||||
|
if (GfxFlags == (flags ^ TFB_GFXFLAGS_FULLSCREEN) &&
|
||||||
|
driver == GraphicsDriver &&
|
||||||
|
width == ScreenWidthActual && height == ScreenHeightActual)
|
||||||
|
{
|
||||||
|
togglefullscreen = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
GfxFlags = flags;
|
||||||
|
|
||||||
|
if (driver == TFB_GFXDRIVER_SDL_OPENGL)
|
||||||
|
{
|
||||||
|
#ifdef HAVE_OPENGL
|
||||||
|
result = TFB_GL_ConfigureVideo (driver, flags, width, height,
|
||||||
|
togglefullscreen);
|
||||||
|
#else
|
||||||
|
driver = TFB_GFXDRIVER_SDL_PURE;
|
||||||
|
log_add (log_Warning, "OpenGL support not compiled in,"
|
||||||
|
" so using pure SDL driver");
|
||||||
|
result = TFB_Pure_ConfigureVideo (driver, flags, width, height,
|
||||||
|
togglefullscreen);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
result = TFB_Pure_ConfigureVideo (driver, flags, width, height,
|
||||||
|
togglefullscreen);
|
||||||
|
}
|
||||||
|
|
||||||
|
sprintf (caption, "The Ur-Quan Masters v%d.%d.%d%s",
|
||||||
|
UQM_MAJOR_VERSION, UQM_MINOR_VERSION,
|
||||||
|
UQM_PATCH_VERSION, UQM_EXTRA_VERSION);
|
||||||
|
SDL_WM_SetCaption (caption, NULL);
|
||||||
|
|
||||||
|
if (flags & TFB_GFXFLAGS_FULLSCREEN)
|
||||||
|
SDL_ShowCursor (SDL_DISABLE);
|
||||||
|
else
|
||||||
|
SDL_ShowCursor (SDL_ENABLE);
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Probably ought to clean this away at some point. */
|
||||||
|
SDL_Surface *
|
||||||
|
TFB_DisplayFormatAlpha (SDL_Surface *surface)
|
||||||
|
{
|
||||||
|
SDL_Surface* newsurf;
|
||||||
|
SDL_PixelFormat* dstfmt;
|
||||||
|
const SDL_PixelFormat* srcfmt = surface->format;
|
||||||
|
|
||||||
|
// figure out what format to use (alpha/no alpha)
|
||||||
|
if (surface->format->Amask)
|
||||||
|
dstfmt = format_conv_surf->format;
|
||||||
|
else
|
||||||
|
dstfmt = SDL_Screen->format;
|
||||||
|
|
||||||
|
if (srcfmt->BytesPerPixel == dstfmt->BytesPerPixel &&
|
||||||
|
srcfmt->Rmask == dstfmt->Rmask &&
|
||||||
|
srcfmt->Gmask == dstfmt->Gmask &&
|
||||||
|
srcfmt->Bmask == dstfmt->Bmask &&
|
||||||
|
srcfmt->Amask == dstfmt->Amask)
|
||||||
|
return surface; // no conversion needed
|
||||||
|
|
||||||
|
newsurf = SDL_ConvertSurface (surface, dstfmt, surface->flags);
|
||||||
|
// SDL_SRCCOLORKEY and SDL_SRCALPHA cannot work at the same time,
|
||||||
|
// so we need to disable one of them
|
||||||
|
if ((surface->flags & SDL_SRCCOLORKEY) && newsurf
|
||||||
|
&& (newsurf->flags & SDL_SRCCOLORKEY)
|
||||||
|
&& (newsurf->flags & SDL_SRCALPHA))
|
||||||
|
SDL_SetAlpha (newsurf, 0, 255);
|
||||||
|
|
||||||
|
return newsurf;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
TFB_BlitSurface (SDL_Surface *src, SDL_Rect *srcrect, SDL_Surface *dst,
|
||||||
|
SDL_Rect *dstrect, int blend_numer, int blend_denom)
|
||||||
|
{
|
||||||
|
BOOLEAN has_colorkey;
|
||||||
|
int x, y, x1, y1, x2, y2, dst_x2, dst_y2, nr, ng, nb;
|
||||||
|
int srcx, srcy, w, h;
|
||||||
|
Uint8 sr, sg, sb, dr, dg, db;
|
||||||
|
Uint32 src_pixval, dst_pixval, colorkey;
|
||||||
|
GetPixelFn src_getpix, dst_getpix;
|
||||||
|
PutPixelFn putpix;
|
||||||
|
SDL_Rect fulldst;
|
||||||
|
|
||||||
|
if (blend_numer == blend_denom)
|
||||||
|
{
|
||||||
|
// normal blit: dst = src
|
||||||
|
|
||||||
|
// log_add (log_Debug, "normal blit\n");
|
||||||
|
SDL_BlitSurface (src, srcrect, dst, dstrect);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// NOTE: following clipping code is copied from SDL-1.2.4 sources
|
||||||
|
|
||||||
|
// If the destination rectangle is NULL, use the entire dest surface
|
||||||
|
if (dstrect == NULL)
|
||||||
|
{
|
||||||
|
fulldst.x = fulldst.y = 0;
|
||||||
|
dstrect = &fulldst;
|
||||||
|
}
|
||||||
|
|
||||||
|
// clip the source rectangle to the source surface
|
||||||
|
if (srcrect)
|
||||||
|
{
|
||||||
|
int maxw, maxh;
|
||||||
|
|
||||||
|
srcx = srcrect->x;
|
||||||
|
w = srcrect->w;
|
||||||
|
if (srcx < 0)
|
||||||
|
{
|
||||||
|
w += srcx;
|
||||||
|
dstrect->x -= srcx;
|
||||||
|
srcx = 0;
|
||||||
|
}
|
||||||
|
maxw = src->w - srcx;
|
||||||
|
if (maxw < w)
|
||||||
|
w = maxw;
|
||||||
|
|
||||||
|
srcy = srcrect->y;
|
||||||
|
h = srcrect->h;
|
||||||
|
if (srcy < 0)
|
||||||
|
{
|
||||||
|
h += srcy;
|
||||||
|
dstrect->y -= srcy;
|
||||||
|
srcy = 0;
|
||||||
|
}
|
||||||
|
maxh = src->h - srcy;
|
||||||
|
if (maxh < h)
|
||||||
|
h = maxh;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
srcx = 0;
|
||||||
|
srcy = 0;
|
||||||
|
w = src->w;
|
||||||
|
h = src->h;
|
||||||
|
}
|
||||||
|
|
||||||
|
// clip the destination rectangle against the clip rectangle
|
||||||
|
{
|
||||||
|
SDL_Rect *clip = &dst->clip_rect;
|
||||||
|
int dx, dy;
|
||||||
|
|
||||||
|
dx = clip->x - dstrect->x;
|
||||||
|
if (dx > 0)
|
||||||
|
{
|
||||||
|
w -= dx;
|
||||||
|
dstrect->x += dx;
|
||||||
|
srcx += dx;
|
||||||
|
}
|
||||||
|
dx = dstrect->x + w - clip->x - clip->w;
|
||||||
|
if (dx > 0)
|
||||||
|
w -= dx;
|
||||||
|
|
||||||
|
dy = clip->y - dstrect->y;
|
||||||
|
if (dy > 0)
|
||||||
|
{
|
||||||
|
h -= dy;
|
||||||
|
dstrect->y += dy;
|
||||||
|
srcy += dy;
|
||||||
|
}
|
||||||
|
dy = dstrect->y + h - clip->y - clip->h;
|
||||||
|
if (dy > 0)
|
||||||
|
h -= dy;
|
||||||
|
}
|
||||||
|
|
||||||
|
dstrect->w = w;
|
||||||
|
dstrect->h = h;
|
||||||
|
|
||||||
|
if (w <= 0 || h <= 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
x1 = srcx;
|
||||||
|
y1 = srcy;
|
||||||
|
x2 = srcx + w;
|
||||||
|
y2 = srcy + h;
|
||||||
|
|
||||||
|
if (src->flags & SDL_SRCCOLORKEY)
|
||||||
|
{
|
||||||
|
has_colorkey = TRUE;
|
||||||
|
colorkey = src->format->colorkey;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
has_colorkey = FALSE;
|
||||||
|
colorkey = 0; /* Satisfying compiler */
|
||||||
|
}
|
||||||
|
|
||||||
|
src_getpix = getpixel_for (src);
|
||||||
|
dst_getpix = getpixel_for (dst);
|
||||||
|
putpix = putpixel_for (dst);
|
||||||
|
|
||||||
|
if (blend_denom < 0)
|
||||||
|
{
|
||||||
|
// additive blit: dst = src + dst
|
||||||
|
#if 0
|
||||||
|
log_add (log_Debug, "additive blit %d %d, src %d %d %d %d dst %d %d,"
|
||||||
|
" srcbpp %d", blend_numer, blend_denom, x1, y1, x2, y2,
|
||||||
|
dstrect->x, dstrect->y, src->format->BitsPerPixel);
|
||||||
|
#endif
|
||||||
|
for (y = y1; y < y2; ++y)
|
||||||
|
{
|
||||||
|
dst_y2 = dstrect->y + (y - y1);
|
||||||
|
for (x = x1; x < x2; ++x)
|
||||||
|
{
|
||||||
|
dst_x2 = dstrect->x + (x - x1);
|
||||||
|
src_pixval = src_getpix (src, x, y);
|
||||||
|
|
||||||
|
if (has_colorkey && src_pixval == colorkey)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
dst_pixval = dst_getpix (dst, dst_x2, dst_y2);
|
||||||
|
|
||||||
|
SDL_GetRGB (src_pixval, src->format, &sr, &sg, &sb);
|
||||||
|
SDL_GetRGB (dst_pixval, dst->format, &dr, &dg, &db);
|
||||||
|
|
||||||
|
nr = sr + dr;
|
||||||
|
ng = sg + dg;
|
||||||
|
nb = sb + db;
|
||||||
|
|
||||||
|
if (nr > 255)
|
||||||
|
nr = 255;
|
||||||
|
if (ng > 255)
|
||||||
|
ng = 255;
|
||||||
|
if (nb > 255)
|
||||||
|
nb = 255;
|
||||||
|
|
||||||
|
putpix (dst, dst_x2, dst_y2,
|
||||||
|
SDL_MapRGB (dst->format, nr, ng, nb));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (blend_numer < 0)
|
||||||
|
{
|
||||||
|
// subtractive blit: dst = src - dst
|
||||||
|
#if 0
|
||||||
|
log_add (log_Debug, "subtractive blit %d %d, src %d %d %d %d"
|
||||||
|
" dst %d %d, srcbpp %d", blend_numer, blend_denom,
|
||||||
|
x1, y1, x2, y2, dstrect->x, dstrect->y,
|
||||||
|
src->format->BitsPerPixel);
|
||||||
|
#endif
|
||||||
|
for (y = y1; y < y2; ++y)
|
||||||
|
{
|
||||||
|
dst_y2 = dstrect->y + (y - y1);
|
||||||
|
for (x = x1; x < x2; ++x)
|
||||||
|
{
|
||||||
|
dst_x2 = dstrect->x + (x - x1);
|
||||||
|
src_pixval = src_getpix (src, x, y);
|
||||||
|
|
||||||
|
if (has_colorkey && src_pixval == colorkey)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
dst_pixval = dst_getpix (dst, dst_x2, dst_y2);
|
||||||
|
|
||||||
|
SDL_GetRGB (src_pixval, src->format, &sr, &sg, &sb);
|
||||||
|
SDL_GetRGB (dst_pixval, dst->format, &dr, &dg, &db);
|
||||||
|
|
||||||
|
nr = sr - dr;
|
||||||
|
ng = sg - dg;
|
||||||
|
nb = sb - db;
|
||||||
|
|
||||||
|
if (nr < 0)
|
||||||
|
nr = 0;
|
||||||
|
if (ng < 0)
|
||||||
|
ng = 0;
|
||||||
|
if (nb < 0)
|
||||||
|
nb = 0;
|
||||||
|
|
||||||
|
putpix (dst, dst_x2, dst_y2,
|
||||||
|
SDL_MapRGB (dst->format, nr, ng, nb));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// modulated blit: dst = src * (blend_numer / blend_denom)
|
||||||
|
|
||||||
|
float f = blend_numer / (float)blend_denom;
|
||||||
|
#if 0
|
||||||
|
log_add (log_Debug, "modulated blit %d %d, f %f, src %d %d %d %d"
|
||||||
|
" dst %d %d, srcbpp %d\n", blend_numer, blend_denom, f,
|
||||||
|
x1, y1, x2, y2, dstrect->x, dstrect->y,
|
||||||
|
src->format->BitsPerPixel);
|
||||||
|
#endif
|
||||||
|
for (y = y1; y < y2; ++y)
|
||||||
|
{
|
||||||
|
dst_y2 = dstrect->y + (y - y1);
|
||||||
|
for (x = x1; x < x2; ++x)
|
||||||
|
{
|
||||||
|
dst_x2 = dstrect->x + (x - x1);
|
||||||
|
src_pixval = src_getpix (src, x, y);
|
||||||
|
|
||||||
|
if (has_colorkey && src_pixval == colorkey)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
SDL_GetRGB (src_pixval, src->format, &sr, &sg, &sb);
|
||||||
|
|
||||||
|
nr = (int)(sr * f);
|
||||||
|
ng = (int)(sg * f);
|
||||||
|
nb = (int)(sb * f);
|
||||||
|
|
||||||
|
if (nr > 255)
|
||||||
|
nr = 255;
|
||||||
|
if (ng > 255)
|
||||||
|
ng = 255;
|
||||||
|
if (nb > 255)
|
||||||
|
nb = 255;
|
||||||
|
|
||||||
|
putpix (dst, dst_x2, dst_y2,
|
||||||
|
SDL_MapRGB (dst->format, nr, ng, nb));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
TFB_SetGamma (float gamma)
|
||||||
|
{
|
||||||
|
if (SDL_SetGamma (gamma, gamma, gamma) == -1)
|
||||||
|
{
|
||||||
|
log_add (log_Warning, "Unable to set gamma correction.");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
log_add (log_Info, "Gamma correction set to %1.4f.", gamma);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
@@ -33,7 +33,6 @@
|
|||||||
#include "libs/log.h"
|
#include "libs/log.h"
|
||||||
#include "libs/memlib.h"
|
#include "libs/memlib.h"
|
||||||
#include "libs/vidlib.h"
|
#include "libs/vidlib.h"
|
||||||
#include SDL_INCLUDE(SDL_thread.h)
|
|
||||||
|
|
||||||
SDL_Surface *SDL_Screen;
|
SDL_Surface *SDL_Screen;
|
||||||
SDL_Surface *TransitionScreen;
|
SDL_Surface *TransitionScreen;
|
||||||
@@ -51,80 +50,6 @@ TFB_GRAPHICS_BACKEND *graphics_backend = NULL;
|
|||||||
volatile int QuitPosted = 0;
|
volatile int QuitPosted = 0;
|
||||||
volatile int GameActive = 1; // Track the SDL_ACTIVEEVENT state SDL_APPACTIVE
|
volatile int GameActive = 1; // Track the SDL_ACTIVEEVENT state SDL_APPACTIVE
|
||||||
|
|
||||||
void
|
|
||||||
TFB_PreInit (void)
|
|
||||||
{
|
|
||||||
log_add (log_Info, "Initializing base SDL functionality.");
|
|
||||||
log_add (log_Info, "Using SDL version %d.%d.%d (compiled with "
|
|
||||||
"%d.%d.%d)", SDL_Linked_Version ()->major,
|
|
||||||
SDL_Linked_Version ()->minor, SDL_Linked_Version ()->patch,
|
|
||||||
SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL);
|
|
||||||
#if 0
|
|
||||||
if (SDL_Linked_Version ()->major != SDL_MAJOR_VERSION ||
|
|
||||||
SDL_Linked_Version ()->minor != SDL_MINOR_VERSION ||
|
|
||||||
SDL_Linked_Version ()->patch != SDL_PATCHLEVEL) {
|
|
||||||
log_add (log_Warning, "The used SDL library is not the same version "
|
|
||||||
"as the one used to compile The Ur-Quan Masters with! "
|
|
||||||
"If you experience any crashes, this would be an excellent "
|
|
||||||
"suspect.");
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if ((SDL_Init (SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE) == -1))
|
|
||||||
{
|
|
||||||
log_add (log_Fatal, "Could not initialize SDL: %s.", SDL_GetError ());
|
|
||||||
exit (EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
TFB_ReInitGraphics (int driver, int flags, int width, int height)
|
|
||||||
{
|
|
||||||
int result;
|
|
||||||
int togglefullscreen = 0;
|
|
||||||
char caption[200];
|
|
||||||
|
|
||||||
if (GfxFlags == (flags ^ TFB_GFXFLAGS_FULLSCREEN) &&
|
|
||||||
driver == GraphicsDriver &&
|
|
||||||
width == ScreenWidthActual && height == ScreenHeightActual)
|
|
||||||
{
|
|
||||||
togglefullscreen = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
GfxFlags = flags;
|
|
||||||
|
|
||||||
if (driver == TFB_GFXDRIVER_SDL_OPENGL)
|
|
||||||
{
|
|
||||||
#ifdef HAVE_OPENGL
|
|
||||||
result = TFB_GL_ConfigureVideo (driver, flags, width, height,
|
|
||||||
togglefullscreen);
|
|
||||||
#else
|
|
||||||
driver = TFB_GFXDRIVER_SDL_PURE;
|
|
||||||
log_add (log_Warning, "OpenGL support not compiled in,"
|
|
||||||
" so using pure SDL driver");
|
|
||||||
result = TFB_Pure_ConfigureVideo (driver, flags, width, height,
|
|
||||||
togglefullscreen);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
result = TFB_Pure_ConfigureVideo (driver, flags, width, height,
|
|
||||||
togglefullscreen);
|
|
||||||
}
|
|
||||||
|
|
||||||
sprintf (caption, "The Ur-Quan Masters v%d.%d.%d%s",
|
|
||||||
UQM_MAJOR_VERSION, UQM_MINOR_VERSION,
|
|
||||||
UQM_PATCH_VERSION, UQM_EXTRA_VERSION);
|
|
||||||
SDL_WM_SetCaption (caption, NULL);
|
|
||||||
|
|
||||||
if (flags & TFB_GFXFLAGS_FULLSCREEN)
|
|
||||||
SDL_ShowCursor (SDL_DISABLE);
|
|
||||||
else
|
|
||||||
SDL_ShowCursor (SDL_ENABLE);
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
int
|
||||||
TFB_InitGraphics (int driver, int flags, int width, int height)
|
TFB_InitGraphics (int driver, int flags, int width, int height)
|
||||||
{
|
{
|
||||||
@@ -191,27 +116,37 @@ TFB_ProcessEvents ()
|
|||||||
ProcessInputEvent (&Event);
|
ProcessInputEvent (&Event);
|
||||||
/* Handle graphics and exposure events. */
|
/* Handle graphics and exposure events. */
|
||||||
switch (Event.type) {
|
switch (Event.type) {
|
||||||
|
#if 0 /* Currently disabled in mainline */
|
||||||
case SDL_ACTIVEEVENT: /* Lose/gain visibility or focus */
|
case SDL_ACTIVEEVENT: /* Lose/gain visibility or focus */
|
||||||
/* Up to three different state changes can occur in one event. */
|
/* Up to three different state changes can occur in one event. */
|
||||||
/* Here, disregard least significant change (mouse focus). */
|
/* Here, disregard least significant change (mouse focus). */
|
||||||
#if 0 /* Currently disabled in mainline */
|
|
||||||
// This controls the automatic sleep/pause when minimized.
|
// This controls the automatic sleep/pause when minimized.
|
||||||
// On small displays (e.g. mobile devices), APPINPUTFOCUS would
|
// On small displays (e.g. mobile devices), APPINPUTFOCUS would
|
||||||
// be an appropriate substitution for APPACTIVE:
|
// be an appropriate substitution for APPACTIVE:
|
||||||
// if (Event.active.state & SDL_APPINPUTFOCUS)
|
// if (Event.active.state & SDL_APPINPUTFOCUS)
|
||||||
if (Event.active.state & SDL_APPACTIVE)
|
if (Event.active.state & SDL_APPACTIVE)
|
||||||
GameActive = Event.active.gain;
|
GameActive = Event.active.gain;
|
||||||
#endif
|
|
||||||
break;
|
|
||||||
case SDL_QUIT:
|
|
||||||
QuitPosted = 1;
|
|
||||||
break;
|
break;
|
||||||
case SDL_VIDEORESIZE: /* User resized video mode */
|
case SDL_VIDEORESIZE: /* User resized video mode */
|
||||||
// TODO
|
// TODO
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
|
case SDL_QUIT:
|
||||||
|
QuitPosted = 1;
|
||||||
|
break;
|
||||||
|
#if SDL_MAJOR_VERSION == 1
|
||||||
case SDL_VIDEOEXPOSE: /* Screen needs to be redrawn */
|
case SDL_VIDEOEXPOSE: /* Screen needs to be redrawn */
|
||||||
TFB_SwapBuffers (TFB_REDRAW_EXPOSE);
|
TFB_SwapBuffers (TFB_REDRAW_EXPOSE);
|
||||||
break;
|
break;
|
||||||
|
#else
|
||||||
|
case SDL_WINDOWEVENT:
|
||||||
|
if (Event.window.event == SDL_WINDOWEVENT_EXPOSED)
|
||||||
|
{
|
||||||
|
/* Screen needs to be redrawn */
|
||||||
|
TFB_SwapBuffers (TFB_REDRAW_EXPOSE);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -295,38 +230,6 @@ TFB_SwapBuffers (int force_full_redraw)
|
|||||||
graphics_backend->postprocess ();
|
graphics_backend->postprocess ();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Probably ought to clean this away at some point. */
|
|
||||||
SDL_Surface *
|
|
||||||
TFB_DisplayFormatAlpha (SDL_Surface *surface)
|
|
||||||
{
|
|
||||||
SDL_Surface* newsurf;
|
|
||||||
SDL_PixelFormat* dstfmt;
|
|
||||||
const SDL_PixelFormat* srcfmt = surface->format;
|
|
||||||
|
|
||||||
// figure out what format to use (alpha/no alpha)
|
|
||||||
if (surface->format->Amask)
|
|
||||||
dstfmt = format_conv_surf->format;
|
|
||||||
else
|
|
||||||
dstfmt = SDL_Screen->format;
|
|
||||||
|
|
||||||
if (srcfmt->BytesPerPixel == dstfmt->BytesPerPixel &&
|
|
||||||
srcfmt->Rmask == dstfmt->Rmask &&
|
|
||||||
srcfmt->Gmask == dstfmt->Gmask &&
|
|
||||||
srcfmt->Bmask == dstfmt->Bmask &&
|
|
||||||
srcfmt->Amask == dstfmt->Amask)
|
|
||||||
return surface; // no conversion needed
|
|
||||||
|
|
||||||
newsurf = SDL_ConvertSurface (surface, dstfmt, surface->flags);
|
|
||||||
// SDL_SRCCOLORKEY and SDL_SRCALPHA cannot work at the same time,
|
|
||||||
// so we need to disable one of them
|
|
||||||
if ((surface->flags & SDL_SRCCOLORKEY) && newsurf
|
|
||||||
&& (newsurf->flags & SDL_SRCCOLORKEY)
|
|
||||||
&& (newsurf->flags & SDL_SRCALPHA))
|
|
||||||
SDL_SetAlpha (newsurf, 0, 255);
|
|
||||||
|
|
||||||
return newsurf;
|
|
||||||
}
|
|
||||||
|
|
||||||
// This function should only be called from the graphics thread,
|
// This function should only be called from the graphics thread,
|
||||||
// like from a TFB_DrawCommand_Callback command.
|
// like from a TFB_DrawCommand_Callback command.
|
||||||
TFB_Canvas
|
TFB_Canvas
|
||||||
@@ -335,267 +238,8 @@ TFB_GetScreenCanvas (SCREEN screen)
|
|||||||
return SDL_Screens[screen];
|
return SDL_Screens[screen];
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
TFB_BlitSurface (SDL_Surface *src, SDL_Rect *srcrect, SDL_Surface *dst,
|
|
||||||
SDL_Rect *dstrect, int blend_numer, int blend_denom)
|
|
||||||
{
|
|
||||||
BOOLEAN has_colorkey;
|
|
||||||
int x, y, x1, y1, x2, y2, dst_x2, dst_y2, nr, ng, nb;
|
|
||||||
int srcx, srcy, w, h;
|
|
||||||
Uint8 sr, sg, sb, dr, dg, db;
|
|
||||||
Uint32 src_pixval, dst_pixval, colorkey;
|
|
||||||
GetPixelFn src_getpix, dst_getpix;
|
|
||||||
PutPixelFn putpix;
|
|
||||||
SDL_Rect fulldst;
|
|
||||||
|
|
||||||
if (blend_numer == blend_denom)
|
|
||||||
{
|
|
||||||
// normal blit: dst = src
|
|
||||||
|
|
||||||
// log_add (log_Debug, "normal blit\n");
|
|
||||||
SDL_BlitSurface (src, srcrect, dst, dstrect);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// NOTE: following clipping code is copied from SDL-1.2.4 sources
|
|
||||||
|
|
||||||
// If the destination rectangle is NULL, use the entire dest surface
|
|
||||||
if (dstrect == NULL)
|
|
||||||
{
|
|
||||||
fulldst.x = fulldst.y = 0;
|
|
||||||
dstrect = &fulldst;
|
|
||||||
}
|
|
||||||
|
|
||||||
// clip the source rectangle to the source surface
|
|
||||||
if (srcrect)
|
|
||||||
{
|
|
||||||
int maxw, maxh;
|
|
||||||
|
|
||||||
srcx = srcrect->x;
|
|
||||||
w = srcrect->w;
|
|
||||||
if (srcx < 0)
|
|
||||||
{
|
|
||||||
w += srcx;
|
|
||||||
dstrect->x -= srcx;
|
|
||||||
srcx = 0;
|
|
||||||
}
|
|
||||||
maxw = src->w - srcx;
|
|
||||||
if (maxw < w)
|
|
||||||
w = maxw;
|
|
||||||
|
|
||||||
srcy = srcrect->y;
|
|
||||||
h = srcrect->h;
|
|
||||||
if (srcy < 0)
|
|
||||||
{
|
|
||||||
h += srcy;
|
|
||||||
dstrect->y -= srcy;
|
|
||||||
srcy = 0;
|
|
||||||
}
|
|
||||||
maxh = src->h - srcy;
|
|
||||||
if (maxh < h)
|
|
||||||
h = maxh;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
srcx = 0;
|
|
||||||
srcy = 0;
|
|
||||||
w = src->w;
|
|
||||||
h = src->h;
|
|
||||||
}
|
|
||||||
|
|
||||||
// clip the destination rectangle against the clip rectangle
|
|
||||||
{
|
|
||||||
SDL_Rect *clip = &dst->clip_rect;
|
|
||||||
int dx, dy;
|
|
||||||
|
|
||||||
dx = clip->x - dstrect->x;
|
|
||||||
if (dx > 0)
|
|
||||||
{
|
|
||||||
w -= dx;
|
|
||||||
dstrect->x += dx;
|
|
||||||
srcx += dx;
|
|
||||||
}
|
|
||||||
dx = dstrect->x + w - clip->x - clip->w;
|
|
||||||
if (dx > 0)
|
|
||||||
w -= dx;
|
|
||||||
|
|
||||||
dy = clip->y - dstrect->y;
|
|
||||||
if (dy > 0)
|
|
||||||
{
|
|
||||||
h -= dy;
|
|
||||||
dstrect->y += dy;
|
|
||||||
srcy += dy;
|
|
||||||
}
|
|
||||||
dy = dstrect->y + h - clip->y - clip->h;
|
|
||||||
if (dy > 0)
|
|
||||||
h -= dy;
|
|
||||||
}
|
|
||||||
|
|
||||||
dstrect->w = w;
|
|
||||||
dstrect->h = h;
|
|
||||||
|
|
||||||
if (w <= 0 || h <= 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
x1 = srcx;
|
|
||||||
y1 = srcy;
|
|
||||||
x2 = srcx + w;
|
|
||||||
y2 = srcy + h;
|
|
||||||
|
|
||||||
if (src->flags & SDL_SRCCOLORKEY)
|
|
||||||
{
|
|
||||||
has_colorkey = TRUE;
|
|
||||||
colorkey = src->format->colorkey;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
has_colorkey = FALSE;
|
|
||||||
colorkey = 0; /* Satisfying compiler */
|
|
||||||
}
|
|
||||||
|
|
||||||
src_getpix = getpixel_for (src);
|
|
||||||
dst_getpix = getpixel_for (dst);
|
|
||||||
putpix = putpixel_for (dst);
|
|
||||||
|
|
||||||
if (blend_denom < 0)
|
|
||||||
{
|
|
||||||
// additive blit: dst = src + dst
|
|
||||||
#if 0
|
|
||||||
log_add (log_Debug, "additive blit %d %d, src %d %d %d %d dst %d %d,"
|
|
||||||
" srcbpp %d", blend_numer, blend_denom, x1, y1, x2, y2,
|
|
||||||
dstrect->x, dstrect->y, src->format->BitsPerPixel);
|
|
||||||
#endif
|
|
||||||
for (y = y1; y < y2; ++y)
|
|
||||||
{
|
|
||||||
dst_y2 = dstrect->y + (y - y1);
|
|
||||||
for (x = x1; x < x2; ++x)
|
|
||||||
{
|
|
||||||
dst_x2 = dstrect->x + (x - x1);
|
|
||||||
src_pixval = src_getpix (src, x, y);
|
|
||||||
|
|
||||||
if (has_colorkey && src_pixval == colorkey)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
dst_pixval = dst_getpix (dst, dst_x2, dst_y2);
|
|
||||||
|
|
||||||
SDL_GetRGB (src_pixval, src->format, &sr, &sg, &sb);
|
|
||||||
SDL_GetRGB (dst_pixval, dst->format, &dr, &dg, &db);
|
|
||||||
|
|
||||||
nr = sr + dr;
|
|
||||||
ng = sg + dg;
|
|
||||||
nb = sb + db;
|
|
||||||
|
|
||||||
if (nr > 255)
|
|
||||||
nr = 255;
|
|
||||||
if (ng > 255)
|
|
||||||
ng = 255;
|
|
||||||
if (nb > 255)
|
|
||||||
nb = 255;
|
|
||||||
|
|
||||||
putpix (dst, dst_x2, dst_y2,
|
|
||||||
SDL_MapRGB (dst->format, nr, ng, nb));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (blend_numer < 0)
|
|
||||||
{
|
|
||||||
// subtractive blit: dst = src - dst
|
|
||||||
#if 0
|
|
||||||
log_add (log_Debug, "subtractive blit %d %d, src %d %d %d %d"
|
|
||||||
" dst %d %d, srcbpp %d", blend_numer, blend_denom,
|
|
||||||
x1, y1, x2, y2, dstrect->x, dstrect->y,
|
|
||||||
src->format->BitsPerPixel);
|
|
||||||
#endif
|
|
||||||
for (y = y1; y < y2; ++y)
|
|
||||||
{
|
|
||||||
dst_y2 = dstrect->y + (y - y1);
|
|
||||||
for (x = x1; x < x2; ++x)
|
|
||||||
{
|
|
||||||
dst_x2 = dstrect->x + (x - x1);
|
|
||||||
src_pixval = src_getpix (src, x, y);
|
|
||||||
|
|
||||||
if (has_colorkey && src_pixval == colorkey)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
dst_pixval = dst_getpix (dst, dst_x2, dst_y2);
|
|
||||||
|
|
||||||
SDL_GetRGB (src_pixval, src->format, &sr, &sg, &sb);
|
|
||||||
SDL_GetRGB (dst_pixval, dst->format, &dr, &dg, &db);
|
|
||||||
|
|
||||||
nr = sr - dr;
|
|
||||||
ng = sg - dg;
|
|
||||||
nb = sb - db;
|
|
||||||
|
|
||||||
if (nr < 0)
|
|
||||||
nr = 0;
|
|
||||||
if (ng < 0)
|
|
||||||
ng = 0;
|
|
||||||
if (nb < 0)
|
|
||||||
nb = 0;
|
|
||||||
|
|
||||||
putpix (dst, dst_x2, dst_y2,
|
|
||||||
SDL_MapRGB (dst->format, nr, ng, nb));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// modulated blit: dst = src * (blend_numer / blend_denom)
|
|
||||||
|
|
||||||
float f = blend_numer / (float)blend_denom;
|
|
||||||
#if 0
|
|
||||||
log_add (log_Debug, "modulated blit %d %d, f %f, src %d %d %d %d"
|
|
||||||
" dst %d %d, srcbpp %d\n", blend_numer, blend_denom, f,
|
|
||||||
x1, y1, x2, y2, dstrect->x, dstrect->y,
|
|
||||||
src->format->BitsPerPixel);
|
|
||||||
#endif
|
|
||||||
for (y = y1; y < y2; ++y)
|
|
||||||
{
|
|
||||||
dst_y2 = dstrect->y + (y - y1);
|
|
||||||
for (x = x1; x < x2; ++x)
|
|
||||||
{
|
|
||||||
dst_x2 = dstrect->x + (x - x1);
|
|
||||||
src_pixval = src_getpix (src, x, y);
|
|
||||||
|
|
||||||
if (has_colorkey && src_pixval == colorkey)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
SDL_GetRGB (src_pixval, src->format, &sr, &sg, &sb);
|
|
||||||
|
|
||||||
nr = (int)(sr * f);
|
|
||||||
ng = (int)(sg * f);
|
|
||||||
nb = (int)(sb * f);
|
|
||||||
|
|
||||||
if (nr > 255)
|
|
||||||
nr = 255;
|
|
||||||
if (ng > 255)
|
|
||||||
ng = 255;
|
|
||||||
if (nb > 255)
|
|
||||||
nb = 255;
|
|
||||||
|
|
||||||
putpix (dst, dst_x2, dst_y2,
|
|
||||||
SDL_MapRGB (dst->format, nr, ng, nb));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
TFB_UploadTransitionScreen (void)
|
TFB_UploadTransitionScreen (void)
|
||||||
{
|
{
|
||||||
graphics_backend->uploadTransitionScreen ();
|
graphics_backend->uploadTransitionScreen ();
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
TFB_SetGamma (float gamma)
|
|
||||||
{
|
|
||||||
if (SDL_SetGamma (gamma, gamma, gamma) == -1)
|
|
||||||
{
|
|
||||||
log_add (log_Warning, "Unable to set gamma correction.");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
log_add (log_Info, "Gamma correction set to %1.4f.", gamma);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user