commit e82ac1f05937da2280b48a1311171c0bdbdadaef
author Sylvain Becker <sylvain.becker@gmail.com> Tue Jun 18 18:22:18 2019 +0200
committer Sylvain Becker <sylvain.becker@gmail.com> Tue Jun 18 18:22:18 2019 +0200
tree 076b622d2472f1a446a0f83e551419adc2502936
parent 900a682a92752028785399f90596c803a61dc12d

Android: revert commit SW_GetOutputSize, again (Bug 4669)

src/render/software/SDL_render_sw.c

diff --git a/src/render/software/SDL_render_sw.c b/src/render/software/SDL_render_sw.c
index 768dcbe..088a0a5 100644
--- a/src/render/software/SDL_render_sw.c
+++ b/src/render/software/SDL_render_sw.c
@@ -79,7 +79,6 @@
     }
 }
 
-#if !defined(ANDROID)
 static int
 SW_GetOutputSize(SDL_Renderer * renderer, int *w, int *h)
 {
@@ -98,7 +97,6 @@
         return -1;
     }
 }
-#endif
 
 static int
 SW_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
@@ -822,13 +820,7 @@
     data->window = surface;
 
     renderer->WindowEvent = SW_WindowEvent;
-#if defined(ANDROID)
-    /* Avoid using it with Android software renderer. While resizing in background,
-     * it ends up creating a broken texture because EGL context is not active. */
-    renderer->GetOutputSize = NULL;
-#else
     renderer->GetOutputSize = SW_GetOutputSize;
-#endif
     renderer->CreateTexture = SW_CreateTexture;
     renderer->UpdateTexture = SW_UpdateTexture;
     renderer->LockTexture = SW_LockTexture;