Merge pull request #11093 from liamwhite/result-ergonomics

core: remove ResultVal type

2 files changed, 4 insertions, 3 deletions

diff --git a/src/core/hle/service/vi/display/vi_display.cpp b/src/core/hle/service/vi/display/vi_display.cpp
index 69af2868a..f0b5eff8a 100644
--- a/src/core/hle/service/vi/display/vi_display.cpp
+++ b/src/core/hle/service/vi/display/vi_display.cpp
@@ -58,14 +58,15 @@ const Layer& Display::GetLayer(std::size_t index) const {
     return *layers.at(index);
 }
 
-ResultVal<Kernel::KReadableEvent*> Display::GetVSyncEvent() {
+Result Display::GetVSyncEvent(Kernel::KReadableEvent** out_vsync_event) {
     if (got_vsync_event) {
         return ResultPermissionDenied;
     }
 
     got_vsync_event = true;
 
-    return GetVSyncEventUnchecked();
+    *out_vsync_event = GetVSyncEventUnchecked();
+    return ResultSuccess;
 }
 
 Kernel::KReadableEvent* Display::GetVSyncEventUnchecked() {
diff --git a/src/core/hle/service/vi/display/vi_display.h b/src/core/hle/service/vi/display/vi_display.h
index 3f31d1f32..101cbce20 100644
--- a/src/core/hle/service/vi/display/vi_display.h
+++ b/src/core/hle/service/vi/display/vi_display.h
@@ -85,7 +85,7 @@ public:
      * @returns The internal Vsync event if it has not yet been retrieved,
      *          VI::ResultPermissionDenied otherwise.
      */
-    [[nodiscard]] ResultVal<Kernel::KReadableEvent*> GetVSyncEvent();
+    [[nodiscard]] Result GetVSyncEvent(Kernel::KReadableEvent** out_vsync_event);
 
     /// Gets the internal vsync event.
     Kernel::KReadableEvent* GetVSyncEventUnchecked();