summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/citra_qt/debugger/graphics_tracing.cpp8
-rw-r--r--src/core/CMakeLists.txt2
-rw-r--r--src/core/tracer/citrace.h (renamed from src/core/tracer/tracer.h)5
-rw-r--r--src/core/tracer/recorder.cpp70
-rw-r--r--src/core/tracer/recorder.h23
5 files changed, 65 insertions, 43 deletions
diff --git a/src/citra_qt/debugger/graphics_tracing.cpp b/src/citra_qt/debugger/graphics_tracing.cpp
index eac405820..3e88346c0 100644
--- a/src/citra_qt/debugger/graphics_tracing.cpp
+++ b/src/citra_qt/debugger/graphics_tracing.cpp
@@ -62,12 +62,20 @@ 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<Math::Vec4<uint32_t>, 16> default_attributes;
+ for (unsigned i = 0; i < 16; ++i) {
+ for (unsigned comp = 0; comp < 3; ++comp) {
+ default_attributes[i][comp] = nihstro::to_float24(Pica::g_state.vs.default_attributes[i][comp].ToFloat32());
+ }
+ }
+
std::array<Math::Vec4<uint32_t>, 96> vs_float_uniforms;
for (unsigned i = 0; i < 96; ++i)
for (unsigned comp = 0; comp < 3; ++comp)
vs_float_uniforms[i][comp] = nihstro::to_float24(Pica::g_state.vs.uniforms.f[i][comp].ToFloat32());
auto recorder = new CiTrace::Recorder((u32*)&GPU::g_regs, 0x700, nullptr, 0, (u32*)&Pica::g_state.regs, 0x300,
+ (u32*)default_attributes.data(), default_attributes.size() * 4,
shader_binary.data(), shader_binary.size(),
swizzle_data.data(), swizzle_data.size(),
(u32*)vs_float_uniforms.data(), vs_float_uniforms.size() * 4,
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 5066eb258..8267ee586 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -245,7 +245,7 @@ set(HEADERS
loader/loader.h
loader/ncch.h
tracer/recorder.h
- tracer/tracer.h
+ tracer/citrace.h
mem_map.h
memory.h
memory_setup.h
diff --git a/src/core/tracer/tracer.h b/src/core/tracer/citrace.h
index 1545d7439..5deb6ce9e 100644
--- a/src/core/tracer/tracer.h
+++ b/src/core/tracer/citrace.h
@@ -35,6 +35,8 @@ struct CTHeader {
uint32_t lcd_registers_size;
uint32_t pica_registers;
uint32_t pica_registers_size;
+ uint32_t default_attributes;
+ uint32_t default_attributes_size;
uint32_t vs_program_binary;
uint32_t vs_program_binary_size;
uint32_t vs_swizzle_data;
@@ -50,7 +52,8 @@ struct CTHeader {
// Other things we might want to store here:
// - Initial framebuffer data, maybe even a full copy of FCRAM/VRAM
- // - Default vertex attributes
+ // - Lookup tables for fragment lighting
+ // - Lookup tables for procedural textures
} initial_state_offsets;
uint32_t stream_offset;
diff --git a/src/core/tracer/recorder.cpp b/src/core/tracer/recorder.cpp
index 73ebdd388..c5251634b 100644
--- a/src/core/tracer/recorder.cpp
+++ b/src/core/tracer/recorder.cpp
@@ -12,18 +12,20 @@
namespace CiTrace {
-Recorder::Recorder(u32* gpu_registers, u32 gpu_registers_size,
- u32* lcd_registers, u32 lcd_registers_size,
- u32* pica_registers, u32 pica_registers_size,
- u32* vs_program_binary, u32 vs_program_binary_size,
- u32* vs_swizzle_data, u32 vs_swizzle_data_size,
- u32* vs_float_uniforms, u32 vs_float_uniforms_size,
- u32* gs_program_binary, u32 gs_program_binary_size,
- u32* gs_swizzle_data, u32 gs_swizzle_data_size,
- u32* gs_float_uniforms, u32 gs_float_uniforms_size)
+Recorder::Recorder(u32* gpu_registers, u32 gpu_registers_size,
+ u32* lcd_registers, u32 lcd_registers_size,
+ u32* pica_registers, u32 pica_registers_size,
+ u32* default_attributes, u32 default_attributes_size,
+ u32* vs_program_binary, u32 vs_program_binary_size,
+ u32* vs_swizzle_data, u32 vs_swizzle_data_size,
+ u32* vs_float_uniforms, u32 vs_float_uniforms_size,
+ u32* gs_program_binary, u32 gs_program_binary_size,
+ u32* gs_swizzle_data, u32 gs_swizzle_data_size,
+ u32* gs_float_uniforms, u32 gs_float_uniforms_size)
: gpu_registers(gpu_registers, gpu_registers + gpu_registers_size),
lcd_registers(lcd_registers, lcd_registers + lcd_registers_size),
pica_registers(pica_registers, pica_registers + pica_registers_size),
+ default_attributes(default_attributes, default_attributes + default_attributes_size),
vs_program_binary(vs_program_binary, vs_program_binary + vs_program_binary_size),
vs_swizzle_data(vs_swizzle_data, vs_swizzle_data + vs_swizzle_data_size),
vs_float_uniforms(vs_float_uniforms, vs_float_uniforms + vs_float_uniforms_size),
@@ -43,27 +45,29 @@ void Recorder::Finish(const std::string& filename) {
// Calculate file offsets
auto& initial = header.initial_state_offsets;
- initial.gpu_registers_size = gpu_registers.size();
- initial.lcd_registers_size = lcd_registers.size();
- initial.pica_registers_size = pica_registers.size();
- initial.vs_program_binary_size = vs_program_binary.size();
- initial.vs_swizzle_data_size = vs_swizzle_data.size();
- initial.vs_float_uniforms_size = vs_float_uniforms.size();
- initial.gs_program_binary_size = gs_program_binary.size();
- initial.gs_swizzle_data_size = gs_swizzle_data.size();
- initial.gs_float_uniforms_size = gs_float_uniforms.size();
- header.stream_size = stream.size();
-
- initial.gpu_registers = sizeof(header);
- initial.lcd_registers = initial.gpu_registers + initial.gpu_registers_size * sizeof(u32);
- initial.pica_registers = initial.lcd_registers + initial.lcd_registers_size * sizeof(u32);;
- initial.vs_program_binary = initial.pica_registers + initial.pica_registers_size * sizeof(u32);
- initial.vs_swizzle_data = initial.vs_program_binary + initial.vs_program_binary_size * sizeof(u32);
- initial.vs_float_uniforms = initial.vs_swizzle_data + initial.vs_swizzle_data_size * sizeof(u32);
- initial.gs_program_binary = initial.vs_float_uniforms + initial.vs_float_uniforms_size * sizeof(u32);
- initial.gs_swizzle_data = initial.gs_program_binary + initial.gs_program_binary_size * sizeof(u32);
- initial.gs_float_uniforms = initial.gs_swizzle_data + initial.gs_swizzle_data_size * sizeof(u32);
- header.stream_offset = initial.gs_float_uniforms + initial.gs_float_uniforms_size * sizeof(u32);
+ initial.gpu_registers_size = gpu_registers.size();
+ initial.lcd_registers_size = lcd_registers.size();
+ initial.pica_registers_size = pica_registers.size();
+ initial.default_attributes_size = default_attributes.size();
+ initial.vs_program_binary_size = vs_program_binary.size();
+ initial.vs_swizzle_data_size = vs_swizzle_data.size();
+ initial.vs_float_uniforms_size = vs_float_uniforms.size();
+ initial.gs_program_binary_size = gs_program_binary.size();
+ initial.gs_swizzle_data_size = gs_swizzle_data.size();
+ initial.gs_float_uniforms_size = gs_float_uniforms.size();
+ header.stream_size = stream.size();
+
+ initial.gpu_registers = sizeof(header);
+ initial.lcd_registers = initial.gpu_registers + initial.gpu_registers_size * sizeof(u32);
+ initial.pica_registers = initial.lcd_registers + initial.lcd_registers_size * sizeof(u32);;
+ initial.default_attributes = initial.pica_registers + initial.pica_registers_size * sizeof(u32);
+ initial.vs_program_binary = initial.default_attributes + initial.default_attributes_size * sizeof(u32);
+ initial.vs_swizzle_data = initial.vs_program_binary + initial.vs_program_binary_size * sizeof(u32);
+ initial.vs_float_uniforms = initial.vs_swizzle_data + initial.vs_swizzle_data_size * sizeof(u32);
+ initial.gs_program_binary = initial.vs_float_uniforms + initial.vs_float_uniforms_size * sizeof(u32);
+ initial.gs_swizzle_data = initial.gs_program_binary + initial.gs_program_binary_size * sizeof(u32);
+ initial.gs_float_uniforms = initial.gs_swizzle_data + initial.gs_swizzle_data_size * sizeof(u32);
+ header.stream_offset = initial.gs_float_uniforms + initial.gs_float_uniforms_size * sizeof(u32);
// Iterate through stream elements, update relevant stream element data
for (auto& stream_element : stream) {
@@ -103,9 +107,13 @@ void Recorder::Finish(const std::string& filename) {
throw "Failed to write LCD registers";
written = file.WriteArray(pica_registers.data(), pica_registers.size());
- if (written != pica_registers.size() || file.Tell() != initial.vs_program_binary)
+ if (written != pica_registers.size() || file.Tell() != initial.default_attributes)
throw "Failed to write Pica registers";
+ written = file.WriteArray(default_attributes.data(), default_attributes.size());
+ if (written != default_attributes.size() || file.Tell() != initial.vs_program_binary)
+ throw "Failed to write default vertex attributes";
+
written = file.WriteArray(vs_program_binary.data(), vs_program_binary.size());
if (written != vs_program_binary.size() || file.Tell() != initial.vs_swizzle_data)
throw "Failed to write vertex shader program binary";
diff --git a/src/core/tracer/recorder.h b/src/core/tracer/recorder.h
index 8fec0a971..da77aac56 100644
--- a/src/core/tracer/recorder.h
+++ b/src/core/tracer/recorder.h
@@ -11,7 +11,7 @@
#include "common/common_types.h"
-#include "tracer.h"
+#include "citrace.h"
namespace CiTrace {
@@ -19,17 +19,19 @@ class Recorder {
public:
/**
* Recorder constructor
+ * @param default_attributes Pointer to an array of 32-bit-aligned 24-bit floating point values.
* @param vs_float_uniforms Pointer to an array of 32-bit-aligned 24-bit floating point values.
*/
- Recorder(u32* gpu_registers, u32 gpu_registers_size,
- u32* lcd_registers, u32 lcd_registers_size,
- u32* pica_registers, u32 pica_registers_size,
- u32* vs_program_binary, u32 vs_program_binary_size,
- u32* vs_swizzle_data, u32 vs_swizzle_data_size,
- u32* vs_float_uniforms, u32 vs_float_uniforms_size,
- u32* gs_program_binary, u32 gs_program_binary_size,
- u32* gs_swizzle_data, u32 gs_swizzle_data_size,
- u32* gs_float_uniforms, u32 gs_float_uniforms_size);
+ Recorder(u32* gpu_registers, u32 gpu_registers_size,
+ u32* lcd_registers, u32 lcd_registers_size,
+ u32* pica_registers, u32 pica_registers_size,
+ u32* default_attributes, u32 default_attributes_size,
+ u32* vs_program_binary, u32 vs_program_binary_size,
+ u32* vs_swizzle_data, u32 vs_swizzle_data_size,
+ u32* vs_float_uniforms, u32 vs_float_uniforms_size,
+ u32* gs_program_binary, u32 gs_program_binary_size,
+ u32* gs_swizzle_data, u32 gs_swizzle_data_size,
+ u32* gs_float_uniforms, u32 gs_float_uniforms_size);
/// Finish recording of this Citrace and save it using the given filename.
void Finish(const std::string& filename);
@@ -56,6 +58,7 @@ private:
std::vector<u32> gpu_registers;
std::vector<u32> lcd_registers;
std::vector<u32> pica_registers;
+ std::vector<u32> default_attributes;
std::vector<u32> vs_program_binary;
std::vector<u32> vs_swizzle_data;
std::vector<u32> vs_float_uniforms;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 21:07:17 +0100