Merge branch 'master' into vulkan

2022-03-21 20:57:02 +03:00
parent b41fb851c6 82c1fb87aa
commit c47b874a4d
39 changed files with 867 additions and 254 deletions
--- a/src/xenia/ui/window.h
+++ b/src/xenia/ui/window.h
@@ -280,7 +280,7 @@ class Window {

  // Desired state stored by the common Window, modifiable both externally and
  // by the implementation (including from SetFullscreen itself).
-  virtual bool IsFullscreen() const { return fullscreen_; }
+  bool IsFullscreen() const { return fullscreen_; }
  void SetFullscreen(bool new_fullscreen);

  // Desired state stored by the common Window, externally modifiable, read-only