X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=vid_shared.c;h=46325de89f8a51b322f34ccbe0f51cdd0cb06da9;hb=c3de890275f4840c3f4edf9a5ab047b7dd9b2a37;hp=a02639b7931758500d95013e430184881e13c177;hpb=f2033ea3754b3531a570ec7d407f154415047db5;p=xonotic%2Fdarkplaces.git

diff --git a/vid_shared.c b/vid_shared.c
index a02639b7..46325de8 100644
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -50,8 +50,6 @@ int gl_support_shading_language_100 = false;
 int gl_support_vertex_shader = false;
 // GL_ARB_fragment_shader
 int gl_support_fragment_shader = false;
-// GL_NV_half_float
-int gl_support_half_float = false;
 
 // LordHavoc: if window is hidden, don't update screen
 qboolean vid_hidden = true;
@@ -64,8 +62,9 @@ cvar_t vid_hardwaregammasupported = {CVAR_READONLY,"vid_hardwaregammasupported",
 // whether hardware gamma ramps are currently in effect
 qboolean vid_usinghwgamma = false;
 
-unsigned short vid_gammaramps[768];
-unsigned short vid_systemgammaramps[768];
+int vid_gammarampsize = 0;
+unsigned short *vid_gammaramps = NULL;
+unsigned short *vid_systemgammaramps = NULL;
 
 cvar_t vid_fullscreen = {CVAR_SAVE, "vid_fullscreen", "1", "use fullscreen (1) or windowed (0)"};
 cvar_t vid_width = {CVAR_SAVE, "vid_width", "640", "resolution"};
@@ -644,6 +643,7 @@ void VID_CheckExtensions(void)
 	Con_Printf("GL_EXTENSIONS: %s\n", gl_extensions);
 	Con_Printf("%s_EXTENSIONS: %s\n", gl_platform, gl_platformextensions);
 
+	CHECKGLERROR
 	qglGetIntegerv(GL_MAX_TEXTURE_SIZE, &gl_max_texture_size);
 
 	Con_Print("Checking OpenGL extensions...\n");
@@ -693,9 +693,7 @@ void VID_CheckExtensions(void)
 		if ((gl_support_shading_language_100 = GL_CheckExtension("GL_ARB_shading_language_100", NULL, "-noshadinglanguage100", false)))
 			if ((gl_support_vertex_shader = GL_CheckExtension("GL_ARB_vertex_shader", vertexshaderfuncs, "-novertexshader", false)))
 				gl_support_fragment_shader = GL_CheckExtension("GL_ARB_fragment_shader", NULL, "-nofragmentshader", false);
-
-// COMMANDLINEOPTION: GL: -nohalffloat disables GL_NV_half_float extension
-	gl_support_half_float = GL_CheckExtension("GL_NV_half_float", NULL, "-nohalffloat", false);
+	CHECKGLERROR
 }
 
 void Force_CenterView_f (void)
@@ -706,7 +704,7 @@ void Force_CenterView_f (void)
 static float cachegamma, cachebrightness, cachecontrast, cacheblack[3], cachegrey[3], cachewhite[3];
 static int cachecolorenable, cachehwgamma;
 #define BOUNDCVAR(cvar, m1, m2) c = &(cvar);f = bound(m1, c->value, m2);if (c->value != f) Cvar_SetValueQuick(c, f);
