From 5b5875d95c61b59164618c691b36ee7f37610398 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sat, 7 Mar 2020 20:33:32 -0500 Subject: [PATCH] android: renderer_opengl: Various fixes for GLES. --- src/video_core/renderer_opengl/renderer_opengl.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 64f92b91f..7796f0c18 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -27,6 +27,7 @@ #include "core/memory.h" #include "core/settings.h" #include "core/tracer/recorder.h" +#include "gl_state.h" #include "video_core/debug_utils/debug_utils.h" #include "video_core/rasterizer_interface.h" #include "video_core/renderer_opengl/gl_vars.h" @@ -39,7 +40,11 @@ namespace OpenGL { // If the size of this is too small, it ends up creating a soft cap on FPS as the renderer will have // to wait on available presentation frames. There doesn't seem to be much of a downside to a larger // number but 9 swap textures at 60FPS presentation allows for 800% speed so thats probably fine +#ifdef ANDROID +constexpr std::size_t SWAP_CHAIN_SIZE = 4; +#else constexpr std::size_t SWAP_CHAIN_SIZE = 9; +#endif class OGLTextureMailboxException : public std::runtime_error { public: @@ -96,7 +101,7 @@ public: frame->color.Create(); state.renderbuffer = frame->color.handle; state.Apply(); - glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA, width, height); + glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA8, width, height); // Recreate the FBO for the render target frame->render.Release(); @@ -1178,9 +1183,11 @@ static void APIENTRY DebugHandler(GLenum source, GLenum type, GLuint id, GLenum /// Initialize the renderer VideoCore::ResultStatus RendererOpenGL::Init() { +#ifndef ANDROID if (!gladLoadGL()) { return VideoCore::ResultStatus::ErrorBelowGL33; } +#endif if (GLAD_GL_KHR_debug) { //glEnable(GL_DEBUG_OUTPUT);