Enable GL_OES_framebuffer_object on Android - it was broken in Android 2.1 but that...

Remove prototype for R_Init, it doesn't exist.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12383 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=17499dfe2bee8ebecbcb0f6ba3093a1ff2ea5070

diff --git a/render.h b/render.h
index 1d60682742557c301f802e9ef52ef633506fc73a..8f387103fffa9af158a5acdda5bbf277c748c3f6 100644 (file)
--- a/render.h
+++ b/render.h
@@ -126,7 +126,6 @@ extern cvar_t r_fullbright;
 extern cvar_t r_wateralpha;
 extern cvar_t r_dynamic;
 
-void R_Init(void);
 void R_UpdateVariables(void); // must call after setting up most of r_refdef, but before calling R_RenderView
 void R_RenderView(void); // must set r_refdef and call R_UpdateVariables and CL_UpdateEntityShading first
 void R_RenderView_UpdateViewVectors(void); // just updates r_refdef.view.{forward,left,up,origin,right,inverse_matrix}

diff --git a/vid_sdl.c b/vid_sdl.c
index dc210ad44a9e94e9bb79f84500cfb3d22dd687dc..bad183525e54b2491d2839e115512c58b45c35ee 100644 (file)
--- 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;