encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: resize with software rendering, reverted again (Bug 4669)

This commit is contained in:
Sylvain Becker 2019-06-18 18:53:58 +02:00
parent 12b92260cc
commit e96d4760ac
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/render/software/SDL_render_sw.c
View File

@ -82,11 +82,6 @@ SW_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event)
static int static int
SW_GetOutputSize(SDL_Renderer * renderer, int *w, int *h) SW_GetOutputSize(SDL_Renderer * renderer, int *w, int *h)
{ {
#if defined(ANDROID)
extern void Android_GetScreenResolution(int *w, int *h);
Android_GetScreenResolution(w, h);
return 0;
#else
SDL_Surface *surface = SW_ActivateRenderer(renderer); SDL_Surface *surface = SW_ActivateRenderer(renderer);
if (surface) { if (surface) {
@ -101,7 +96,6 @@ SW_GetOutputSize(SDL_Renderer * renderer, int *w, int *h)
SDL_SetError("Software renderer doesn't have an output surface"); SDL_SetError("Software renderer doesn't have an output surface");
return -1; return -1;
} }
#endif
} }
static int static int

12
src/video/android/SDL_androidvideo.c
View File

@ -237,18 +237,6 @@ Android_SetScreenResolution(int surfaceWidth, int surfaceHeight, int deviceWidth
Android_ScreenRate = (int)rate; Android_ScreenRate = (int)rate;
} }
void
Android_GetScreenResolution(int *w, int *h)
{
if (w) {
*w = Android_SurfaceWidth;
}
if (h) {
*h = Android_SurfaceHeight;
}
}
void Android_SendResize(SDL_Window *window) void Android_SendResize(SDL_Window *window)
{ {
/* /*

1
src/video/android/SDL_androidvideo.h
View File

@ -30,7 +30,6 @@
/* Called by the JNI layer when the screen changes size or format */ /* Called by the JNI layer when the screen changes size or format */
extern void Android_SetScreenResolution(int surfaceWidth, int surfaceHeight, int deviceWidth, int deviceHeight, Uint32 format, float rate); extern void Android_SetScreenResolution(int surfaceWidth, int surfaceHeight, int deviceWidth, int deviceHeight, Uint32 format, float rate);
extern void Android_SendResize(SDL_Window *window); extern void Android_SendResize(SDL_Window *window);
extern void Android_GetScreenResolution(int *w, int *h);
/* Private display data */ /* Private display data */