We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Proof of concept patch

310c0fc6.diff (text/plain), 4.38 KB, created by Hak Matsuda on 2014-10-29 21:05:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hak Matsuda

Created: 2014-10-29 21:05:19 UTC

Size: 4.38 KB

patch

obsolete

>From 310c0fc67668d93e88b727aa6cc11fed589097ed Mon Sep 17 00:00:00 2001
>From: Hak Matsuda <hakuro@google.com>
>Date: Wed, 29 Oct 2014 13:41:38 -0700
>Subject: [PATCH] Temporary fix for http://b/17920641 This is a patch for SDL calling ANativeWindow_setBuffersGeometry() before creating EGL surface. This needs to be done at initialization time and every time an app becomes foreground.
>
>Opened a feature request for SDL (https://bugzilla.libsdl.org/show_bug.cgi?id=2768) for SDL side changes.
>
>Change-Id: I12d62ae83ea770dec7175fc4f4094e4b4859465c
>Tested: On N5
>---
>
>diff --git a/src/core/android/SDL_android.c b/src/core/android/SDL_android.c
>index d806208..f1783e8 100644
>--- a/src/core/android/SDL_android.c
>+++ b/src/core/android/SDL_android.c
>@@ -222,6 +222,28 @@
>             ANativeWindow_release(data->native_window);
>         }
>         data->native_window = Android_JNI_GetNativeWindow();
>+
>+        if (Android_ScalerWidthPortrait || Android_ScalerHeightPortrait
>+            || Android_ScalerWidthLandscape || Android_ScalerHeightLandscape)
>+        {
>+            int width;
>+            int height;
>+            if (Android_ScreenWidth < Android_ScreenHeight)
>+            {
>+                __android_log_print(ANDROID_LOG_INFO, "SDL", "setting HW scaler using landscape setting!");
>+                width = Android_ScalerWidthLandscape;
>+                height =  Android_ScalerHeightLandscape;
>+            }
>+            else
>+            {
>+                __android_log_print(ANDROID_LOG_INFO, "SDL", "setting HW scaler using portrait setting!");
>+                width = Android_ScalerWidthPortrait;
>+                height =  Android_ScalerHeightPortrait;
>+            }
>+
>+            // Enable HW scaler
>+            ANativeWindow_setBuffersGeometry(data->native_window, width, height, 0);
>+        }
>         data->egl_surface = SDL_EGL_CreateSurface(_this, (NativeWindowType) data->native_window);
>     }
>     
>diff --git a/src/video/android/SDL_androidvideo.c b/src/video/android/SDL_androidvideo.c
>index f1cf185..144ba5c 100644
>--- a/src/video/android/SDL_androidvideo.c
>+++ b/src/video/android/SDL_androidvideo.c
>@@ -69,6 +69,24 @@
> /* Currently only one window */
> SDL_Window *Android_Window = NULL;
> 
>+/*Quick hack for HW scaler adoption*/
>+int Android_ScalerWidthPortrait = 0;
>+int Android_ScalerHeightPortrait = 0;
>+int Android_ScalerWidthLandscape = 0;
>+int Android_ScalerHeightLandscape = 0;
>+
>+void Android_SetScalerResolutionPortrait(int width, int height)
>+{
>+    Android_ScalerWidthPortrait = width;
>+    Android_ScalerHeightPortrait = height;
>+}
>+
>+void Android_SetScalerResolutionLandscape(int width, int height)
>+{
>+    Android_ScalerWidthLandscape = width;
>+    Android_ScalerHeightLandscape = height;
>+}
>+
> static int
> Android_Available(void)
> {
>diff --git a/src/video/android/SDL_androidvideo.h b/src/video/android/SDL_androidvideo.h
>index ccd5d7a..a8093cd 100644
>--- a/src/video/android/SDL_androidvideo.h
>+++ b/src/video/android/SDL_androidvideo.h
>@@ -43,6 +43,12 @@
> extern SDL_sem *Android_PauseSem, *Android_ResumeSem;
> extern SDL_Window *Android_Window;
> 
>+extern void Android_SetScalerResolutionPortrait(int width, int height);
>+extern void Android_SetScalerResolutionLandscape(int width, int height);
>+extern int Android_ScalerWidthPortrait;
>+extern int Android_ScalerHeightPortrait;
>+extern int Android_ScalerWidthLandscape;
>+extern int Android_ScalerHeightLandscape;
> 
> #endif /* _SDL_androidvideo_h */
> 
>diff --git a/src/video/android/SDL_androidwindow.c b/src/video/android/SDL_androidwindow.c
>index acbb582..8120faf 100644
>--- a/src/video/android/SDL_androidwindow.c
>+++ b/src/video/android/SDL_androidwindow.c
>@@ -69,6 +69,26 @@
>         return SDL_SetError("Could not fetch native window");
>     }
>     
>+    if (Android_ScalerWidthPortrait || Android_ScalerHeightPortrait
>+      || Android_ScalerWidthLandscape || Android_ScalerHeightLandscape)
>+    {
>+      int width;
>+      int height;
>+      if (window->w > window->h)
>+      {
>+        width = Android_ScalerWidthLandscape;
>+        height =  Android_ScalerHeightLandscape;
>+      }
>+      else
>+      {
>+        width = Android_ScalerWidthPortrait;
>+        height =  Android_ScalerHeightPortrait;
>+      }
>+
>+      // Enable HW scaler
>+      ANativeWindow_setBuffersGeometry(data->native_window, width, height, 0);
>+    }
>+
>     data->egl_surface = SDL_EGL_CreateSurface(_this, (NativeWindowType) data->native_window);
> 
>     if (data->egl_surface == EGL_NO_SURFACE) {

Actions: View | Diff

Attachments on bug 2768: 1919 | 1927

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.