From 8a20d40d903cc607b8b9995b7dba4ec5c3a1dd03 Mon Sep 17 00:00:00 2001
From: Sylvain Becker <sylvain.becker@gmail.com>
Date: Tue, 18 Jun 2019 18:22:18 +0200
Subject: [PATCH] Android: revert commit SW_GetOutputSize, again (Bug 4669)

---
 src/render/software/SDL_render_sw.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/render/software/SDL_render_sw.c b/src/render/software/SDL_render_sw.c
index 768dcbe532c2f..088a0a5a5d6d7 100644
--- a/src/render/software/SDL_render_sw.c
+++ b/src/render/software/SDL_render_sw.c
@@ -79,7 +79,6 @@ SW_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event)
     }
 }
 
-#if !defined(ANDROID)
 static int
 SW_GetOutputSize(SDL_Renderer * renderer, int *w, int *h)
 {
@@ -98,7 +97,6 @@ SW_GetOutputSize(SDL_Renderer * renderer, int *w, int *h)
         return -1;
     }
 }
-#endif
 
 static int
 SW_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
@@ -822,13 +820,7 @@ SW_CreateRendererForSurface(SDL_Surface * surface)
     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;