Citra-emu/citra-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: emu_window: Fix surface width/height.

Browse Source 
- Fixes a bug when resuming the app.
This commit is contained in:
bunnei 2020-03-10 00:17:36 -04:00
parent d0880cdf10
commit 280c86c941
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/android/app/src/main/jni/emu_window/emu_window.cpp
View File

@ -95,7 +95,14 @@ void EmuWindow_Android::OnTouchMoved(int x, int y) {
void EmuWindow_Android::OnFramebufferSizeChanged() { void EmuWindow_Android::OnFramebufferSizeChanged() {
UpdateLandscapeScreenLayout(); UpdateLandscapeScreenLayout();
UpdateCurrentFramebufferLayout(window_width, window_height, IsPortraitMode()); const bool is_portrait_mode{IsPortraitMode()};
const int bigger{window_width > window_height ? window_width : window_height};
const int smaller{window_width < window_height ? window_width : window_height};
if (is_portrait_mode) {
UpdateCurrentFramebufferLayout(smaller, bigger, is_portrait_mode);
} else {
UpdateCurrentFramebufferLayout(bigger, smaller, is_portrait_mode);
}
} }
EmuWindow_Android::EmuWindow_Android(ANativeWindow* surface) { EmuWindow_Android::EmuWindow_Android(ANativeWindow* surface) {
@ -126,6 +133,13 @@ EmuWindow_Android::EmuWindow_Android(ANativeWindow* surface) {
CreateWindowSurface(); CreateWindowSurface();
if (eglQuerySurface(egl_display, egl_surface, EGL_WIDTH, &window_width) != EGL_TRUE) {
return;
}
if (eglQuerySurface(egl_display, egl_surface, EGL_HEIGHT, &window_height) != EGL_TRUE) {
return;
}
if (egl_context = eglCreateContext(egl_display, egl_config, 0, egl_context_attribs.data()); if (egl_context = eglCreateContext(egl_display, egl_config, 0, egl_context_attribs.data());
egl_context == EGL_NO_CONTEXT) { egl_context == EGL_NO_CONTEXT) {
LOG_CRITICAL(Frontend, "eglCreateContext() failed"); LOG_CRITICAL(Frontend, "eglCreateContext() failed");
@ -164,9 +178,6 @@ bool EmuWindow_Android::CreateWindowSurface() {
EGLint format{}; EGLint format{};
eglGetConfigAttrib(egl_display, egl_config, EGL_NATIVE_VISUAL_ID, &format); eglGetConfigAttrib(egl_display, egl_config, EGL_NATIVE_VISUAL_ID, &format);
ANativeWindow_setBuffersGeometry(host_window, 0, 0, format); ANativeWindow_setBuffersGeometry(host_window, 0, 0, format);
window_width = ANativeWindow_getWidth(host_window);
window_height = ANativeWindow_getHeight(host_window);
UpdateCurrentFramebufferLayout(window_width, window_height);
if (egl_surface = eglCreateWindowSurface(egl_display, egl_config, host_window, 0); if (egl_surface = eglCreateWindowSurface(egl_display, egl_config, host_window, 0);
egl_surface == EGL_NO_SURFACE) { egl_surface == EGL_NO_SURFACE) {

2
src/android/app/src/main/jni/emu_window/emu_window.h
View File

@ -26,9 +26,9 @@ public:
void DoneCurrent() override; void DoneCurrent() override;
private: private:
EGLDisplay egl_display{};
EGLSurface egl_surface{}; EGLSurface egl_surface{};
EGLContext egl_context{}; EGLContext egl_context{};
EGLDisplay egl_display{};
}; };
class EmuWindow_Android : public Frontend::EmuWindow { class EmuWindow_Android : public Frontend::EmuWindow {