From 082c767fba80a2211358b5e4dbbbfab88b314c9d Mon Sep 17 00:00:00 2001 From: gibbed Date: Wed, 9 Aug 2017 00:40:44 -0500 Subject: [PATCH] Add the currently active graphics system to the window title. --- src/xenia/app/emulator_window.cc | 6 ++++++ src/xenia/gpu/gl4/gl4_graphics_system.h | 2 ++ src/xenia/gpu/graphics_system.h | 2 ++ src/xenia/gpu/null/null_graphics_system.h | 2 ++ src/xenia/gpu/vulkan/vulkan_graphics_system.h | 2 ++ 5 files changed, 14 insertions(+) diff --git a/src/xenia/app/emulator_window.cc b/src/xenia/app/emulator_window.cc index 634c65803..cd80a30e8 100644 --- a/src/xenia/app/emulator_window.cc +++ b/src/xenia/app/emulator_window.cc @@ -392,6 +392,12 @@ void EmulatorWindow::UpdateTitle() { title += L" - " + game_title; } + auto graphics_system = emulator()->graphics_system(); + if (graphics_system) { + auto graphics_name = graphics_system->name(); + title += L" <" + graphics_name + L">"; + } + if (Clock::guest_time_scalar() != 1.0) { title += xe::format_string(L" (@%.2fx)", Clock::guest_time_scalar()); } diff --git a/src/xenia/gpu/gl4/gl4_graphics_system.h b/src/xenia/gpu/gl4/gl4_graphics_system.h index 3050cc4b4..9644db075 100644 --- a/src/xenia/gpu/gl4/gl4_graphics_system.h +++ b/src/xenia/gpu/gl4/gl4_graphics_system.h @@ -24,6 +24,8 @@ class GL4GraphicsSystem : public GraphicsSystem { GL4GraphicsSystem(); ~GL4GraphicsSystem() override; + std::wstring name() const override { return L"GL4"; } + X_STATUS Setup(cpu::Processor* processor, kernel::KernelState* kernel_state, ui::Window* target_window) override; void Shutdown() override; diff --git a/src/xenia/gpu/graphics_system.h b/src/xenia/gpu/graphics_system.h index a45ceedc0..eda218f76 100644 --- a/src/xenia/gpu/graphics_system.h +++ b/src/xenia/gpu/graphics_system.h @@ -34,6 +34,8 @@ class GraphicsSystem { public: virtual ~GraphicsSystem(); + virtual std::wstring name() const = 0; + Memory* memory() const { return memory_; } cpu::Processor* processor() const { return processor_; } kernel::KernelState* kernel_state() const { return kernel_state_; } diff --git a/src/xenia/gpu/null/null_graphics_system.h b/src/xenia/gpu/null/null_graphics_system.h index bfea68825..52ec94992 100644 --- a/src/xenia/gpu/null/null_graphics_system.h +++ b/src/xenia/gpu/null/null_graphics_system.h @@ -24,6 +24,8 @@ class NullGraphicsSystem : public GraphicsSystem { NullGraphicsSystem(); ~NullGraphicsSystem() override; + std::wstring name() const override { return L"null"; } + X_STATUS Setup(cpu::Processor* processor, kernel::KernelState* kernel_state, ui::Window* target_window) override; void Shutdown() override; diff --git a/src/xenia/gpu/vulkan/vulkan_graphics_system.h b/src/xenia/gpu/vulkan/vulkan_graphics_system.h index b9a2341ae..cd61fc181 100644 --- a/src/xenia/gpu/vulkan/vulkan_graphics_system.h +++ b/src/xenia/gpu/vulkan/vulkan_graphics_system.h @@ -24,6 +24,8 @@ class VulkanGraphicsSystem : public GraphicsSystem { VulkanGraphicsSystem(); ~VulkanGraphicsSystem() override; + std::wstring name() const override { return L"Vulkan"; } + X_STATUS Setup(cpu::Processor* processor, kernel::KernelState* kernel_state, ui::Window* target_window) override; void Shutdown() override;