adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

First incomplete draft of SDL2 Pure driver

Browse Source
This commit is contained in:
Michael Martin
2019-08-20 00:49:41 -07:00
parent 29fcff95c7
commit 31e6d51dc8
5 changed files with 367 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/libs/graphics/sdl/Makeinfo
+1 -1
View File
@@ -1,4 +1,4 @@
uqm_CFILES="opengl.c palette.c primitives.c pure.c sdl_common.c
uqm_CFILES="opengl.c palette.c primitives.c pure.c sdl2_pure.c sdl_common.c
scalers.c 2xscalers.c
2xscalers_mmx.c 2xscalers_sse.c 2xscalers_3dnow.c
nearest2x.c bilinear2x.c biadv2x.c triscan2x.c hq2x.c
sc2/src/libs/graphics/sdl/opengl.c
+3
View File
@@ -24,6 +24,8 @@
#include "options.h"
#include "libs/log.h"
#if SDL_MAJOR_VERSION == 1
typedef struct _gl_screeninfo {
SDL_Surface *scaled;
GLuint texture;
@@ -584,3 +586,4 @@ TFB_GL_Postprocess (void)
}
#endif
#endif
sc2/src/libs/graphics/sdl/opengl.h
+2 -1
View File
@@ -20,6 +20,7 @@
#define OPENGL_H
#include "libs/graphics/sdl/sdl_common.h"
#if SDL_MAJOR_VERSION == 1
int TFB_GL_InitGraphics (int driver, int flags, int width, int height);
int TFB_GL_ConfigureVideo (int driver, int flags, int width, int height, int togglefullscreen);
@@ -82,6 +83,6 @@ typedef unsigned short wchar_t;
#include SDL_INCLUDE(SDL_opengl.h)
#endif /* WIN32 */
#endif /* SDL_MAJOR_VERSION == 1 */
#endif /* HAVE_OPENGL */
#endif
sc2/src/libs/graphics/sdl/pure.c
+3
View File
@@ -20,6 +20,8 @@
#include "scalers.h"
#include "libs/log.h"
#if SDL_MAJOR_VERSION == 1
static SDL_Surface *SDL_Video = NULL;
static SDL_Surface *fade_color_surface = NULL;
static SDL_Surface *fade_temp = NULL;
@@ -483,3 +485,4 @@ Scale_PerfTest (void)
SDL_UnlockSurface (SDL_Screen);
}
#endif
sc2/src/libs/graphics/sdl/sdl2_pure.c
+358
View File
@@ -0,0 +1,358 @@
//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 "pure.h"
#include "libs/graphics/bbox.h"
#include "scalers.h"
#include "libs/log.h"
#if SDL_MAJOR_VERSION > 1
typedef struct tfb_sdl2_screeninfo_s {
SDL_Surface *scaled;
SDL_Texture *texture;
BOOLEAN dirty, active;
SDL_Rect updated;
} TFB_SDL2_SCREENINFO;
static TFB_SDL2_SCREENINFO SDL2_Screens[TFB_GFX_NUMSCREENS];
static SDL_Window *window = NULL;
static SDL_Renderer *renderer = NULL;
static int ScreenFilterMode;
static TFB_ScaleFunc scaler = NULL;
#if SDL_BYTEORDER == SDL_BIG_ENDIAN
#define R_MASK 0xff000000
#define G_MASK 0x00ff0000
#define B_MASK 0x0000ff00
#define A_MASK 0x000000ff
#else
#define R_MASK 0x000000ff
#define G_MASK 0x0000ff00
#define B_MASK 0x00ff0000
#define A_MASK 0xff000000
#endif
static void TFB_SDL2_Preprocess (int force_full_redraw, int transition_amount, int fade_amount);
static void TFB_SDL2_Postprocess (void);
static void TFB_SDL2_UploadTransitionScreen (void);
static void TFB_SDL2_Scaled_ScreenLayer (SCREEN screen, Uint8 a, SDL_Rect *rect);
static void TFB_SDL2_Unscaled_ScreenLayer (SCREEN screen, Uint8 a, SDL_Rect *rect);
static void TFB_SDL2_ColorLayer (Uint8 r, Uint8 g, Uint8 b, Uint8 a, SDL_Rect *rect);
static TFB_GRAPHICS_BACKEND sdl2_scaled_backend = {
TFB_SDL2_Preprocess,
TFB_SDL2_Postprocess,
TFB_SDL2_UploadTransitionScreen,
TFB_SDL2_Scaled_ScreenLayer,
TFB_SDL2_ColorLayer };
static TFB_GRAPHICS_BACKEND sdl2_unscaled_backend = {
TFB_SDL2_Preprocess,
TFB_SDL2_Postprocess,
TFB_SDL2_UploadTransitionScreen,
TFB_SDL2_Unscaled_ScreenLayer,
TFB_SDL2_ColorLayer };
static SDL_Surface *
Create_Screen (int w, int h)
{
SDL_Surface *newsurf = SDL_CreateRGBSurface(SDL_SWSURFACE, w, h,
32, R_MASK, G_MASK, B_MASK, 0);
if (newsurf == 0)
{
log_add (log_Error, "Couldn't create screen buffers: %s",
SDL_GetError());
}
return newsurf;
}
static int
ReInit_Screen (SDL_Surface **screen, int w, int h)
{
if (*screen)
SDL_FreeSurface (*screen);
*screen = Create_Screen (w, h);
return *screen == 0 ? -1 : 0;
}
int
TFB_Pure_ConfigureVideo (int driver, int flags, int width, int height, int togglefullscreen)
{
int i;
GraphicsDriver = driver;
(void) togglefullscreen;
if (window == NULL)
{
SDL_RendererInfo info;
int flags2 = 0;
if (flags & SDL_WINDOW_FULLSCREEN)
{
flags2 = SDL_WINDOW_FULLSCREEN_DESKTOP;
}
/* TODO: Create the right window name right away */
window = SDL_CreateWindow ("",
SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
width, height, flags2);
if (!window)
{
return -1;
}
renderer = SDL_CreateRenderer (window, -1, 0);
if (!renderer)
{
return -1;
}
if (SDL_GetRendererInfo (renderer, &info))
{
log_add (log_Info, "SDL2 renderer '%s' selected.\n", info.name);
}
else
{
log_add (log_Info, "SDL2 renderer had no name.");
}
SDL_RenderSetLogicalSize (renderer, ScreenWidth, ScreenHeight);
for (i = 0; i < TFB_GFX_NUMSCREENS; i++)
{
SDL2_Screens[i].scaled = NULL;
SDL2_Screens[i].texture = NULL;
SDL2_Screens[i].dirty = TRUE;
SDL2_Screens[i].active = TRUE;
}
SDL2_Screens[1].active = FALSE;
for (i = 0; i < TFB_GFX_NUMSCREENS; i++)
{
if (SDL2_Screens[i].active)
{
if (0 != ReInit_Screen (&SDL_Screens[i], ScreenWidth, ScreenHeight))
{
return -1;
}
}
else
{
SDL_Screens[i] = NULL;
}
}
}
else
{
if (flags & SDL_WINDOW_FULLSCREEN)
{
SDL_SetWindowFullscreen (window, SDL_WINDOW_FULLSCREEN_DESKTOP);
}
else
{
SDL_SetWindowFullscreen (window, 0);
SDL_SetWindowSize (window, width, height);
}
}
if (GfxFlags & TFB_GFXFLAGS_SCALE_SOFT_ONLY)
{
for (i = 0; i < TFB_GFX_NUMSCREENS; i++)
{
if (!SDL2_Screens[i].active)
{
continue;
}
if (0 != ReInit_Screen(&SDL2_Screens[i].scaled,
ScreenWidth * 2, ScreenHeight * 2))
{
return -1;
}
if (SDL2_Screens[i].texture)
{
SDL_DestroyTexture (SDL2_Screens[i].texture);
SDL2_Screens[i].texture = NULL;
}
SDL2_Screens[i].texture = SDL_CreateTextureFromSurface (renderer, SDL2_Screens[i].scaled);
}
scaler = Scale_PrepPlatform (flags, SDL2_Screens[0].scaled->format);
graphics_backend = &sdl2_scaled_backend;
}
else
{
for (i = 0; i < TFB_GFX_NUMSCREENS; i++)
{
if (SDL2_Screens[i].scaled)
{
SDL_FreeSurface (SDL2_Screens[i].scaled);
SDL2_Screens[i].scaled = NULL;
}
if (SDL2_Screens[i].texture)
{
SDL_DestroyTexture (SDL2_Screens[i].texture);
SDL2_Screens[i].texture = NULL;
}
SDL2_Screens[i].texture = SDL_CreateTextureFromSurface (renderer, SDL_Screens[i]);
}
scaler = NULL;
graphics_backend = &sdl2_unscaled_backend;
}
/* TODO: Set bilinear vs nearest-neighbor filtering based on
* GfxFlags & TFB_GFXFLAGS_SCALE_ANY */
return 0;
}
int
TFB_Pure_InitGraphics (int driver, int flags, int width, int height)
{
log_add (log_Info, "Initializing SDL.");
log_add (log_Info, "SDL initialized.");
log_add (log_Info, "Initializing Screen.");
ScreenWidth = 320;
ScreenHeight = 240;
if (TFB_Pure_ConfigureVideo (driver, flags, width, height, 0))
{
log_add (log_Fatal, "Could not initialize video: %s",
SDL_GetError ());
exit (EXIT_FAILURE);
}
/* Initialize scalers (let them precomputer whatever) */
Scale_Init ();
return 0;
}
static void
TFB_SDL2_UploadTransitionScreen (void)
{
SDL2_Screens[TFB_SCREEN_TRANSITION].updated.x = 0;
SDL2_Screens[TFB_SCREEN_TRANSITION].updated.y = 0;
SDL2_Screens[TFB_SCREEN_TRANSITION].updated.w = ScreenWidth;
SDL2_Screens[TFB_SCREEN_TRANSITION].updated.h = ScreenHeight;
SDL2_Screens[TFB_SCREEN_TRANSITION].dirty = TRUE;
}
static void
TFB_SDL2_ScanLines (void)
{
/* TODO */
}
static void
TFB_SDL2_Preprocess (int force_full_redraw, int transition_amount, int fade_amount)
{
(void) transition_amount;
(void) fade_amount;
if (force_full_redraw == TFB_REDRAW_YES)
{
SDL2_Screens[TFB_SCREEN_MAIN].updated.x = 0;
SDL2_Screens[TFB_SCREEN_MAIN].updated.y = 0;
SDL2_Screens[TFB_SCREEN_MAIN].updated.w = ScreenWidth;
SDL2_Screens[TFB_SCREEN_MAIN].updated.h = ScreenHeight;
SDL2_Screens[TFB_SCREEN_MAIN].dirty = TRUE;
}
else if (TFB_BBox.valid)
{
SDL2_Screens[TFB_SCREEN_MAIN].updated.x = TFB_BBox.region.corner.x;
SDL2_Screens[TFB_SCREEN_MAIN].updated.y = TFB_BBox.region.corner.y;
SDL2_Screens[TFB_SCREEN_MAIN].updated.w = TFB_BBox.region.extent.width;
SDL2_Screens[TFB_SCREEN_MAIN].updated.h = TFB_BBox.region.extent.height;
SDL2_Screens[TFB_SCREEN_MAIN].dirty = TRUE;
}
SDL_SetRenderDrawBlendMode (renderer, SDL_BLENDMODE_NONE);
SDL_SetRenderDrawColor (renderer, 0, 0, 0, 255);
SDL_RenderClear (renderer);
}
static void
TFB_SDL2_Unscaled_ScreenLayer (SCREEN screen, Uint8 a, SDL_Rect *rect)
{
SDL_Texture *texture = SDL2_Screens[screen].texture;
/* TODO: This is better handled with streaming textures and the
* SDL_[Un]Lock_Texture functions. */
if (SDL2_Screens[screen].dirty)
{
SDL_Surface *src = SDL_Screens[screen];
SDL_LockSurface (src);
SDL_UpdateTexture(texture, NULL, src->pixels, src->pitch);
SDL_UnlockSurface (src);
}
if (a != 255)
{
SDL_SetTextureBlendMode (texture, SDL_BLENDMODE_NONE);
}
else
{
SDL_SetTextureBlendMode (texture, SDL_BLENDMODE_BLEND);
SDL_SetTextureAlphaMod (texture, a);
}
/* TODO: Respect clip rectangle, which may interact with the
* logical canvas size */
SDL_RenderCopy (renderer, texture, NULL, NULL);
}
static void
TFB_SDL2_Scaled_ScreenLayer (SCREEN screen, Uint8 a, SDL_Rect *rect)
{
SDL_Texture *texture = SDL2_Screens[screen].texture;
/* TODO: This is better handled with streaming textures and the
* SDL_[Un]Lock_Texture functions. */
if (SDL2_Screens[screen].dirty)
{
SDL_Surface *src = SDL2_Screens[screen].scaled;
scaler (SDL_Screens[screen], src, &SDL2_Screens[screen].updated);
SDL_LockSurface (src);
SDL_UpdateTexture(texture, NULL, src->pixels, src->pitch);
SDL_UnlockSurface (src);
}
if (a != 255)
{
SDL_SetTextureBlendMode (texture, SDL_BLENDMODE_NONE);
}
else
{
SDL_SetTextureBlendMode (texture, SDL_BLENDMODE_BLEND);
SDL_SetTextureAlphaMod (texture, a);
}
/* TODO: Respect clip rectangle, which may interact with the
* logical canvas size */
SDL_RenderCopy (renderer, texture, NULL, NULL);
}
static void
TFB_SDL2_ColorLayer (Uint8 r, Uint8 g, Uint8 b, Uint8 a, SDL_Rect *rect)
{
SDL_SetRenderDrawBlendMode (renderer, a == 255 ? SDL_BLENDMODE_NONE
: SDL_BLENDMODE_BLEND);
SDL_SetRenderDrawColor (renderer, r, g, b, a);
/* TODO: Respect clip rectangle */
SDL_RenderFillRect (renderer, NULL);
}
static void
TFB_SDL2_Postprocess (void)
{
if (GfxFlags & TFB_GFXFLAGS_SCANLINES)
TFB_SDL2_ScanLines ();
SDL_RenderPresent (renderer);
}
#endif