Android: revert commit SW_GetOutputSize, again (Bug 4669)
authorSylvain Becker <sylvain.becker@gmail.com>
Tue, 18 Jun 2019 18:22:18 +0200
changeset 12878f92b7ee0dec3
parent 12877 0207cec777b2
child 12879 e8a2d4743bc3
Android: revert commit SW_GetOutputSize, again (Bug 4669)
src/render/software/SDL_render_sw.c
     1.1 --- a/src/render/software/SDL_render_sw.c	Tue Jun 18 08:35:31 2019 -0700
     1.2 +++ b/src/render/software/SDL_render_sw.c	Tue Jun 18 18:22:18 2019 +0200
     1.3 @@ -79,7 +79,6 @@
     1.4      }
     1.5  }
     1.6  
     1.7 -#if !defined(ANDROID)
     1.8  static int
     1.9  SW_GetOutputSize(SDL_Renderer * renderer, int *w, int *h)
    1.10  {
    1.11 @@ -98,7 +97,6 @@
    1.12          return -1;
    1.13      }
    1.14  }
    1.15 -#endif
    1.16  
    1.17  static int
    1.18  SW_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
    1.19 @@ -822,13 +820,7 @@
    1.20      data->window = surface;
    1.21  
    1.22      renderer->WindowEvent = SW_WindowEvent;
    1.23 -#if defined(ANDROID)
    1.24 -    /* Avoid using it with Android software renderer. While resizing in background,
    1.25 -     * it ends up creating a broken texture because EGL context is not active. */
    1.26 -    renderer->GetOutputSize = NULL;
    1.27 -#else
    1.28      renderer->GetOutputSize = SW_GetOutputSize;
    1.29 -#endif
    1.30      renderer->CreateTexture = SW_CreateTexture;
    1.31      renderer->UpdateTexture = SW_UpdateTexture;
    1.32      renderer->LockTexture = SW_LockTexture;