X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cl_screen.c;h=d5ca01e61e40651d7d15c3b17e446756cba8c5d7;hb=7f0610023f8f88d40c522b5c19706081fe733606;hp=1f6538e9559e999a6af76380d1047b89a3adb896;hpb=7dac21d9438422a6355794323a0c50e581b161ad;p=xonotic%2Fdarkplaces.git

diff --git a/cl_screen.c b/cl_screen.c
index 1f6538e9..d5ca01e6 100644
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -613,9 +613,9 @@ static int SCR_InfobarHeight(void)
 	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)
@@ -735,8 +735,8 @@ void R_TimeReport(const char *desc)
 		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();
@@ -766,7 +766,7 @@ void R_TimeReport_BeginFrame(void)
 	r_timereport_active = false;
 	memset(&r_refdef.stats, 0, sizeof(r_refdef.stats));
 
-	if (r_speeds.integer >= 2 && cls.signon == SIGNONS && cls.state == ca_connected)
+	if (r_speeds.integer >= 2)
 	{
 		r_timereport_active = true;
 		r_timereport_start = r_timereport_current = Sys_DoubleTime();
@@ -781,6 +781,8 @@ static int R_CountLeafTriangles(const dp_model_t *model, const mleaf_t *leaf)
 	return triangles;
 }
 
