From 2cc71afdcdb6aa74ad00a8cd9801218aebb260c8 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Tue, 22 Oct 2019 21:57:26 +0200 Subject: [PATCH] Remove further occurrences of DirectX 12 --- rpcs3/Json/tooltips.json | 6 ++---- rpcs3/rpcs3qt/emu_settings.h | 4 ---- rpcs3/rpcs3qt/main_window.h | 3 --- rpcs3/rpcs3qt/settings_dialog.cpp | 6 +----- rpcs3/stdafx_d3d12.h | 17 ----------------- 5 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 rpcs3/stdafx_d3d12.h diff --git a/rpcs3/Json/tooltips.json b/rpcs3/Json/tooltips.json index e78d90caf7..7ebf77ad2d 100644 --- a/rpcs3/Json/tooltips.json +++ b/rpcs3/Json/tooltips.json @@ -109,11 +109,9 @@ }, "gpu": { "comboboxes": { - "renderBox": "Vulkan is the fastest renderer. OpenGL is the most accurate renderer.\nIf unsure, use Vulkan. Should you have any compatibility issues, fall back to OpenGL.\nDirectX 12 is deprecated and should never be used.", - "renderBox_Linux": "Vulkan is the fastest renderer. OpenGL is the most accurate renderer.\nIf unsure, use Vulkan. Should you have any compatibility issues, fall back to OpenGL.", + "renderBox": "Vulkan is the fastest renderer. OpenGL is the most accurate renderer.\nIf unsure, use Vulkan. Should you have any compatibility issues, fall back to OpenGL.", "resBox": "This setting will be ignored if the Resolution Scale is set to anything other than 100%!\nLeave this on 1280x720, every PS3 game is compatible with this resolution.\nOnly use 1920x1080 if the game supports it.\nRarely due to emulation bugs some games will only render at low resolutions like 480p.", - "graphicsAdapterBox": "On multi GPU systems select which GPU to use in RPCS3 when using Vulkan or DirectX 12.\nThis is not needed when using OpenGL.", - "graphicsAdapterBox_Linux": "On multi GPU systems select which GPU to use in RPCS3 when using Vulkan.\nThis is not needed when using OpenGL.", + "graphicsAdapterBox": "On multi GPU systems select which GPU to use in RPCS3 when using Vulkan.\nThis is not needed when using OpenGL.", "aspectBox": "Leave this on 16:9 unless you have a 4:3 monitor.\nAuto also works well, especially if you use a resolution that is not 720p.", "frameLimitBox": "Off is the best option as it performs faster.\nUsing the frame limiter will add extra overhead and slow down the game.\nHowever, some games will crash if the frame rate is too high.\nIf that happens, set value to anything other than Off.", "antiAliasing": "Emulate PS3 multisampling layout.\nCan fix some otherwise difficult to solve graphics glitches.\nLow to moderate performance hit depending on your GPU hardware.", diff --git a/rpcs3/rpcs3qt/emu_settings.h b/rpcs3/rpcs3qt/emu_settings.h index 9a7a02cfb2..14af28ab6f 100644 --- a/rpcs3/rpcs3qt/emu_settings.h +++ b/rpcs3/rpcs3qt/emu_settings.h @@ -67,7 +67,6 @@ public: LegacyBuffers, GPUTextureScaling, StretchToDisplayArea, - D3D12Adapter, VulkanAdapter, ForceHighpZ, StrictRenderingMode, @@ -170,9 +169,7 @@ public: struct Render_Creator { - bool supportsD3D12 = false; bool supportsVulkan = false; - QStringList D3D12Adapters; QStringList vulkanAdapters; QString name_Null = tr("Disable Video Output"); QString name_Vulkan = tr("Vulkan"); @@ -311,7 +308,6 @@ private: { AnisotropicFilterOverride, { "Video", "Anisotropic Filter Override"}}, { ResolutionScale, { "Video", "Resolution Scale"}}, { MinimumScalableDimension, { "Video", "Minimum Scalable Dimension"}}, - { D3D12Adapter, { "Video", "D3D12", "Adapter"}}, { VulkanAdapter, { "Video", "Vulkan", "Adapter"}}, { VBlankRate, { "Video", "Vblank Rate"}}, diff --git a/rpcs3/rpcs3qt/main_window.h b/rpcs3/rpcs3qt/main_window.h index 6b4d971bf6..4d379be72a 100644 --- a/rpcs3/rpcs3qt/main_window.h +++ b/rpcs3/rpcs3qt/main_window.h @@ -54,9 +54,6 @@ class main_window : public QMainWindow QWinThumbnailToolButton *m_thumb_restart = nullptr; QStringList m_vulkan_adapters; #endif -#ifdef _MSC_VER - QStringList m_d3d12_adapters; -#endif enum drop_type { diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index 28b9467bec..1d004d7f25 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -465,13 +465,9 @@ settings_dialog::settings_dialog(std::shared_ptr guiSettings, std: // Comboboxes xemu_settings->EnhanceComboBox(ui->renderBox, emu_settings::Renderer); -#ifdef WIN32 SubscribeTooltip(ui->renderBox, json_gpu_cbo["renderBox"].toString()); SubscribeTooltip(ui->graphicsAdapterBox, json_gpu_cbo["graphicsAdapterBox"].toString()); -#else - SubscribeTooltip(ui->renderBox, json_gpu_cbo["renderBox_Linux"].toString()); - SubscribeTooltip(ui->graphicsAdapterBox, json_gpu_cbo["graphicsAdapterBox_Linux"].toString()); -#endif + // Change displayed renderer names ui->renderBox->setItemText(ui->renderBox->findData("Null"), render_creator.name_Null); diff --git a/rpcs3/stdafx_d3d12.h b/rpcs3/stdafx_d3d12.h deleted file mode 100644 index 7943cd42b9..0000000000 --- a/rpcs3/stdafx_d3d12.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#ifdef _MSC_VER - -// Must be included first -#include - -#include -#include "Emu/RSX/D3D12/D3D12Utils.h" -#include "Emu/RSX/D3D12/D3D12Formats.h" -#include "Emu/RSX/D3D12/D3D12GSRender.h" - -#pragma comment(lib, "d2d1") -#pragma comment(lib, "DXGI") -#pragma comment(lib, "Dwrite") - -#endif