summaryrefslogtreecommitdiffstats
path: root/src/citra_qt
diff options
context:
space:
mode:
Diffstat (limited to 'src/citra_qt')
-rw-r--r--src/citra_qt/CMakeLists.txt2
-rw-r--r--src/citra_qt/config.cpp2
-rw-r--r--src/citra_qt/debugger/callstack.cpp8
-rw-r--r--src/citra_qt/debugger/graphics_tracing.cpp6
-rw-r--r--src/citra_qt/debugger/graphics_vertex_shader.cpp2
-rw-r--r--src/citra_qt/debugger/registers.cpp212
-rw-r--r--src/citra_qt/debugger/registers.h12
-rw-r--r--src/citra_qt/main.cpp8
-rw-r--r--src/citra_qt/main.h1
-rw-r--r--src/citra_qt/main.ui9
10 files changed, 207 insertions, 55 deletions
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index 47aaeca24..0c0515054 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -71,7 +71,7 @@ if (APPLE)
else()
add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS})
endif()
-target_link_libraries(citra-qt core common video_core qhexedit)
+target_link_libraries(citra-qt core video_core common qhexedit)
target_link_libraries(citra-qt ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS})
target_link_libraries(citra-qt ${PLATFORM_LIBRARIES})
diff --git a/src/citra_qt/config.cpp b/src/citra_qt/config.cpp
index 5716634ee..a20351fb8 100644
--- a/src/citra_qt/config.cpp
+++ b/src/citra_qt/config.cpp
@@ -44,6 +44,7 @@ void Config::ReadValues() {
qt_config->beginGroup("Renderer");
Settings::values.use_hw_renderer = qt_config->value("use_hw_renderer", false).toBool();
+ Settings::values.use_shader_jit = qt_config->value("use_shader_jit", true).toBool();
Settings::values.bg_red = qt_config->value("bg_red", 1.0).toFloat();
Settings::values.bg_green = qt_config->value("bg_green", 1.0).toFloat();
@@ -77,6 +78,7 @@ void Config::SaveValues() {
qt_config->beginGroup("Renderer");
qt_config->setValue("use_hw_renderer", Settings::values.use_hw_renderer);
+ qt_config->setValue("use_shader_jit", Settings::values.use_shader_jit);
// Cast to double because Qt's written float values are not human-readable
qt_config->setValue("bg_red", (double)Settings::values.bg_red);
diff --git a/src/citra_qt/debugger/callstack.cpp b/src/citra_qt/debugger/callstack.cpp
index 6799ce844..e97e81b65 100644
--- a/src/citra_qt/debugger/callstack.cpp
+++ b/src/citra_qt/debugger/callstack.cpp
@@ -4,12 +4,14 @@
#include <QStandardItemModel>
+#include "common/common_types.h"
+#include "common/symbols.h"
+
#include "callstack.h"
#include "core/core.h"
#include "core/arm/arm_interface.h"
#include "core/memory.h"
-#include "common/symbols.h"
#include "core/arm/disassembler/arm_disasm.h"
CallstackWidget::CallstackWidget(QWidget* parent): QDockWidget(parent)
@@ -49,8 +51,8 @@ void CallstackWidget::OnDebugModeEntered()
{
std::string name;
// ripped from disasm
- uint8_t cond = (insn >> 28) & 0xf;
- uint32_t i_offset = insn & 0xffffff;
+ u8 cond = (insn >> 28) & 0xf;
+ u32 i_offset = insn & 0xffffff;
// Sign-extend the 24-bit offset
if ((i_offset >> 23) & 1)
i_offset |= 0xff000000;
diff --git a/src/citra_qt/debugger/graphics_tracing.cpp b/src/citra_qt/debugger/graphics_tracing.cpp
index 3f20f149d..f80cb7493 100644
--- a/src/citra_qt/debugger/graphics_tracing.cpp
+++ b/src/citra_qt/debugger/graphics_tracing.cpp
@@ -14,6 +14,8 @@
#include <boost/range/algorithm/copy.hpp>
+#include "common/common_types.h"
+
#include "core/hw/gpu.h"
#include "core/hw/lcd.h"
@@ -66,14 +68,14 @@ void GraphicsTracingWidget::StartRecording() {
// Encode floating point numbers to 24-bit values
// TODO: Drop this explicit conversion once we store float24 values bit-correctly internally.
- std::array<uint32_t, 4 * 16> default_attributes;
+ std::array<u32, 4 * 16> default_attributes;
for (unsigned i = 0; i < 16; ++i) {
for (unsigned comp = 0; comp < 3; ++comp) {
default_attributes[4 * i + comp] = nihstro::to_float24(Pica::g_state.vs.default_attributes[i][comp].ToFloat32());
}
}
- std::array<uint32_t, 4 * 96> vs_float_uniforms;
+ std::array<u32, 4 * 96> vs_float_uniforms;
for (unsigned i = 0; i < 96; ++i)
for (unsigned comp = 0; comp < 3; ++comp)
vs_float_uniforms[4 * i + comp] = nihstro::to_float24(Pica::g_state.vs.uniforms.f[i][comp].ToFloat32());
diff --git a/src/citra_qt/debugger/graphics_vertex_shader.cpp b/src/citra_qt/debugger/graphics_vertex_shader.cpp
index f42a2f4ce..302e22d7a 100644
--- a/src/citra_qt/debugger/graphics_vertex_shader.cpp
+++ b/src/citra_qt/debugger/graphics_vertex_shader.cpp
@@ -8,7 +8,7 @@
#include <QBoxLayout>
#include <QTreeView>
-#include "video_core/vertex_shader.h"
+#include "video_core/shader/shader_interpreter.h"
#include "graphics_vertex_shader.h"
diff --git a/src/citra_qt/debugger/registers.cpp b/src/citra_qt/debugger/registers.cpp
index 5527a2afd..4174b3945 100644
--- a/src/citra_qt/debugger/registers.cpp
+++ b/src/citra_qt/debugger/registers.cpp
@@ -11,32 +11,23 @@ RegistersWidget::RegistersWidget(QWidget* parent) : QDockWidget(parent) {
cpu_regs_ui.setupUi(this);
tree = cpu_regs_ui.treeWidget;
- tree->addTopLevelItem(registers = new QTreeWidgetItem(QStringList("Registers")));
- tree->addTopLevelItem(CSPR = new QTreeWidgetItem(QStringList("CSPR")));
-
- registers->setExpanded(true);
- CSPR->setExpanded(true);
+ tree->addTopLevelItem(core_registers = new QTreeWidgetItem(QStringList(tr("Registers"))));
+ tree->addTopLevelItem(vfp_registers = new QTreeWidgetItem(QStringList(tr("VFP Registers"))));
+ tree->addTopLevelItem(vfp_system_registers = new QTreeWidgetItem(QStringList(tr("VFP System Registers"))));
+ tree->addTopLevelItem(cpsr = new QTreeWidgetItem(QStringList("CPSR")));
for (int i = 0; i < 16; ++i) {
- QTreeWidgetItem* child = new QTreeWidgetItem(QStringList(QString("R[%1]").arg(i, 2, 10, QLatin1Char('0'))));
- registers->addChild(child);
+ QTreeWidgetItem* child = new QTreeWidgetItem(QStringList(QString("R[%1]").arg(i)));
+ core_registers->addChild(child);
+ }
+
+ for (int i = 0; i < 32; ++i) {
+ QTreeWidgetItem* child = new QTreeWidgetItem(QStringList(QString("S[%1]").arg(i)));
+ vfp_registers->addChild(child);
}
- CSPR->addChild(new QTreeWidgetItem(QStringList("M")));
- CSPR->addChild(new QTreeWidgetItem(QStringList("T")));
- CSPR->addChild(new QTreeWidgetItem(QStringList("F")));
- CSPR->addChild(new QTreeWidgetItem(QStringList("I")));
- CSPR->addChild(new QTreeWidgetItem(QStringList("A")));
- CSPR->addChild(new QTreeWidgetItem(QStringList("E")));
- CSPR->addChild(new QTreeWidgetItem(QStringList("IT")));
- CSPR->addChild(new QTreeWidgetItem(QStringList("GE")));
- CSPR->addChild(new QTreeWidgetItem(QStringList("DNM")));
- CSPR->addChild(new QTreeWidgetItem(QStringList("J")));
- CSPR->addChild(new QTreeWidgetItem(QStringList("Q")));
- CSPR->addChild(new QTreeWidgetItem(QStringList("V")));
- CSPR->addChild(new QTreeWidgetItem(QStringList("C")));
- CSPR->addChild(new QTreeWidgetItem(QStringList("Z")));
- CSPR->addChild(new QTreeWidgetItem(QStringList("N")));
+ CreateCPSRChildren();
+ CreateVFPSystemRegisterChildren();
setEnabled(false);
}
@@ -47,25 +38,14 @@ void RegistersWidget::OnDebugModeEntered() {
if (app_core == nullptr)
return;
- for (int i = 0; i < 16; ++i)
- registers->child(i)->setText(1, QString("0x%1").arg(app_core->GetReg(i), 8, 16, QLatin1Char('0')));
-
- CSPR->setText(1, QString("0x%1").arg(app_core->GetCPSR(), 8, 16, QLatin1Char('0')));
- CSPR->child(0)->setText(1, QString("b%1").arg(app_core->GetCPSR() & 0x1F, 5, 2, QLatin1Char('0'))); // M - Mode
- CSPR->child(1)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 5) & 0x1)); // T - State
- CSPR->child(2)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 6) & 0x1)); // F - FIQ disable
- CSPR->child(3)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 7) & 0x1)); // I - IRQ disable
- CSPR->child(4)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 8) & 0x1)); // A - Imprecise abort
- CSPR->child(5)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 9) & 0x1)); // E - Data endianess
- CSPR->child(6)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 10) & 0x3F)); // IT - If-Then state (DNM)
- CSPR->child(7)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 16) & 0xF)); // GE - Greater-than-or-Equal
- CSPR->child(8)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 20) & 0xF)); // DNM - Do not modify
- CSPR->child(9)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 24) & 0x1)); // J - Java state
- CSPR->child(10)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 27) & 0x1)); // Q - Sticky overflow
- CSPR->child(11)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 28) & 0x1)); // V - Overflow
- CSPR->child(12)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 29) & 0x1)); // C - Carry/Borrow/Extend
- CSPR->child(13)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 30) & 0x1)); // Z - Zero
- CSPR->child(14)->setText(1, QString("%1").arg((app_core->GetCPSR() >> 31) & 0x1)); // N - Negative/Less than
+ for (int i = 0; i < core_registers->childCount(); ++i)
+ core_registers->child(i)->setText(1, QString("0x%1").arg(app_core->GetReg(i), 8, 16, QLatin1Char('0')));
+
+ for (int i = 0; i < vfp_registers->childCount(); ++i)
+ vfp_registers->child(i)->setText(1, QString("0x%1").arg(app_core->GetVFPReg(i), 8, 16, QLatin1Char('0')));
+
+ UpdateCPSRValues();
+ UpdateVFPSystemRegisterValues();
}
void RegistersWidget::OnDebugModeLeft() {
@@ -77,13 +57,153 @@ void RegistersWidget::OnEmulationStarting(EmuThread* emu_thread) {
void RegistersWidget::OnEmulationStopping() {
// Reset widget text
- for (int i = 0; i < 16; ++i)
- registers->child(i)->setText(1, QString(""));
+ for (int i = 0; i < core_registers->childCount(); ++i)
+ core_registers->child(i)->setText(1, QString(""));
+
+ for (int i = 0; i < vfp_registers->childCount(); ++i)
+ vfp_registers->child(i)->setText(1, QString(""));
+
+ for (int i = 0; i < cpsr->childCount(); ++i)
+ cpsr->child(i)->setText(1, QString(""));
+
+ cpsr->setText(1, QString(""));
+
+ // FPSCR
+ for (int i = 0; i < vfp_system_registers->child(0)->childCount(); ++i)
+ vfp_system_registers->child(0)->child(i)->setText(1, QString(""));
- for (int i = 0; i < 15; ++i)
- CSPR->child(i)->setText(1, QString(""));
+ // FPEXC
+ for (int i = 0; i < vfp_system_registers->child(1)->childCount(); ++i)
+ vfp_system_registers->child(1)->child(i)->setText(1, QString(""));
- CSPR->setText(1, QString(""));
+ vfp_system_registers->child(0)->setText(1, QString(""));
+ vfp_system_registers->child(1)->setText(1, QString(""));
+ vfp_system_registers->child(2)->setText(1, QString(""));
+ vfp_system_registers->child(3)->setText(1, QString(""));
setEnabled(false);
}
+
+void RegistersWidget::CreateCPSRChildren() {
+ cpsr->addChild(new QTreeWidgetItem(QStringList("M")));
+ cpsr->addChild(new QTreeWidgetItem(QStringList("T")));
+ cpsr->addChild(new QTreeWidgetItem(QStringList("F")));
+ cpsr->addChild(new QTreeWidgetItem(QStringList("I")));
+ cpsr->addChild(new QTreeWidgetItem(QStringList("A")));
+ cpsr->addChild(new QTreeWidgetItem(QStringList("E")));
+ cpsr->addChild(new QTreeWidgetItem(QStringList("IT")));
+ cpsr->addChild(new QTreeWidgetItem(QStringList("GE")));
+ cpsr->addChild(new QTreeWidgetItem(QStringList("DNM")));
+ cpsr->addChild(new QTreeWidgetItem(QStringList("J")));
+ cpsr->addChild(new QTreeWidgetItem(QStringList("Q")));
+ cpsr->addChild(new QTreeWidgetItem(QStringList("V")));
+ cpsr->addChild(new QTreeWidgetItem(QStringList("C")));
+ cpsr->addChild(new QTreeWidgetItem(QStringList("Z")));
+ cpsr->addChild(new QTreeWidgetItem(QStringList("N")));
+}
+
+void RegistersWidget::UpdateCPSRValues() {
+ const u32 cpsr_val = Core::g_app_core->GetCPSR();
+
+ cpsr->setText(1, QString("0x%1").arg(cpsr_val, 8, 16, QLatin1Char('0')));
+ cpsr->child(0)->setText(1, QString("b%1").arg(cpsr_val & 0x1F, 5, 2, QLatin1Char('0'))); // M - Mode
+ cpsr->child(1)->setText(1, QString::number((cpsr_val >> 5) & 1)); // T - State
+ cpsr->child(2)->setText(1, QString::number((cpsr_val >> 6) & 1)); // F - FIQ disable
+ cpsr->child(3)->setText(1, QString::number((cpsr_val >> 7) & 1)); // I - IRQ disable
+ cpsr->child(4)->setText(1, QString::number((cpsr_val >> 8) & 1)); // A - Imprecise abort
+ cpsr->child(5)->setText(1, QString::number((cpsr_val >> 9) & 1)); // E - Data endianess
+ cpsr->child(6)->setText(1, QString::number((cpsr_val >> 10) & 0x3F)); // IT - If-Then state (DNM)
+ cpsr->child(7)->setText(1, QString::number((cpsr_val >> 16) & 0xF)); // GE - Greater-than-or-Equal
+ cpsr->child(8)->setText(1, QString::number((cpsr_val >> 20) & 0xF)); // DNM - Do not modify
+ cpsr->child(9)->setText(1, QString::number((cpsr_val >> 24) & 1)); // J - Jazelle
+ cpsr->child(10)->setText(1, QString::number((cpsr_val >> 27) & 1)); // Q - Saturation
+ cpsr->child(11)->setText(1, QString::number((cpsr_val >> 28) & 1)); // V - Overflow
+ cpsr->child(12)->setText(1, QString::number((cpsr_val >> 29) & 1)); // C - Carry/Borrow/Extend
+ cpsr->child(13)->setText(1, QString::number((cpsr_val >> 30) & 1)); // Z - Zero
+ cpsr->child(14)->setText(1, QString::number((cpsr_val >> 31) & 1)); // N - Negative/Less than
+}
+
+void RegistersWidget::CreateVFPSystemRegisterChildren() {
+ QTreeWidgetItem* const fpscr = new QTreeWidgetItem(QStringList("FPSCR"));
+ fpscr->addChild(new QTreeWidgetItem(QStringList("IOC")));
+ fpscr->addChild(new QTreeWidgetItem(QStringList("DZC")));
+ fpscr->addChild(new QTreeWidgetItem(QStringList("OFC")));
+ fpscr->addChild(new QTreeWidgetItem(QStringList("UFC")));
+ fpscr->addChild(new QTreeWidgetItem(QStringList("IXC")));
+ fpscr->addChild(new QTreeWidgetItem(QStringList("IDC")));
+ fpscr->addChild(new QTreeWidgetItem(QStringList("IOE")));
+ fpscr->addChild(new QTreeWidgetItem(QStringList("DZE")));
+ fpscr->addChild(new QTreeWidgetItem(QStringList("OFE")));
+ fpscr->addChild(new QTreeWidgetItem(QStringList("UFE")));
+ fpscr->addChild(new QTreeWidgetItem(QStringList("IXE")));
+ fpscr->addChild(new QTreeWidgetItem(QStringList("IDE")));
+ fpscr->addChild(new QTreeWidgetItem(QStringList(tr("Vector Length"))));
+ fpscr->addChild(new QTreeWidgetItem(QStringList(tr("Vector Stride"))));
+ fpscr->addChild(new QTreeWidgetItem(QStringList(tr("Rounding Mode"))));
+ fpscr->addChild(new QTreeWidgetItem(QStringList("FZ")));
+ fpscr->addChild(new QTreeWidgetItem(QStringList("DN")));
+ fpscr->addChild(new QTreeWidgetItem(QStringList("V")));
+ fpscr->addChild(new QTreeWidgetItem(QStringList("C")));
+ fpscr->addChild(new QTreeWidgetItem(QStringList("Z")));
+ fpscr->addChild(new QTreeWidgetItem(QStringList("N")));
+
+ QTreeWidgetItem* const fpexc = new QTreeWidgetItem(QStringList("FPEXC"));
+ fpexc->addChild(new QTreeWidgetItem(QStringList("IOC")));
+ fpexc->addChild(new QTreeWidgetItem(QStringList("OFC")));
+ fpexc->addChild(new QTreeWidgetItem(QStringList("UFC")));
+ fpexc->addChild(new QTreeWidgetItem(QStringList("INV")));
+ fpexc->addChild(new QTreeWidgetItem(QStringList(tr("Vector Iteration Count"))));
+ fpexc->addChild(new QTreeWidgetItem(QStringList("FP2V")));
+ fpexc->addChild(new QTreeWidgetItem(QStringList("EN")));
+ fpexc->addChild(new QTreeWidgetItem(QStringList("EX")));
+
+ vfp_system_registers->addChild(fpscr);
+ vfp_system_registers->addChild(fpexc);
+ vfp_system_registers->addChild(new QTreeWidgetItem(QStringList("FPINST")));
+ vfp_system_registers->addChild(new QTreeWidgetItem(QStringList("FPINST2")));
+}
+
+void RegistersWidget::UpdateVFPSystemRegisterValues() {
+ const u32 fpscr_val = Core::g_app_core->GetVFPSystemReg(VFP_FPSCR);
+ const u32 fpexc_val = Core::g_app_core->GetVFPSystemReg(VFP_FPEXC);
+ const u32 fpinst_val = Core::g_app_core->GetVFPSystemReg(VFP_FPINST);
+ const u32 fpinst2_val = Core::g_app_core->GetVFPSystemReg(VFP_FPINST2);
+
+ QTreeWidgetItem* const fpscr = vfp_system_registers->child(0);
+ fpscr->setText(1, QString("0x%1").arg(fpscr_val, 8, 16, QLatin1Char('0')));
+ fpscr->child(0)->setText(1, QString::number(fpscr_val & 1));
+ fpscr->child(1)->setText(1, QString::number((fpscr_val >> 1) & 1));
+ fpscr->child(2)->setText(1, QString::number((fpscr_val >> 2) & 1));
+ fpscr->child(3)->setText(1, QString::number((fpscr_val >> 3) & 1));
+ fpscr->child(4)->setText(1, QString::number((fpscr_val >> 4) & 1));
+ fpscr->child(5)->setText(1, QString::number((fpscr_val >> 7) & 1));
+ fpscr->child(6)->setText(1, QString::number((fpscr_val >> 8) & 1));
+ fpscr->child(7)->setText(1, QString::number((fpscr_val >> 9) & 1));
+ fpscr->child(8)->setText(1, QString::number((fpscr_val >> 10) & 1));
+ fpscr->child(9)->setText(1, QString::number((fpscr_val >> 11) & 1));
+ fpscr->child(10)->setText(1, QString::number((fpscr_val >> 12) & 1));
+ fpscr->child(11)->setText(1, QString::number((fpscr_val >> 15) & 1));
+ fpscr->child(12)->setText(1, QString("b%1").arg((fpscr_val >> 16) & 7, 3, 2, QLatin1Char('0')));
+ fpscr->child(13)->setText(1, QString("b%1").arg((fpscr_val >> 20) & 3, 2, 2, QLatin1Char('0')));
+ fpscr->child(14)->setText(1, QString("b%1").arg((fpscr_val >> 22) & 3, 2, 2, QLatin1Char('0')));
+ fpscr->child(15)->setText(1, QString::number((fpscr_val >> 24) & 1));
+ fpscr->child(16)->setText(1, QString::number((fpscr_val >> 25) & 1));
+ fpscr->child(17)->setText(1, QString::number((fpscr_val >> 28) & 1));
+ fpscr->child(18)->setText(1, QString::number((fpscr_val >> 29) & 1));
+ fpscr->child(19)->setText(1, QString::number((fpscr_val >> 30) & 1));
+ fpscr->child(20)->setText(1, QString::number((fpscr_val >> 31) & 1));
+
+ QTreeWidgetItem* const fpexc = vfp_system_registers->child(1);
+ fpexc->setText(1, QString("0x%1").arg(fpexc_val, 8, 16, QLatin1Char('0')));
+ fpexc->child(0)->setText(1, QString::number(fpexc_val & 1));
+ fpexc->child(1)->setText(1, QString::number((fpexc_val >> 2) & 1));
+ fpexc->child(2)->setText(1, QString::number((fpexc_val >> 3) & 1));
+ fpexc->child(3)->setText(1, QString::number((fpexc_val >> 7) & 1));
+ fpexc->child(4)->setText(1, QString("b%1").arg((fpexc_val >> 8) & 7, 3, 2, QLatin1Char('0')));
+ fpexc->child(5)->setText(1, QString::number((fpexc_val >> 28) & 1));
+ fpexc->child(6)->setText(1, QString::number((fpexc_val >> 30) & 1));
+ fpexc->child(7)->setText(1, QString::number((fpexc_val >> 31) & 1));
+
+ vfp_system_registers->child(2)->setText(1, QString("0x%1").arg(fpinst_val, 8, 16, QLatin1Char('0')));
+ vfp_system_registers->child(3)->setText(1, QString("0x%1").arg(fpinst2_val, 8, 16, QLatin1Char('0')));
+}
diff --git a/src/citra_qt/debugger/registers.h b/src/citra_qt/debugger/registers.h
index 68e3fb908..09b830e80 100644
--- a/src/citra_qt/debugger/registers.h
+++ b/src/citra_qt/debugger/registers.h
@@ -25,10 +25,18 @@ public slots:
void OnEmulationStopping();
private:
+ void CreateCPSRChildren();
+ void UpdateCPSRValues();
+
+ void CreateVFPSystemRegisterChildren();
+ void UpdateVFPSystemRegisterValues();
+
Ui::ARMRegisters cpu_regs_ui;
QTreeWidget* tree;
- QTreeWidgetItem* registers;
- QTreeWidgetItem* CSPR;
+ QTreeWidgetItem* core_registers;
+ QTreeWidgetItem* vfp_registers;
+ QTreeWidgetItem* vfp_system_registers;
+ QTreeWidgetItem* cpsr;
};
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 6e50de2ec..a1a4865bd 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -132,6 +132,9 @@ GMainWindow::GMainWindow() : emu_thread(nullptr)
ui.action_Use_Hardware_Renderer->setChecked(Settings::values.use_hw_renderer);
SetHardwareRendererEnabled(ui.action_Use_Hardware_Renderer->isChecked());
+ ui.action_Use_Shader_JIT->setChecked(Settings::values.use_shader_jit);
+ SetShaderJITEnabled(ui.action_Use_Shader_JIT->isChecked());
+
ui.action_Single_Window_Mode->setChecked(settings.value("singleWindowMode", true).toBool());
ToggleWindowMode();
@@ -155,6 +158,7 @@ GMainWindow::GMainWindow() : emu_thread(nullptr)
connect(ui.action_Pause, SIGNAL(triggered()), this, SLOT(OnPauseGame()));
connect(ui.action_Stop, SIGNAL(triggered()), this, SLOT(OnStopGame()));
connect(ui.action_Use_Hardware_Renderer, SIGNAL(triggered(bool)), this, SLOT(SetHardwareRendererEnabled(bool)));
+ connect(ui.action_Use_Shader_JIT, SIGNAL(triggered(bool)), this, SLOT(SetShaderJITEnabled(bool)));
connect(ui.action_Single_Window_Mode, SIGNAL(triggered(bool)), this, SLOT(ToggleWindowMode()));
connect(ui.action_Hotkeys, SIGNAL(triggered()), this, SLOT(OnOpenHotkeysDialog()));
@@ -393,6 +397,10 @@ void GMainWindow::SetHardwareRendererEnabled(bool enabled) {
VideoCore::g_hw_renderer_enabled = enabled;
}
+void GMainWindow::SetShaderJITEnabled(bool enabled) {
+ VideoCore::g_shader_jit_enabled = enabled;
+}
+
void GMainWindow::ToggleWindowMode() {
if (ui.action_Single_Window_Mode->isChecked()) {
// Render in the main window...
diff --git a/src/citra_qt/main.h b/src/citra_qt/main.h
index 215e7c87d..4b260ae8b 100644
--- a/src/citra_qt/main.h
+++ b/src/citra_qt/main.h
@@ -75,6 +75,7 @@ private slots:
void OnConfigure();
void OnDisplayTitleBars(bool);
void SetHardwareRendererEnabled(bool);
+ void SetShaderJITEnabled(bool);
void ToggleWindowMode();
private:
diff --git a/src/citra_qt/main.ui b/src/citra_qt/main.ui
index ba293d0bb..1ba700a3a 100644
--- a/src/citra_qt/main.ui
+++ b/src/citra_qt/main.ui
@@ -73,6 +73,7 @@
<addaction name="action_Stop"/>
<addaction name="separator"/>
<addaction name="action_Use_Hardware_Renderer"/>
+ <addaction name="action_Use_Shader_JIT"/>
<addaction name="action_Configure"/>
</widget>
<widget class="QMenu" name="menu_View">
@@ -160,6 +161,14 @@
<string>Use Hardware Renderer</string>
</property>
</action>
+ <action name="action_Use_Shader_JIT">
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>Use Shader JIT</string>
+ </property>
+ </action>
<action name="action_Configure">
<property name="text">
<string>Configure ...</string>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-04 08:45:51 +0200