+extern cvar_t r_viewscale;
+extern float viewscalefpsadjusted;
 void R_TimeReport_EndFrame(void)
 {
 	int i, j, lines, y;
@@ -789,16 +791,16 @@ void R_TimeReport_EndFrame(void)
 	mleaf_t *viewleaf;
 
 	string[0] = 0;
-	if (r_speeds.integer && cls.signon == SIGNONS && cls.state == ca_connected)
+	if (r_speeds.integer)
 	{
 		// put the location name in the r_speeds display as it greatly helps
 		// when creating loc files
 		loc = CL_Locs_FindNearest(cl.movement_origin);
 		viewleaf = (r_refdef.scene.worldmodel && r_refdef.scene.worldmodel->brush.PointInLeaf) ? r_refdef.scene.worldmodel->brush.PointInLeaf(r_refdef.scene.worldmodel, r_refdef.view.origin) : NULL;
 		dpsnprintf(string, sizeof(string),
-"%s%s\n"
+"%6.0fus rendertime %3.0f%% viewscale %s%s %.3f cl.time\n"
 "%3i renders org:'%+8.2f %+8.2f %+8.2f' dir:'%+2.3f %+2.3f %+2.3f'\n"
-"%5i viewleaf%5i cluster%2i area%4i brushes%4i surfaces(%7i triangles)\n"
+"%5i viewleaf%5i cluster%3i area%4i brushes%4i surfaces(%7i triangles)\n"
 "%7i surfaces%7i triangles %5i entities (%7i surfaces%7i triangles)\n"
 "%5i leafs%5i portals%6i/%6i particles%6i/%6i decals %3i%% quality\n"
 "%7i lightmap updates (%7i pixels)%8iKB/%8iKB framedata\n"
@@ -808,7 +810,7 @@ void R_TimeReport_EndFrame(void)
 "%6i draws%8i vertices%8i triangles bloompixels%8i copied%8i drawn\n"
 "updated%5i indexbuffers%8i bytes%5i vertexbuffers%8i bytes\n"
 "%s"
-, loc ? "Location: " : "", loc ? loc->name : ""
+, r_refdef.lastdrawscreentime * 1000000.0, r_viewscale.value * sqrt(viewscalefpsadjusted) * 100.0f, loc ? "Location: " : "", loc ? loc->name : "", cl.time
 , r_refdef.stats.renders, r_refdef.view.origin[0], r_refdef.view.origin[1], r_refdef.view.origin[2], r_refdef.view.forward[0], r_refdef.view.forward[1], r_refdef.view.forward[2]
 , viewleaf ? (int)(viewleaf - r_refdef.scene.worldmodel->brush.data_leafs) : -1, viewleaf ? viewleaf->clusterindex : -1, viewleaf ? viewleaf->areaindex : -1, viewleaf ? viewleaf->numleafbrushes : 0, viewleaf ? viewleaf->numleafsurfaces : 0, viewleaf ? R_CountLeafTriangles(r_refdef.scene.worldmodel, viewleaf) : 0
 , r_refdef.stats.world_surfaces, r_refdef.stats.world_triangles, r_refdef.stats.entities, r_refdef.stats.entities_surfaces, r_refdef.stats.entities_triangles
@@ -1789,7 +1791,6 @@ void SCR_DrawScreen (void)
 		SCR_DrawPause ();
 		if (!r_letterbox.value)
 			Sbar_Draw();
-		Sbar_ShowFPS();
 		SHOWLMP_drawall();
 		SCR_CheckDrawCenterString();
 	}
@@ -1809,11 +1810,9 @@ void SCR_DrawScreen (void)
 	if (r_timereport_active)
 		R_TimeReport("2d");
 
-	if (cls.signon == SIGNONS)
-	{
-		R_TimeReport_EndFrame();
-		R_TimeReport_BeginFrame();
-	}
+	R_TimeReport_EndFrame();
+	R_TimeReport_BeginFrame();
+	Sbar_ShowFPS();
 
 	DrawQ_Finish();
 
@@ -2007,7 +2006,7 @@ static void SCR_DrawLoadingStack(void)
 		sscanf(scr_loadingscreen_barcolor.string, "%f %f %f", &colors[12], &colors[13], &colors[14]);  colors[15] = 1;
 
 		R_Mesh_PrepareVertices_Generic_Arrays(4, verts, colors, NULL);
-		R_SetupShader_Generic(NULL, NULL, GL_MODULATE, 1);
+		R_SetupShader_Generic(NULL, NULL, GL_MODULATE, 1, true, true);
 		R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0);
 
 		// make sure everything is cleared, including the progress indicator
@@ -2030,6 +2029,7 @@ static void SCR_DrawLoadingScreen_SharedSetup (qboolean clear)
 //	CHECKGLERROR
 	r_refdef.draw2dstage = true;
 	R_Viewport_InitOrtho(&viewport, &identitymatrix, 0, 0, vid.width, vid.height, 0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100, NULL);
+	R_Mesh_ResetRenderTargets();
 	R_SetViewport(&viewport);
 	GL_ColorMask(1,1,1,1);
 	// when starting up a new video mode, make sure the screen is cleared to black
@@ -2039,7 +2039,7 @@ static void SCR_DrawLoadingScreen_SharedSetup (qboolean clear)
 	R_Mesh_Start();
 	R_EntityMatrix(&identitymatrix);
 	// draw the loading plaque
-	loadingscreenpic = Draw_CachePic (loadingscreenpic_number ? va("gfx/loading%d", loadingscreenpic_number+1) : "gfx/loading");
+	loadingscreenpic = Draw_CachePic_Flags (loadingscreenpic_number ? va("gfx/loading%d", loadingscreenpic_number+1) : "gfx/loading", loadingscreenpic_number ? CACHEPICFLAG_NOTPERSISTENT : 0);
 
 	w = loadingscreenpic->width;
 	h = loadingscreenpic->height;
@@ -2105,11 +2105,11 @@ static void SCR_DrawLoadingScreen (qboolean clear)
 	if(loadingscreentexture)
 	{
 		R_Mesh_PrepareVertices_Generic_Arrays(4, loadingscreentexture_vertex3f, NULL, loadingscreentexture_texcoord2f);
-		R_SetupShader_Generic(loadingscreentexture, NULL, GL_MODULATE, 1);
+		R_SetupShader_Generic(loadingscreentexture, NULL, GL_MODULATE, 1, true, true);
 		R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0);
 	}
 	R_Mesh_PrepareVertices_Generic_Arrays(4, loadingscreenpic_vertex3f, NULL, loadingscreenpic_texcoord2f);
