From 4116da6298ebdcc82cf916aa3255262dc04d3e05 Mon Sep 17 00:00:00 2001 From: Spoike Date: Fri, 14 Aug 2015 02:55:59 +0000 Subject: [PATCH] git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4963 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/cl_screen.c | 2 +- engine/client/m_mp3.c | 9 ++++++--- engine/client/vid.h | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/engine/client/cl_screen.c b/engine/client/cl_screen.c index ab1305ffc..b7cf69948 100644 --- a/engine/client/cl_screen.c +++ b/engine/client/cl_screen.c @@ -2248,7 +2248,7 @@ void SCR_ScreenShot_f (void) vfsfile_t *vfs; void *rgbbuffer; int width, height; - enum uploadmfmt fmt; + enum uploadfmt fmt; if (!VID_GetRGBInfo) { diff --git a/engine/client/m_mp3.c b/engine/client/m_mp3.c index c0661b01b..a4d46e388 100644 --- a/engine/client/m_mp3.c +++ b/engine/client/m_mp3.c @@ -2671,10 +2671,11 @@ int captureoldfbo; qboolean capturingfbo; texid_t capturetexture; qboolean captureframeforce; -#ifdef GLQUAKE +#if defined(GLQUAKE) && !defined(GLESONLY) //ring buffer int pbo_handles[4]; enum uploadfmt pbo_format; +#define CAN_USE_PBOS #endif int pbo_oldest; @@ -3188,7 +3189,7 @@ void Media_RecordFrame (void) if (R2D_Flush) R2D_Flush(); -#ifdef GLQUAKE +#ifdef CAN_USE_PBOS if (pbo_format != TF_INVALID) { int imagesize = vid.fbpwidth * vid.fbpheight * 4; @@ -3432,7 +3433,7 @@ void Media_InitFakeSoundDevice (int speed, int channels, int samplebits) void Media_StopRecordFilm_f (void) { -#ifdef GLQUAKE +#ifdef CAN_USE_PBOS if (pbo_format) { int i; @@ -3546,7 +3547,9 @@ static void Media_RecordFilm (char *recordingname, qboolean demo) vid.fbpheight = captureheight.ival; vid.framebuffer = capturetexture; } +#endif +#ifdef CAN_USE_PBOS pbo_format = TF_INVALID; if (qrenderer == QR_OPENGL && !gl_config.gles && gl_config.glversion >= 2.1) { //both tgas and vfw favour bgr24, so lets get the gl drivers to suffer instead of us. diff --git a/engine/client/vid.h b/engine/client/vid.h index abea41160..11cc7b779 100644 --- a/engine/client/vid.h +++ b/engine/client/vid.h @@ -110,6 +110,7 @@ int GLVID_SetMode (rendererstate_t *info, unsigned char *palette); qboolean GLVID_Is8bit(void); void GLVID_SwapBuffers(void); +enum uploadfmt; char *GLVID_GetRGBInfo(int *truewidth, int *trueheight, enum uploadfmt *fmt); void GLVID_SetCaption(char *caption); #endif