summaryrefslogtreecommitdiff
path: root/src/citra_qt/debugger/graphics_tracing.cpp
diff options
context:
space:
mode:
authorGravatar Emmanuel Gil Peyrot2015-08-11 22:32:39 +0100
committerGravatar Emmanuel Gil Peyrot2015-08-11 22:38:44 +0100
commit5115d0177ed9f77b091adbbbfd22f2f0a568a4bb (patch)
tree3a243eee2146980bcbd708a552ca082d172eeda7 /src/citra_qt/debugger/graphics_tracing.cpp
parentMerge pull request #1028 from aroulin/arm-disas-media-instr (diff)
downloadyuzu-5115d0177ed9f77b091adbbbfd22f2f0a568a4bb.tar.gz
yuzu-5115d0177ed9f77b091adbbbfd22f2f0a568a4bb.tar.xz
yuzu-5115d0177ed9f77b091adbbbfd22f2f0a568a4bb.zip
ARM Core, Video Core, CitraQt, Citrace: Use CommonTypes types instead of the standard u?int*_t types.
Diffstat (limited to 'src/citra_qt/debugger/graphics_tracing.cpp')
-rw-r--r--src/citra_qt/debugger/graphics_tracing.cpp6
1 files changed, 4 insertions, 2 deletions
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 @@
14 14
15#include <boost/range/algorithm/copy.hpp> 15#include <boost/range/algorithm/copy.hpp>
16 16
17#include "common/common_types.h"
18
17#include "core/hw/gpu.h" 19#include "core/hw/gpu.h"
18#include "core/hw/lcd.h" 20#include "core/hw/lcd.h"
19 21
@@ -66,14 +68,14 @@ void GraphicsTracingWidget::StartRecording() {
66 68
67 // Encode floating point numbers to 24-bit values 69 // Encode floating point numbers to 24-bit values
68 // TODO: Drop this explicit conversion once we store float24 values bit-correctly internally. 70 // TODO: Drop this explicit conversion once we store float24 values bit-correctly internally.
69 std::array<uint32_t, 4 * 16> default_attributes; 71 std::array<u32, 4 * 16> default_attributes;
70 for (unsigned i = 0; i < 16; ++i) { 72 for (unsigned i = 0; i < 16; ++i) {
71 for (unsigned comp = 0; comp < 3; ++comp) { 73 for (unsigned comp = 0; comp < 3; ++comp) {
72 default_attributes[4 * i + comp] = nihstro::to_float24(Pica::g_state.vs.default_attributes[i][comp].ToFloat32()); 74 default_attributes[4 * i + comp] = nihstro::to_float24(Pica::g_state.vs.default_attributes[i][comp].ToFloat32());
73 } 75 }
74 } 76 }
75 77
76 std::array<uint32_t, 4 * 96> vs_float_uniforms; 78 std::array<u32, 4 * 96> vs_float_uniforms;
77 for (unsigned i = 0; i < 96; ++i) 79 for (unsigned i = 0; i < 96; ++i)
78 for (unsigned comp = 0; comp < 3; ++comp) 80 for (unsigned comp = 0; comp < 3; ++comp)
79 vs_float_uniforms[4 * i + comp] = nihstro::to_float24(Pica::g_state.vs.uniforms.f[i][comp].ToFloat32()); 81 vs_float_uniforms[4 * i + comp] = nihstro::to_float24(Pica::g_state.vs.uniforms.f[i][comp].ToFloat32());