-void VID_UpdateGamma(qboolean force)
+void VID_UpdateGamma(qboolean force, int rampsize)
 {
 	cvar_t *c;
 	float f;
@@ -719,7 +717,7 @@ void VID_UpdateGamma(qboolean force)
 	if (!force
 	 && !forcenextframe
 	 && !v_psycho.integer
-	 && vid_usinghwgamma == (vid_activewindow && v_hwgamma.integer)
+	 && cachehwgamma == (vid_activewindow && v_hwgamma.integer)
 	 && v_gamma.value == cachegamma
 	 && v_contrast.value == cachecontrast
 	 && v_brightness.value == cachebrightness
@@ -735,42 +733,50 @@ void VID_UpdateGamma(qboolean force)
 	 && cachewhite[2] == v_color_white_b.value)
 		return;
 
+	BOUNDCVAR(v_gamma, 0.1, 5);cachegamma = v_gamma.value;
+	BOUNDCVAR(v_contrast, 1, 5);cachecontrast = v_contrast.value;
+	BOUNDCVAR(v_brightness, 0, 0.8);cachebrightness = v_brightness.value;
+	BOUNDCVAR(v_color_black_r, 0, 0.8);cacheblack[0] = v_color_black_r.value;
+	BOUNDCVAR(v_color_black_g, 0, 0.8);cacheblack[1] = v_color_black_g.value;
+	BOUNDCVAR(v_color_black_b, 0, 0.8);cacheblack[2] = v_color_black_b.value;
+	BOUNDCVAR(v_color_grey_r, 0, 0.95);cachegrey[0] = v_color_grey_r.value;
+	BOUNDCVAR(v_color_grey_g, 0, 0.95);cachegrey[1] = v_color_grey_g.value;
+	BOUNDCVAR(v_color_grey_b, 0, 0.95);cachegrey[2] = v_color_grey_b.value;
+	BOUNDCVAR(v_color_white_r, 1, 5);cachewhite[0] = v_color_white_r.value;
+	BOUNDCVAR(v_color_white_g, 1, 5);cachewhite[1] = v_color_white_g.value;
+	BOUNDCVAR(v_color_white_b, 1, 5);cachewhite[2] = v_color_white_b.value;
+	cachecolorenable = v_color_enable.integer;
+	cachehwgamma = vid_activewindow && v_hwgamma.integer;
+
 	forcenextframe = false;
 
-	if (vid_activewindow && v_hwgamma.integer)
+	if (cachehwgamma)
 	{
 		if (!vid_usinghwgamma)
 		{
 			vid_usinghwgamma = true;
-			Cvar_SetValueQuick(&vid_hardwaregammasupported, VID_GetGamma(vid_systemgammaramps));
+			if (vid_gammarampsize != rampsize || !vid_gammaramps)
+			{
+				vid_gammarampsize = rampsize;
+				if (vid_gammaramps)
+					Z_Free(vid_gammaramps);
+				vid_gammaramps = (unsigned short *)Z_Malloc(6 * vid_gammarampsize * sizeof(unsigned short));
+				vid_systemgammaramps = vid_gammaramps + 3 * vid_gammarampsize;
+			}
+			VID_GetGamma(vid_systemgammaramps, vid_gammarampsize);
 		}
 
-		BOUNDCVAR(v_gamma, 0.1, 5);cachegamma = v_gamma.value;
-		BOUNDCVAR(v_contrast, 1, 5);cachecontrast = v_contrast.value;
-		BOUNDCVAR(v_brightness, 0, 0.8);cachebrightness = v_brightness.value;
-		BOUNDCVAR(v_color_black_r, 0, 0.8);cacheblack[0] = v_color_black_r.value;
-		BOUNDCVAR(v_color_black_g, 0, 0.8);cacheblack[1] = v_color_black_g.value;
-		BOUNDCVAR(v_color_black_b, 0, 0.8);cacheblack[2] = v_color_black_b.value;
-		BOUNDCVAR(v_color_grey_r, 0, 0.95);cachegrey[0] = v_color_grey_r.value;
-		BOUNDCVAR(v_color_grey_g, 0, 0.95);cachegrey[1] = v_color_grey_g.value;
-		BOUNDCVAR(v_color_grey_b, 0, 0.95);cachegrey[2] = v_color_grey_b.value;
-		BOUNDCVAR(v_color_white_r, 1, 5);cachewhite[0] = v_color_white_r.value;
-		BOUNDCVAR(v_color_white_g, 1, 5);cachewhite[1] = v_color_white_g.value;
-		BOUNDCVAR(v_color_white_b, 1, 5);cachewhite[2] = v_color_white_b.value;
-		cachecolorenable = v_color_enable.integer;
-		cachehwgamma = v_hwgamma.integer;
-
 		if (cachecolorenable)
 		{
-			BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[0]), cachewhite[0], cacheblack[0], vid_gammaramps);
-			BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[1]), cachewhite[1], cacheblack[1], vid_gammaramps + 256);
-			BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[2]), cachewhite[2], cacheblack[2], vid_gammaramps + 512);
+			BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[0]), cachewhite[0], cacheblack[0], vid_gammaramps, rampsize);
+			BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[1]), cachewhite[1], cacheblack[1], vid_gammaramps + vid_gammarampsize, rampsize);
+			BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[2]), cachewhite[2], cacheblack[2], vid_gammaramps + vid_gammarampsize*2, rampsize);
 		}
 		else
 		{
-			BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps);
-			BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps + 256);
-			BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps + 512);
+			BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps, rampsize);
+			BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps + vid_gammarampsize, rampsize);
+			BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps + vid_gammarampsize*2, rampsize);
 		}
 
 		// LordHavoc: this code came from Ben Winslow and Zinx Verituse, I have
