Skip to content

Commit

Permalink
Android: revert commit SW_GetOutputSize, again (Bug 4669)
Browse files Browse the repository at this point in the history
  • Loading branch information
1bsyl committed Jun 18, 2019
1 parent 63506ae commit 8a20d40
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions src/render/software/SDL_render_sw.c
Expand Up @@ -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)
{
Expand All @@ -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)
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 8a20d40

Please sign in to comment.