mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-24 18:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove further occurrences of DirectX 12

Browse Source
This commit is contained in:
Megamouse 2019-10-22 21:57:26 +02:00
parent e04b6cd7c0
commit 2cc71afdcd
5 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpcs3/Json/tooltips.json
View File

@ -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.",

4
rpcs3/rpcs3qt/emu_settings.h
View File

@ -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"}},

3
rpcs3/rpcs3qt/main_window.h
View File

@ -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
{

6
rpcs3/rpcs3qt/settings_dialog.cpp
View File

@ -465,13 +465,9 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> 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);

17
rpcs3/stdafx_d3d12.h
View File

@ -1,17 +0,0 @@
#pragma once
#ifdef _MSC_VER
// Must be included first
#include <d3dcompiler.h>
#include <d3d12.h>
#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