X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=gl_backend.c;h=c3eef34081e835296f1a08800b37a1663fa55521;hb=84e1358b4bab492f7a7a60c4d2b159eaeed64682;hp=fe474eac5b9183511ede900565a56e51e2236354;hpb=322a793217747dcba07746dbe23006dcb50492a2;p=xonotic%2Fdarkplaces.git

diff --git a/gl_backend.c b/gl_backend.c
index fe474eac..c3eef340 100644
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -74,7 +74,6 @@ void SCR_ScreenShot_f (void);
 
 // these are externally accessible
 int r_lightmapscalebit;
-float r_colorscale;
 
 static matrix4x4_t backend_viewmatrix;
 static matrix4x4_t backend_modelmatrix;
@@ -994,7 +993,6 @@ void R_Mesh_State_Texture(const rmeshstate_t *m)
 qboolean SCR_ScreenShot(char *filename, int x, int y, int width, int height, qboolean jpeg)
 {
 	qboolean ret;
-	int i, j;
 	qbyte *buffer;
 
 	if (!r_render.integer)
@@ -1004,16 +1002,6 @@ qboolean SCR_ScreenShot(char *filename, int x, int y, int width, int height, qbo
 	qglReadPixels (x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, buffer);
 	CHECKGLERROR
 
-	// LordHavoc: compensate for v_overbrightbits when using hardware gamma
-	if (v_hwgamma.integer)
-	{
-		for (i = 0;i < width * height * 3;i++)
-		{
-			j = buffer[i] << v_overbrightbits.integer;
-			buffer[i] = (qbyte) (bound(0, j, 255));
-		}
-	}
-
 	if (jpeg)
 		ret = JPEG_SaveImage_preflipped (filename, width, height, buffer);
 	else
@@ -1078,11 +1066,8 @@ void SCR_UpdateScreen (void)
 	if (gl_combine.integer && (!gl_combine_extension || r_textureunits.integer < 2))
 		Cvar_SetValueQuick(&gl_combine, 0);
 
-	// lighting scale
-	r_colorscale = 1.0f / (float) (1 << v_overbrightbits.integer);
-
 	// lightmaps only
-	r_lightmapscalebit = v_overbrightbits.integer;
+	r_lightmapscalebit = 0;
 	if (gl_combine.integer && r_textureunits.integer > 1)
 		r_lightmapscalebit += 2;
 
@@ -1122,6 +1107,7 @@ float varray_color4f[65536*4];
 float varray_texcoord2f[4][65536*2];
 float varray_texcoord3f[4][65536*3];
 float varray_normal3f[65536*3];
+int earray_element3i[65536];
 
 //===========================================================================
 // vertex array caching subsystem