X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=vid_sdl.c;h=bad183525e54b2491d2839e115512c58b45c35ee;hb=023c4cb84d787baea342f95b951ca3366f337df4;hp=98d6567ee19bee9ac97f9dcc6ce119727dcbc11a;hpb=f13f171c10213c7320357226bb3fe361a52536ad;p=xonotic%2Fdarkplaces.git

diff --git a/vid_sdl.c b/vid_sdl.c
index 98d6567e..bad18352 100644
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -1977,7 +1977,8 @@ void GLES_Init(void)
 		Calling them just threw an exception. Android developer relations confirmed that they forgot to implement these. (yeah...)
 		It's apparently been fixed in 2.2, though I haven't tested."
 	*/
-	vid.support.ext_framebuffer_object = false;//true;
+	// LadyHavoc: Android 2.1 is way old now, enabling this again, it's going to be required soon.
+	vid.support.ext_framebuffer_object = true;
 
 	vid.support.ext_packed_depth_stencil = false;
 	vid.support.ext_stencil_two_side = false;
@@ -2848,7 +2849,6 @@ void VID_Shutdown (void)
 {
 	VID_EnableJoystick(false);
 	VID_SetMouse(false, false, false);
-	VID_RestoreSystemGamma();
 
 #if SDL_MAJOR_VERSION == 1
 #ifndef WIN32
@@ -2881,24 +2881,6 @@ void VID_Shutdown (void)
 	gl_platformextensions = "";
 }
 
-int VID_SetGamma (unsigned short *ramps, int rampsize)
-{
-#if SDL_MAJOR_VERSION == 1
-	return !SDL_SetGammaRamp (ramps, ramps + rampsize, ramps + rampsize*2);
-#else
-	return !SDL_SetWindowGammaRamp (window, ramps, ramps + rampsize, ramps + rampsize*2);
-#endif
-}
-
-int VID_GetGamma (unsigned short *ramps, int rampsize)
-{
-#if SDL_MAJOR_VERSION == 1
-	return !SDL_GetGammaRamp (ramps, ramps + rampsize, ramps + rampsize*2);
-#else
-	return !SDL_GetWindowGammaRamp (window, ramps, ramps + rampsize, ramps + rampsize*2);
-#endif
-}
-
 void VID_Finish (void)
 {
 #if SDL_MAJOR_VERSION == 1
@@ -2912,7 +2894,7 @@ void VID_Finish (void)
 #endif
 	vid_activewindow = !vid_hidden && vid_hasfocus;
 
-	VID_UpdateGamma(false, 256);
+	VID_UpdateGamma();
 
 	if (!vid_hidden)
 	{