RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 02:32:36 +01:00
Code Issues Releases Wiki Activity

rsx: Make renderdoc compatibility mode a general option

Browse Source
This commit is contained in:
kd-11 2021-04-27 23:13:43 +03:00 committed by kd-11
parent f1a9f6263e
commit 8b0e1d6c03
6 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpcs3/Emu/RSX/GL/GLGSRender.cpp
View File

@ -197,10 +197,10 @@ void GLGSRender::on_init_thread()
{
rsx_log.warning("Forcing use of legacy OpenGL buffers because ARB_buffer_storage is not supported");
// TODO: do not modify config options
g_cfg.video.gl_legacy_buffers.from_string("true");
g_cfg.video.renderdoc_compatiblity.from_string("true");
}
if (g_cfg.video.gl_legacy_buffers)
if (g_cfg.video.renderdoc_compatiblity)
{
rsx_log.warning("Using legacy openGL buffers.");
manually_flush_ring_buffers = true;

2
rpcs3/Emu/system_config.h
View File

@ -136,7 +136,7 @@ struct cfg_root : cfg::node
cfg::_bool vsync{ this, "VSync" };
cfg::_bool debug_output{ this, "Debug output" };
cfg::_bool overlay{ this, "Debug overlay", false, true };
cfg::_bool gl_legacy_buffers{ this, "Use Legacy OpenGL Buffers" };
cfg::_bool renderdoc_compatiblity{ this, "Renderdoc Compatibility Mode" };
cfg::_bool use_gpu_texture_scaling{ this, "Use GPU texture scaling", false };
cfg::_bool stretch_to_display_area{ this, "Stretch To Display Area", false, true };
cfg::_bool force_high_precision_z_buffer{ this, "Force High Precision Z buffer" };

4
rpcs3/rpcs3qt/emu_settings_type.h
View File

@ -54,7 +54,7 @@ enum class emu_settings_type
VSync,
DebugOutput,
DebugOverlay,
LegacyBuffers,
RenderdocCompatibility,
GPUTextureScaling,
StretchToDisplayArea,
VulkanAdapter,
@ -208,7 +208,7 @@ inline static const QMap<emu_settings_type, cfg_location> settings_location =
{ emu_settings_type::VSync, { "Video", "VSync"}},
{ emu_settings_type::DebugOutput, { "Video", "Debug output"}},
{ emu_settings_type::DebugOverlay, { "Video", "Debug overlay"}},
{ emu_settings_type::LegacyBuffers, { "Video", "Use Legacy OpenGL Buffers"}},
{ emu_settings_type::RenderdocCompatibility, { "Video", "Renderdoc Compatibility Mode"}},
{ emu_settings_type::GPUTextureScaling, { "Video", "Use GPU texture scaling"}},
{ emu_settings_type::StretchToDisplayArea, { "Video", "Stretch To Display Area"}},
{ emu_settings_type::ForceHighpZ, { "Video", "Force High Precision Z buffer"}},

7
rpcs3/rpcs3qt/settings_dialog.cpp
View File

@ -660,9 +660,6 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
auto apply_renderer_specific_options = [=, this](const QString& text)
{
// OpenGL-only
ui->glLegacyBuffers->setEnabled(text == r_creator->OpenGL.name);
// Vulkan-only
ui->asyncTextureStreaming->setEnabled(text == r_creator->Vulkan.name);
ui->vulkansched->setEnabled(text == r_creator->Vulkan.name);
@ -1741,8 +1738,8 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
// |___/
// Checkboxes: gpu debug options
m_emu_settings->EnhanceCheckBox(ui->glLegacyBuffers, emu_settings_type::LegacyBuffers);
SubscribeTooltip(ui->glLegacyBuffers, tooltips.settings.gl_legacy_buffers);
m_emu_settings->EnhanceCheckBox(ui->renderdocCompatibility, emu_settings_type::RenderdocCompatibility);
SubscribeTooltip(ui->renderdocCompatibility, tooltips.settings.renderdoc_compatibility);
m_emu_settings->EnhanceCheckBox(ui->forceHighpZ, emu_settings_type::ForceHighpZ);
SubscribeTooltip(ui->forceHighpZ, tooltips.settings.force_high_pz);

8
rpcs3/rpcs3qt/settings_dialog.ui
View File

@ -39,7 +39,7 @@
</sizepolicy>
</property>
<property name="currentIndex">
<number>0</number>
<number>9</number>
</property>
<widget class="QWidget" name="coreTab">
<attribute name="title">
@ -3471,12 +3471,12 @@
</property>
<layout class="QVBoxLayout" name="gb_debug_gpu_layout">
<item alignment="Qt::AlignTop">
<widget class="QCheckBox" name="glLegacyBuffers">
<widget class="QCheckBox" name="renderdocCompatibility">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="text">
<string>Use Legacy OpenGL Buffers</string>
<string>Renderdoc Compatibility Mode</string>
</property>
</widget>
</item>

2
rpcs3/rpcs3qt/tooltips.h
View File

@ -86,7 +86,7 @@ public:
const QString accurate_vector_nan = tr("Forces the floating point NaN (Not A Number) values outputted from PPU vector instructions to be accurate to the real hardware. (0x7FC00000)");
const QString accurate_rsx_access = tr("Forces RSX pauses on SPU MFC_GETLLAR and SPU MFC_PUTLLUC operations.");
const QString hook_static_functions = tr("Allows to hook some functions like 'memcpy' replacing them with high-level implementations. May do nothing or break things. Experimental.");
const QString gl_legacy_buffers = tr("Enables use of classic OpenGL buffers which allows capturing tools to work with RPCS3 e.g RenderDoc.\nIf unsure, don't use this option.");
const QString renderdoc_compatibility = tr("Enables use of classic OpenGL buffers which allows capturing tools to work with RPCS3 e.g RenderDoc.\nAlso allows vulkan to use debug markers for nicer Renderdoc captures.\nIf unsure, don't use this option.");
const QString force_high_pz = tr("Only useful when debugging differences in GPU hardware.\nNot necessary for average users.\nIf unsure, don't use this option.");
const QString debug_output = tr("Enables the selected API's inbuilt debugging functionality.\nWill cause severe performance degradation especially with Vulkan.\nOnly useful to developers.\nIf unsure, don't use this option.");
const QString debug_overlay = tr("Provides a graphical overlay of various debugging information.\nIf unsure, don't use this option.");