diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 7e0b369eb8d55cdfc303388f7d393c8f2aa5ab79..f2c30107b28f94c0ec66e15fdcacebfdb2ee5e4f 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -580,7 +580,7 @@ static void HWR_RenderPlane(sector_t *sector, extrasubsector_t *xsub, boolean is
if (nrPlaneVerts < 3) //not even a triangle ?
return;
- if (nrPlaneVerts > UINT16_MAX) // FIXME: exceeds plVerts size
+ if (nrPlaneVerts > INT16_MAX) // FIXME: exceeds plVerts size
{
CONS_Debug(DBG_RENDER, "polygon size of %d exceeds max value of %d vertices\n", nrPlaneVerts, UINT16_MAX);
return;
@@ -3171,7 +3171,7 @@ static void HWR_RenderPolyObjectPlane(polyobj_t *polysector, boolean isceiling,
if (nrPlaneVerts < 3) //not even a triangle ?
return;
- if (nrPlaneVerts > UINT16_MAX) // FIXME: exceeds plVerts size
+ if (nrPlaneVerts > INT16_MAX) // FIXME: exceeds plVerts size
{
CONS_Debug(DBG_RENDER, "polygon size of %s exceeds max value of %d vertices\n", sizeu1(nrPlaneVerts), UINT16_MAX);
return;
diff --git a/src/m_anigif.c b/src/m_anigif.c
index 4e68819bc70313bc120366abd3ffeba13578f4fc..f19679ef4a15cc6d6f9406b7a9a1f6a7608169c0 100644
--- a/src/m_anigif.c
+++ b/src/m_anigif.c
@@ -19,6 +19,10 @@
#include "v_video.h"
#include "i_video.h"
+#ifdef HWRENDER
+#include "hardware/hw_main.h"
+#endif
+
// GIFs are always little-endian
#include "byteptr.h"
@@ -452,6 +456,32 @@ const UINT8 gifframe_gchead[4] = {0x21,0xF9,0x04,0x04}; // GCE, bytes, packed by
static UINT8 *gifframe_data = NULL;
static size_t gifframe_size = 8192;
+#ifdef HWRENDER
+static void hwrconvert(void)
+{
+ UINT8 *linear = HWR_GetScreenshot();
+ UINT8 *dest = screens[2];
+ UINT8 r, g, b;
+ INT32 x, y;
+ size_t i = 0;
+
+ InitColorLUT();
+
+ for (y = 0; y < vid.height; y++)
+ {
+ for (x = 0; x < vid.width; x++, i += 3)
+ {
+ r = (UINT8)linear[i];
+ g = (UINT8)linear[i + 1];
+ b = (UINT8)linear[i + 2];
+ dest[(y * vid.width) + x] = colorlookup[r >> SHIFTCOLORBITS][g >> SHIFTCOLORBITS][b >> SHIFTCOLORBITS];
+ }
+ }
+
+ free(linear);
+}
+#endif
+
//
// GIF_framewrite
// writes a frame into the file.
@@ -477,7 +507,12 @@ static void GIF_framewrite(void)
GIF_optimizeregion(cur_screen, movie_screen, &blitx, &blity, &blitw, &blith);
// blit to temp screen
- I_ReadScreen(movie_screen);
+ if (rendermode == render_soft)
+ I_ReadScreen(movie_screen);
+#ifdef HWRENDER
+ else if (rendermode == render_opengl)
+ hwrconvert();
+#endif
}
else
{
@@ -486,7 +521,18 @@ static void GIF_framewrite(void)
blith = vid.height;
if (gif_frames == 0)
- I_ReadScreen(movie_screen);
+ {
+ if (rendermode == render_soft)
+ I_ReadScreen(movie_screen);
+#ifdef HWRENDER
+ else if (rendermode == render_opengl)
+ {
+ hwrconvert();
+ VID_BlitLinearScreen(screens[2], screens[0], vid.width*vid.bpp, vid.height, vid.width*vid.bpp, vid.rowbytes);
+ }
+#endif
+ }
+
movie_screen = screens[0];
}
@@ -575,7 +621,7 @@ static void GIF_framewrite(void)
//
INT32 GIF_open(const char *filename)
{
-#ifdef HWRENDER
+#if 0
if (rendermode != render_soft)
{
CONS_Alert(CONS_WARNING, M_GetText("GIFs cannot be taken in non-software modes!\n"));
diff --git a/src/m_misc.c b/src/m_misc.c
index c5e4fa21cadfa0fd46a6f0c188c839b4a778a867..b2f5c546554c3eafb142351fb904aecb6c8fbf94 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -1119,12 +1119,8 @@ void M_StartMovie(void)
switch (cv_moviemode.value)
{
case MM_GIF:
- if (rendermode == render_soft)
- {
- moviemode = M_StartMovieGIF(pathname);
- break;
- }
- /* FALLTHRU */
+ moviemode = M_StartMovieGIF(pathname);
+ break;
case MM_APNG:
moviemode = M_StartMovieAPNG(pathname);
break;
diff --git a/src/r_data.c b/src/r_data.c
index bd12eb248012b2bbee3649a783b4799cf3a54a61..c575359203a31fd30caf2155ba0385f5da04a5cc 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -1162,7 +1162,6 @@ INT32 R_ColormapNumForName(char *name)
//
static double deltas[256][3], map[256][3];
-static UINT8 NearestColor(UINT8 r, UINT8 g, UINT8 b);
static int RoundUp(double number);
INT32 R_CreateColormap(char *p1, char *p2, char *p3)
@@ -1342,7 +1341,7 @@ INT32 R_CreateColormap(char *p1, char *p2, char *p3)
// Thanks to quake2 source!
// utils3/qdata/images.c
-static UINT8 NearestColor(UINT8 r, UINT8 g, UINT8 b)
+UINT8 NearestColor(UINT8 r, UINT8 g, UINT8 b)
{
int dr, dg, db;
int distortion, bestdistortion = 256 * 256 * 4, bestcolor = 0, i;
diff --git a/src/r_data.h b/src/r_data.h
index 5de51ccd4981708b77614c6af9cb699644dc10ec..614082fac76f22958b20094b3a4b434777afe4e9 100644
--- a/src/r_data.h
+++ b/src/r_data.h
@@ -95,6 +95,8 @@ INT32 R_ColormapNumForName(char *name);
INT32 R_CreateColormap(char *p1, char *p2, char *p3);
const char *R_ColormapNameForNum(INT32 num);
+UINT8 NearestColor(UINT8 r, UINT8 g, UINT8 b);
+
extern INT32 numtextures;
#endif
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index 77bf414ccc8265e4eeb602aee0ad8edb5ac65884..37beaefe66c8237c6a8d96868638008fdd794dc2 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -1292,6 +1292,7 @@ INT32 VID_SetMode(INT32 modeNum)
//Impl_SetWindowName("SRB2 "VERSIONSTRING);
SDLSetMode(vid.width, vid.height, USE_FULLSCREEN);
+ Impl_VideoSetupBuffer();
if (rendermode == render_soft)
{
@@ -1300,8 +1301,6 @@ INT32 VID_SetMode(INT32 modeNum)
SDL_FreeSurface(bufSurface);
bufSurface = NULL;
}
-
- Impl_VideoSetupBuffer();
}
return SDL_TRUE;
@@ -1424,7 +1423,7 @@ static void Impl_VideoSetupSDLBuffer(void)
static void Impl_VideoSetupBuffer(void)
{
// Set up game's software render buffer
- if (rendermode == render_soft)
+ //if (rendermode == render_soft)
{
vid.rowbytes = vid.width * vid.bpp;
vid.direct = NULL;
diff --git a/src/v_video.c b/src/v_video.c
index c3b29e15760e660e2eeceb44cda19f90cf28a9b5..0a57e22ac6b37a4efced8a913c0ae62fb2b2c542 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -2207,6 +2207,27 @@ Unoptimized version
#endif
}
+// Taken from my videos-in-SRB2 project
+// Generates a color look-up table
+// which has up to 64 colors at each channel
+// (see the defines in v_video.h)
+
+UINT8 colorlookup[CLUTSIZE][CLUTSIZE][CLUTSIZE];
+
+void InitColorLUT(void)
+{
+ UINT8 r, g, b;
+ static boolean clutinit = false;
+ if (!clutinit)
+ {
+ for (r = 0; r < CLUTSIZE; r++)
+ for (g = 0; g < CLUTSIZE; g++)
+ for (b = 0; b < CLUTSIZE; b++)
+ colorlookup[r][g][b] = NearestColor(r << SHIFTCOLORBITS, g << SHIFTCOLORBITS, b << SHIFTCOLORBITS);
+ clutinit = true;
+ }
+}
+
// V_Init
// old software stuff, buffers are allocated at video mode setup
// here we set the screens[x] pointers accordingly
@@ -2218,13 +2239,9 @@ void V_Init(void)
const INT32 screensize = vid.rowbytes * vid.height;
LoadMapPalette();
- // hardware modes do not use screens[] pointers
+
for (i = 0; i < NUMSCREENS; i++)
screens[i] = NULL;
- if (rendermode != render_soft)
- {
- return; // be sure to cause a NULL read/write error so we detect it, in case of..
- }
// start address of NUMSCREENS * width*height vidbuffers
if (base)
diff --git a/src/v_video.h b/src/v_video.h
index 877a619b5ac56ad60bb423918f1647b7dbb7d0af..92c24946fb7b412c34b5630427266cd80138e0e8 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -33,6 +33,18 @@ extern consvar_t cv_ticrate, cv_usegamma, cv_allcaps, cv_constextsize;
// Allocates buffer screens, call before R_Init.
void V_Init(void);
+// Taken from my videos-in-SRB2 project
+// Generates a color look-up table
+// which has up to 64 colors at each channel
+
+#define COLORBITS 6
+#define SHIFTCOLORBITS (8-COLORBITS)
+#define CLUTSIZE (1<<COLORBITS)
+
+extern UINT8 colorlookup[CLUTSIZE][CLUTSIZE][CLUTSIZE];
+
+void InitColorLUT(void);
+
// Set the current RGB palette lookup to use for palettized graphics
void V_SetPalette(INT32 palettenum);