diff --git a/src/common/settings.h b/src/common/settings.h index 03f2f2a3b..4ead68e66 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -42,7 +42,9 @@ enum class LayoutOption : u32 { SeparateWindows, #endif HybridScreen, +#ifndef ANDROID // TODO: Implement custom layouts on Android CustomLayout, +#endif // Similiar to default, but better for mobile devices in portrait mode. Top screen in clamped to // the top of the frame, and the bottom screen is enlarged to match the top screen. MobilePortrait, diff --git a/src/core/frontend/emu_window.cpp b/src/core/frontend/emu_window.cpp index 15e11d294..872cce7d1 100644 --- a/src/core/frontend/emu_window.cpp +++ b/src/core/frontend/emu_window.cpp @@ -228,10 +228,12 @@ void EmuWindow::UpdateCurrentFramebufferLayout(u32 width, u32 height, bool is_po Layout::LargeFrameLayout(width, height, Settings::values.swap_screen.GetValue(), false, 2.25f, Layout::VerticalAlignment::Top); break; +#ifndef ANDROID // TODO: Implement custom layouts on Android case Settings::LayoutOption::CustomLayout: layout = Layout::CustomFrameLayout(width, height, Settings::values.swap_screen.GetValue()); break; +#endif case Settings::LayoutOption::Default: default: layout = diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index acca340f0..514ec389b 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -696,6 +696,7 @@ void RendererOpenGL::DrawScreens(const Layout::FramebufferLayout& layout, bool f } void RendererOpenGL::ApplySecondLayerOpacity() { +#ifndef ANDROID // TODO: Implement custom layouts on Android if ((Settings::values.layout_option.GetValue() == Settings::LayoutOption::CustomLayout || Settings::values.custom_layout) && Settings::values.custom_second_layer_opacity.GetValue() < 100) { @@ -705,9 +706,11 @@ void RendererOpenGL::ApplySecondLayerOpacity() { state.blend.dst_rgb_func = GL_ONE_MINUS_CONSTANT_ALPHA; state.blend.color.alpha = Settings::values.custom_second_layer_opacity.GetValue() / 100.0f; } +#endif } void RendererOpenGL::ResetSecondLayerOpacity() { +#ifndef ANDROID // TODO: Implement custom layouts on Android if ((Settings::values.layout_option.GetValue() == Settings::LayoutOption::CustomLayout || Settings::values.custom_layout) && Settings::values.custom_second_layer_opacity.GetValue() < 100) { @@ -717,6 +720,7 @@ void RendererOpenGL::ResetSecondLayerOpacity() { state.blend.dst_a_func = GL_ZERO; state.blend.color.alpha = 0.0f; } +#endif } void RendererOpenGL::DrawTopScreen(const Layout::FramebufferLayout& layout,