fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4963 fc73d0e0-1445-4013-8a0c-d673dee63da5

Browse source
This commit is contained in:
Spoike 2015-08-14 02:55:59 +00:00
parent a26a373d15
commit 4116da6298
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/client/cl_screen.c
View file

@ -2248,7 +2248,7 @@ void SCR_ScreenShot_f (void)
vfsfile_t *vfs; vfsfile_t *vfs;
void *rgbbuffer; void *rgbbuffer;
int width, height; int width, height;
enum uploadmfmt fmt; enum uploadfmt fmt;
if (!VID_GetRGBInfo) if (!VID_GetRGBInfo)
{ {

9
engine/client/m_mp3.c
View file

@ -2671,10 +2671,11 @@ int captureoldfbo;
qboolean capturingfbo; qboolean capturingfbo;
texid_t capturetexture; texid_t capturetexture;
qboolean captureframeforce; qboolean captureframeforce;
#ifdef GLQUAKE #if defined(GLQUAKE) && !defined(GLESONLY)
//ring buffer //ring buffer
int pbo_handles[4]; int pbo_handles[4];
enum uploadfmt pbo_format; enum uploadfmt pbo_format;
#define CAN_USE_PBOS
#endif #endif
int pbo_oldest; int pbo_oldest;
@ -3188,7 +3189,7 @@ void Media_RecordFrame (void)
if (R2D_Flush) if (R2D_Flush)
R2D_Flush(); R2D_Flush();
#ifdef GLQUAKE #ifdef CAN_USE_PBOS
if (pbo_format != TF_INVALID) if (pbo_format != TF_INVALID)
{ {
int imagesize = vid.fbpwidth * vid.fbpheight * 4; 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) void Media_StopRecordFilm_f (void)
{ {
#ifdef GLQUAKE #ifdef CAN_USE_PBOS
if (pbo_format) if (pbo_format)
{ {
int i; int i;
@ -3546,7 +3547,9 @@ static void Media_RecordFilm (char *recordingname, qboolean demo)
vid.fbpheight = captureheight.ival; vid.fbpheight = captureheight.ival;
vid.framebuffer = capturetexture; vid.framebuffer = capturetexture;
} }
#endif
#ifdef CAN_USE_PBOS
pbo_format = TF_INVALID; pbo_format = TF_INVALID;
if (qrenderer == QR_OPENGL && !gl_config.gles && gl_config.glversion >= 2.1) 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. { //both tgas and vfw favour bgr24, so lets get the gl drivers to suffer instead of us.

1
engine/client/vid.h
View file

@ -110,6 +110,7 @@ int GLVID_SetMode (rendererstate_t *info, unsigned char *palette);
qboolean GLVID_Is8bit(void); qboolean GLVID_Is8bit(void);
void GLVID_SwapBuffers(void); void GLVID_SwapBuffers(void);
enum uploadfmt;
char *GLVID_GetRGBInfo(int *truewidth, int *trueheight, enum uploadfmt *fmt); char *GLVID_GetRGBInfo(int *truewidth, int *trueheight, enum uploadfmt *fmt);
void GLVID_SetCaption(char *caption); void GLVID_SetCaption(char *caption);
#endif #endif