From 777c394e25f353de8fda669ed5c7743163bc17b0 Mon Sep 17 00:00:00 2001
From: Gliniak <Gliniak93@gmail.com>
Date: Thu, 16 Oct 2025 23:36:41 +0200
Subject: [PATCH] [Kernel] Added VdQueryRealVideoMode

---
 src/xenia/gpu/graphics_system.h             | 27 ++++++++++++++++-----
 src/xenia/kernel/xam/xam_video.cc           |  4 +--
 src/xenia/kernel/xboxkrnl/xboxkrnl_video.cc | 14 ++++++++---
 src/xenia/kernel/xboxkrnl/xboxkrnl_video.h  |  2 +-
 4 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/src/xenia/gpu/graphics_system.h b/src/xenia/gpu/graphics_system.h
index 4fb6105ca..6862903bb 100644
--- a/src/xenia/gpu/graphics_system.h
+++ b/src/xenia/gpu/graphics_system.h
@@ -34,12 +34,27 @@ class Emulator;
 namespace xe {
 namespace gpu {
 
-inline const std::vector<std::pair<uint16_t, uint16_t>>
-    internal_display_resolution_entries = {
-        {640, 480},  {640, 576},   {720, 480},  {720, 576},  {800, 600},
-        {848, 480},  {1024, 768},  {1152, 864}, {1280, 720}, {1280, 768},
-        {1280, 960}, {1280, 1024}, {1360, 768}, {1440, 900}, {1680, 1050},
-        {1920, 540}, {1920, 1080}};
+constexpr std::array<std::pair<uint16_t, uint16_t>, 17>
+    internal_display_resolution_entries = {{{640, 480},
+                                            {640, 576},
+                                            {720, 480},
+                                            {720, 576},
+                                            {800, 600},
+                                            {848, 480},
+                                            {1024, 768},
+                                            {1152, 864},
+                                            {1280, 720},
+                                            {1280, 768},
+                                            {1280, 960},
+                                            {1280, 1024},
+                                            {1360, 768},
+                                            {1440, 900},
+                                            {1680, 1050},
+                                            {1920, 540},
+                                            {1920, 1080}}};
+
+constexpr std::array<std::pair<uint16_t, uint16_t>, 3>
+    driver_display_resolution = {{{1440, 900}, {1280, 720}, {1680, 1050}}};
 
 class CommandProcessor;
 
diff --git a/src/xenia/kernel/xam/xam_video.cc b/src/xenia/kernel/xam/xam_video.cc
index 3f8c2cee9..85673e6ea 100644
--- a/src/xenia/kernel/xam/xam_video.cc
+++ b/src/xenia/kernel/xam/xam_video.cc
@@ -25,9 +25,9 @@ enum X_VIDEO_CAPABILITIES : uint32_t {
 
 void XGetVideoMode_entry(pointer_t<X_VIDEO_MODE> video_mode) {
   // TODO(benvanik): actually check to see if these are the same.
-  xboxkrnl::VdQueryVideoMode(video_mode);
+  xboxkrnl::VdQueryVideoMode(video_mode, false);
 }
-DECLARE_XAM_EXPORT1(XGetVideoMode, kVideo, ExportTag::kSketchy);
+DECLARE_XAM_EXPORT1(XGetVideoMode, kVideo, kSketchy);
 
 dword_result_t XGetVideoCapabilities_entry() {
   uint32_t capabilities = 0;
diff --git a/src/xenia/kernel/xboxkrnl/xboxkrnl_video.cc b/src/xenia/kernel/xboxkrnl/xboxkrnl_video.cc
index 166d63776..9fa9808c1 100644
--- a/src/xenia/kernel/xboxkrnl/xboxkrnl_video.cc
+++ b/src/xenia/kernel/xboxkrnl/xboxkrnl_video.cc
@@ -175,7 +175,7 @@ static_assert_size(X_DISPLAY_INFO, 0x58);
 void VdGetCurrentDisplayInformation_entry(
     pointer_t<X_DISPLAY_INFO> display_info) {
   X_VIDEO_MODE mode;
-  VdQueryVideoMode(&mode);
+  VdQueryVideoMode(&mode, false);
 
   display_info.Zero();
   display_info->front_buffer_width = (uint16_t)mode.display_width;
@@ -200,7 +200,8 @@ void VdGetCurrentDisplayInformation_entry(
 }
 DECLARE_XBOXKRNL_EXPORT1(VdGetCurrentDisplayInformation, kVideo, kStub);
 
-void VdQueryVideoMode(X_VIDEO_MODE* video_mode) {
+void VdQueryVideoMode(X_VIDEO_MODE* video_mode,
+                      [[maybe_unused]] bool is_internal_resolution) {
   // TODO(benvanik): get info from actual display.
   std::memset(video_mode, 0, sizeof(X_VIDEO_MODE));
 
@@ -217,14 +218,19 @@ void VdQueryVideoMode(X_VIDEO_MODE* video_mode) {
   video_mode->widescreen_flag = cvars::widescreen ? 0x01 : 0x03;
 }
 
+void VdQueryRealVideoMode_entry(pointer_t<X_VIDEO_MODE> video_mode) {
+  VdQueryVideoMode(video_mode, true);
+}
+DECLARE_XBOXKRNL_EXPORT1(VdQueryRealVideoMode, kVideo, kStub);
+
 void VdQueryVideoMode_entry(pointer_t<X_VIDEO_MODE> video_mode) {
-  VdQueryVideoMode(video_mode);
+  VdQueryVideoMode(video_mode, false);
 }
 DECLARE_XBOXKRNL_EXPORT1(VdQueryVideoMode, kVideo, kStub);
 
 dword_result_t VdQueryVideoFlags_entry() {
   X_VIDEO_MODE mode;
-  VdQueryVideoMode(&mode);
+  VdQueryVideoMode(&mode, false);
 
   uint32_t flags = 0;
   flags |= mode.is_widescreen ? 1 : 0;
diff --git a/src/xenia/kernel/xboxkrnl/xboxkrnl_video.h b/src/xenia/kernel/xboxkrnl/xboxkrnl_video.h
index 3074a12f8..2af8d4be1 100644
--- a/src/xenia/kernel/xboxkrnl/xboxkrnl_video.h
+++ b/src/xenia/kernel/xboxkrnl/xboxkrnl_video.h
@@ -16,7 +16,7 @@ namespace xe {
 namespace kernel {
 namespace xboxkrnl {
 
-void VdQueryVideoMode(X_VIDEO_MODE* video_mode);
+void VdQueryVideoMode(X_VIDEO_MODE* video_mode, bool is_internal_resolution);
 
 }  // namespace xboxkrnl
 }  // namespace kernel