From d90527e41eafa0f90fbcef8c814ca3fe7c99ffbc Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 20 Mar 2016 16:24:40 -0700 Subject: [PATCH] Correct some missing overrides. --- Common/GL/GLInterface/EGL.h | 14 +++++++------- android/jni/app-android.cpp | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Common/GL/GLInterface/EGL.h b/Common/GL/GLInterface/EGL.h index 3028e9fc93..beb7377449 100644 --- a/Common/GL/GLInterface/EGL.h +++ b/Common/GL/GLInterface/EGL.h @@ -26,14 +26,14 @@ class cInterfaceEGL : public cInterfaceBase { public: - void SwapInterval(int Interval); - void Swap(); - void SetMode(u32 mode) { s_opengl_mode = mode; } - void* GetFuncAddress(const std::string& name); + void SwapInterval(int Interval) override; + void Swap() override; + void SetMode(u32 mode) override { s_opengl_mode = mode; } + void* GetFuncAddress(const std::string& name) override; bool Create(void *window_handle, bool core, bool use565) override; - bool MakeCurrent(); - bool ClearCurrent(); - void Shutdown(); + bool MakeCurrent() override; + bool ClearCurrent() override; + void Shutdown() override; protected: EGLSurface egl_surf; diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index 853fb3673c..f72614d86d 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -71,12 +71,12 @@ public: class AndroidEGLGraphicsContext : public AndroidGraphicsContext { public: AndroidEGLGraphicsContext() : wnd_(nullptr), gl(nullptr) {} - bool Init(ANativeWindow *wnd, int desiredBackbufferSizeX, int desiredBackbufferSizeY, int backbufferFormat, int androidVersion); + bool Init(ANativeWindow *wnd, int desiredBackbufferSizeX, int desiredBackbufferSizeY, int backbufferFormat, int androidVersion) override; void Shutdown() override; void SwapBuffers() override; void SwapInterval(int interval) override {} - void Resize() {} - Thin3DContext *CreateThin3DContext() { + void Resize() override {} + Thin3DContext *CreateThin3DContext() override { CheckGLExtensions(); return T3DCreateGLContext(); } @@ -141,8 +141,8 @@ public: void Shutdown() override {} void SwapBuffers() override {} void SwapInterval(int interval) override {} - void Resize() {} - Thin3DContext *CreateThin3DContext() { + void Resize() override {} + Thin3DContext *CreateThin3DContext() override { CheckGLExtensions(); return T3DCreateGLContext(); } @@ -161,7 +161,7 @@ public: void SwapBuffers() override; void Resize() override; - void *GetAPIContext() { return g_Vulkan; } + void *GetAPIContext() override { return g_Vulkan; } Thin3DContext *CreateThin3DContext() override { return T3DCreateVulkanContext(g_Vulkan);