@@ -797,34 +803,31 @@ void VID_UpdateGamma(qboolean force)
 
 			for (x = 0;x < 3;x++)
 			{
-				nt[x] -= host_realframetime;
+				nt[x] -= cl.realframetime;
 				if (nt[x] < 0)
 				{
 					nd[x] = -nd[x];
 					nt[x] += lhrandom(1, 8.2);
 				}
-				n[x] += nd[x] * host_realframetime;
+				n[x] += nd[x] * cl.realframetime;
 				n[x] -= floor(n[x]);
 			}
 
 			for (x = 0, ramp = vid_gammaramps;x < 3;x++)
-				for (y = 0, t = n[x] - 0.75f;y < 256;y++, t += 0.75f * (2.0f / 256.0f))
-					*ramp++ = cos(t*(M_PI*2.0)) * 32767.0f + 32767.0f;
+				for (y = 0, t = n[x] - 0.75f;y < vid_gammarampsize;y++, t += 0.75f * (2.0f / vid_gammarampsize))
+					*ramp++ = (unsigned short)(cos(t*(M_PI*2.0)) * 32767.0f + 32767.0f);
 		}
 
-		Cvar_SetValueQuick(&vid_hardwaregammasupported, VID_SetGamma(vid_gammaramps));
+		Cvar_SetValueQuick(&vid_hardwaregammasupported, VID_SetGamma(vid_gammaramps, vid_gammarampsize));
 		// if custom gamma ramps failed (Windows stupidity), restore to system gamma
 		if(!vid_hardwaregammasupported.integer)
-			VID_SetGamma(vid_systemgammaramps);
-	}
-	else
-	{
-		if (vid_usinghwgamma)
 		{
-			vid_usinghwgamma = false;
-			Cvar_SetValueQuick(&vid_hardwaregammasupported, VID_SetGamma(vid_systemgammaramps));
+			VID_RestoreSystemGamma();
+			Cvar_SetValueQuick(&vid_hardwaregammasupported, false);
 		}
 	}
+	else
+		VID_RestoreSystemGamma();
 }
 
 void VID_RestoreSystemGamma(void)
@@ -832,7 +835,7 @@ void VID_RestoreSystemGamma(void)
 	if (vid_usinghwgamma)
 	{
 		vid_usinghwgamma = false;
-		VID_SetGamma(vid_systemgammaramps);
+		Cvar_SetValueQuick(&vid_hardwaregammasupported, VID_SetGamma(vid_systemgammaramps, vid_gammarampsize));
 	}
 }