From ae099d583cf93175fe54359ea2b7c5b665398c8b Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Sat, 18 Feb 2023 23:31:39 -0800
Subject: core: frontend: Refactor GraphicsContext to its own module.

---
 src/core/frontend/graphics_context.h | 69 ++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 src/core/frontend/graphics_context.h

(limited to 'src/core/frontend/graphics_context.h')

diff --git a/src/core/frontend/graphics_context.h b/src/core/frontend/graphics_context.h
new file mode 100644
index 000000000..064b19a96
--- /dev/null
+++ b/src/core/frontend/graphics_context.h
@@ -0,0 +1,69 @@
+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <optional>
+#include <string>
+
+namespace Core::Frontend {
+
+/**
+ * Represents a drawing context that supports graphics operations.
+ */
+class GraphicsContext {
+public:
+    virtual ~GraphicsContext() = default;
+
+    /// Inform the driver to swap the front/back buffers and present the current image
+    virtual void SwapBuffers() {}
+
+    /// Makes the graphics context current for the caller thread
+    virtual void MakeCurrent() {}
+
+    /// Releases (dunno if this is the "right" word) the context from the caller thread
+    virtual void DoneCurrent() {}
+
+    /// Parameters used to configure custom drivers (used by Android only)
+    struct CustomDriverParameters {
+        std::string hook_lib_dir;
+        std::string custom_driver_dir;
+        std::string custom_driver_name;
+        std::string file_redirect_dir;
+    };
+
+    /// Gets custom driver parameters configured by the frontend (used by Android only)
+    virtual std::optional<CustomDriverParameters> GetCustomDriverParameters() {
+        return {};
+    }
+
+    class Scoped {
+    public:
+        [[nodiscard]] explicit Scoped(GraphicsContext& context_) : context(context_) {
+            context.MakeCurrent();
+        }
+        ~Scoped() {
+            if (active) {
+                context.DoneCurrent();
+            }
+        }
+
+        /// In the event that context was destroyed before the Scoped is destroyed, this provides a
+        /// mechanism to prevent calling a destroyed object's method during the deconstructor
+        void Cancel() {
+            active = false;
+        }
+
+    private:
+        GraphicsContext& context;
+        bool active{true};
+    };
+
+    /// Calls MakeCurrent on the context and calls DoneCurrent when the scope for the returned value
+    /// ends
+    [[nodiscard]] Scoped Acquire() {
+        return Scoped{*this};
+    }
+};
+
+} // namespace Core::Frontend
-- 
cgit v1.2.3


From 4c38220a644f8292f4915eaabb2f80d3d0badab0 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Sat, 18 Feb 2023 23:42:07 -0800
Subject: android: native: Add support for custom Vulkan driver loading.

---
 src/core/frontend/graphics_context.h | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'src/core/frontend/graphics_context.h')

diff --git a/src/core/frontend/graphics_context.h b/src/core/frontend/graphics_context.h
index 064b19a96..7554c1583 100644
--- a/src/core/frontend/graphics_context.h
+++ b/src/core/frontend/graphics_context.h
@@ -3,8 +3,9 @@
 
 #pragma once
 
-#include <optional>
-#include <string>
+#include <memory>
+
+#include "common/dynamic_library.h"
 
 namespace Core::Frontend {
 
@@ -24,16 +25,8 @@ public:
     /// Releases (dunno if this is the "right" word) the context from the caller thread
     virtual void DoneCurrent() {}
 
-    /// Parameters used to configure custom drivers (used by Android only)
-    struct CustomDriverParameters {
-        std::string hook_lib_dir;
-        std::string custom_driver_dir;
-        std::string custom_driver_name;
-        std::string file_redirect_dir;
-    };
-
-    /// Gets custom driver parameters configured by the frontend (used by Android only)
-    virtual std::optional<CustomDriverParameters> GetCustomDriverParameters() {
+    /// Gets the GPU driver library (used by Android only)
+    virtual std::shared_ptr<Common::DynamicLibrary> GetDriverLibrary() {
         return {};
     }
 
-- 
cgit v1.2.3