#include "csprogs.h"
#include "cap_avi.h"
#include "cap_ogg.h"
-#include "dpsoftrast.h"
// we have to include snd_main.h here only to get access to snd_renderbuffer->format.speed when writing the AVI headers
#include "snd_main.h"
if (cl.time > cl.oldtime)
scr_infobartime_off -= cl.time - cl.oldtime;
if(scr_infobartime_off > 0)
- offset += 8;
+ offset += 1;
if(cls.qw_downloadname[0])
- offset += 8;
+ offset += 1;
downinfo = Curl_GetDownloadInfo(&nDownloads, &addinfo);
if(downinfo)
return;
CHECKGLERROR
- if (r_speeds.integer == 2 && qglFinish)
- qglFinish();
+ if (r_speeds.integer == 2)
+ GL_Finish();
CHECKGLERROR
r_timereport_temp = r_timereport_current;
r_timereport_current = Sys_DoubleTime();
}
if (r_viewscale_fpsscaling.integer)
- {
- switch(vid.renderpath)
- {
- case RENDERPATH_GL11:
- case RENDERPATH_GL13:
- case RENDERPATH_GL20:
- case RENDERPATH_GLES2:
- qglFinish();
- break;
- case RENDERPATH_D3D9:
- //Con_DPrintf("FIXME D3D9 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
- break;
- case RENDERPATH_D3D10:
- Con_DPrintf("FIXME D3D10 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
- break;
- case RENDERPATH_D3D11:
- Con_DPrintf("FIXME D3D11 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
- break;
- case RENDERPATH_SOFT:
- DPSOFTRAST_Flush();
- break;
- }
- }
+ GL_Finish();
drawscreenstart = Sys_DoubleTime();
if (R_Stereo_Active())
{
else
SCR_DrawScreen();
if (r_viewscale_fpsscaling.integer)
- {
- switch(vid.renderpath)
- {
- case RENDERPATH_GL11:
- case RENDERPATH_GL13:
- case RENDERPATH_GL20:
- case RENDERPATH_GLES2:
- qglFinish();
- break;
- case RENDERPATH_D3D9:
- //Con_DPrintf("FIXME D3D9 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
- break;
- case RENDERPATH_D3D10:
- Con_DPrintf("FIXME D3D10 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
- break;
- case RENDERPATH_D3D11:
- Con_DPrintf("FIXME D3D11 %s:%i %s\n", __FILE__, __LINE__, __FUNCTION__);
- break;
- case RENDERPATH_SOFT:
- DPSOFTRAST_Flush();
- break;
- }
- }
+ GL_Finish();
r_refdef.lastdrawscreentime = Sys_DoubleTime() - drawscreenstart;
SCR_CaptureVideo();