-	R_SetupShader_Generic(loadingscreenpic->tex, NULL, GL_MODULATE, 1);
+	R_SetupShader_Generic(Draw_GetPicTexture(loadingscreenpic), NULL, GL_MODULATE, 1, true, true);
 	R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0);
 	SCR_DrawLoadingStack();
 }
@@ -2151,6 +2151,10 @@ void SCR_UpdateLoadingScreen (qboolean clear)
 	}
 	loadingscreencleared = clear;
 
+#ifdef USE_GLES2
+	SCR_DrawLoadingScreen_SharedSetup(clear);
+	SCR_DrawLoadingScreen(clear);
+#else
 	if (qglDrawBuffer)
 		qglDrawBuffer(GL_BACK);
 	SCR_DrawLoadingScreen_SharedSetup(clear);
@@ -2167,6 +2171,7 @@ void SCR_UpdateLoadingScreen (qboolean clear)
 			qglDrawBuffer(GL_BACK);
 		SCR_DrawLoadingScreen(clear);
 	}
+#endif
 	SCR_DrawLoadingScreen_SharedFinish(clear);
 
 	// this goes into the event loop, and should prevent unresponsive cursor on vista
@@ -2195,6 +2200,7 @@ extern cvar_t cl_minfps_qualitymax;
 extern cvar_t cl_minfps_qualitymin;
 extern cvar_t cl_minfps_qualitypower;
 extern cvar_t cl_minfps_qualityscale;
+extern cvar_t r_viewscale_fpsscaling;
 static double cl_updatescreen_rendertime = 0;
 static double cl_updatescreen_quality = 1;
 extern void Sbar_ShowFPS_Update(void);
@@ -2202,6 +2208,7 @@ void CL_UpdateScreen(void)
 {
 	vec3_t vieworigin;
 	double rendertime1;
+	double drawscreenstart;
 	float conwidth, conheight;
 	float f;
 	r_viewport_t viewport;
@@ -2275,6 +2282,7 @@ void CL_UpdateScreen(void)
 
 	SCR_SetUpToDrawConsole();
 
+#ifndef USE_GLES2
 	if (qglDrawBuffer)
 	{
 		CHECKGLERROR
@@ -2289,8 +2297,10 @@ void CL_UpdateScreen(void)
 			qglDisable(GL_DITHER);CHECKGLERROR
 		}
 	}
+#endif
 
 	R_Viewport_InitOrtho(&viewport, &identitymatrix, 0, 0, vid.width, vid.height, 0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100, NULL);
+	R_Mesh_ResetRenderTargets();
 	R_SetViewport(&viewport);
 	GL_ScissorTest(false);
 	GL_ColorMask(1,1,1,1);
@@ -2302,6 +2312,7 @@ void CL_UpdateScreen(void)
 	f = pow((float)cl_updatescreen_quality, cl_minfps_qualitypower.value) * cl_minfps_qualityscale.value;
 	r_refdef.view.quality = bound(cl_minfps_qualitymin.value, f, cl_minfps_qualitymax.value);
 
+#ifndef USE_GLES2
 	if (qglPolygonStipple)
 	{
 		if(scr_stipple.integer)
@@ -2328,7 +2339,12 @@ void CL_UpdateScreen(void)
 			qglDisable(GL_POLYGON_STIPPLE);CHECKGLERROR
 		}
 	}
+#endif
 
+	if (r_viewscale_fpsscaling.integer)
+		GL_Finish();
+	drawscreenstart = Sys_DoubleTime();
+#ifndef USE_GLES2
 	if (R_Stereo_Active())
 	{
 		r_stereo_side = 0;
@@ -2360,7 +2376,11 @@ void CL_UpdateScreen(void)
 		SCR_DrawScreen();
 	}
 	else
+#endif
 		SCR_DrawScreen();
+	if (r_viewscale_fpsscaling.integer)
+		GL_Finish();
+	r_refdef.lastdrawscreentime = Sys_DoubleTime() - drawscreenstart;
 
 	SCR_CaptureVideo();