summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2016-09-19 03:01:46 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2016-09-19 06:14:25 +0200
commit396a8d91a4423d9c793eeff0798d544613647511 (patch)
treee0203961233db1ffcbbca2e15154d71d142c5822 /src
parentTweak formatting settings (diff)
downloadyuzu-396a8d91a4423d9c793eeff0798d544613647511.tar
yuzu-396a8d91a4423d9c793eeff0798d544613647511.tar.gz
yuzu-396a8d91a4423d9c793eeff0798d544613647511.tar.bz2
yuzu-396a8d91a4423d9c793eeff0798d544613647511.tar.lz
yuzu-396a8d91a4423d9c793eeff0798d544613647511.tar.xz
yuzu-396a8d91a4423d9c793eeff0798d544613647511.tar.zst
yuzu-396a8d91a4423d9c793eeff0798d544613647511.zip
Diffstat (limited to 'src')
-rw-r--r--src/audio_core/codec.cpp2
-rw-r--r--src/audio_core/hle/dsp.cpp3
-rw-r--r--src/audio_core/hle/dsp.h72
-rw-r--r--src/audio_core/hle/filter.cpp2
-rw-r--r--src/audio_core/hle/mixers.cpp5
-rw-r--r--src/audio_core/hle/pipe.cpp10
-rw-r--r--src/audio_core/hle/pipe.h14
-rw-r--r--src/audio_core/hle/source.cpp44
-rw-r--r--src/audio_core/interpolate.cpp20
-rw-r--r--src/audio_core/interpolate.h4
-rw-r--r--src/audio_core/null_sink.h3
-rw-r--r--src/audio_core/sink.h4
-rw-r--r--src/audio_core/sink_details.h3
-rw-r--r--src/citra/citra.cpp10
-rw-r--r--src/citra/emu_window/emu_window_sdl2.cpp1
-rw-r--r--src/citra/emu_window/emu_window_sdl2.h4
-rw-r--r--src/citra_qt/bootmanager.cpp11
-rw-r--r--src/citra_qt/bootmanager.h4
-rw-r--r--src/citra_qt/configure_audio.cpp3
-rw-r--r--src/citra_qt/configure_debug.cpp3
-rw-r--r--src/citra_qt/configure_dialog.cpp8
-rw-r--r--src/citra_qt/configure_general.cpp4
-rw-r--r--src/citra_qt/configure_graphics.cpp4
-rw-r--r--src/citra_qt/configure_input.cpp49
-rw-r--r--src/citra_qt/configure_system.cpp15
-rw-r--r--src/citra_qt/debugger/callstack.cpp3
-rw-r--r--src/citra_qt/debugger/disassembler.cpp6
-rw-r--r--src/citra_qt/debugger/graphics_breakpoints.cpp6
-rw-r--r--src/citra_qt/debugger/graphics_cmdlists.cpp3
-rw-r--r--src/citra_qt/debugger/graphics_surface.cpp11
-rw-r--r--src/citra_qt/debugger/graphics_vertex_shader.cpp3
-rw-r--r--src/citra_qt/debugger/ramview.cpp3
-rw-r--r--src/citra_qt/debugger/registers.cpp3
-rw-r--r--src/citra_qt/game_list_p.h18
-rw-r--r--src/citra_qt/hotkeys.cpp3
-rw-r--r--src/citra_qt/main.h4
-rw-r--r--src/common/bit_set.h18
-rw-r--r--src/common/chunk_file.h9
-rw-r--r--src/common/code_block.h3
-rw-r--r--src/common/common_funcs.h3
-rw-r--r--src/common/emu_window.h7
-rw-r--r--src/common/file_util.cpp3
-rw-r--r--src/common/math_util.h6
-rw-r--r--src/common/profiler.cpp3
-rw-r--r--src/common/scope_exit.h3
-rw-r--r--src/common/swap.h3
-rw-r--r--src/common/synchronized_wrapper.h3
-rw-r--r--src/common/thread.h6
-rw-r--r--src/common/vector_math.h18
-rw-r--r--src/common/x64/emitter.cpp2
-rw-r--r--src/common/x64/emitter.h6
-rw-r--r--src/core/arm/arm_interface.h3
-rw-r--r--src/core/arm/dyncom/arm_dyncom.cpp3
-rw-r--r--src/core/arm/dyncom/arm_dyncom_trans.cpp3
-rw-r--r--src/core/arm/skyeye_common/armstate.h6
-rw-r--r--src/core/arm/skyeye_common/vfp/vfpdouble.cpp2
-rw-r--r--src/core/arm/skyeye_common/vfp/vfpsingle.cpp14
-rw-r--r--src/core/core.cpp3
-rw-r--r--src/core/core_timing.cpp6
-rw-r--r--src/core/file_sys/archive_backend.h36
-rw-r--r--src/core/file_sys/archive_savedata.cpp7
-rw-r--r--src/core/file_sys/archive_savedatacheck.cpp3
-rw-r--r--src/core/file_sys/archive_systemsavedata.cpp3
-rw-r--r--src/core/file_sys/directory_backend.h6
-rw-r--r--src/core/file_sys/disk_archive.h3
-rw-r--r--src/core/file_sys/file_backend.h6
-rw-r--r--src/core/file_sys/ivfc_archive.h9
-rw-r--r--src/core/hle/applets/applet.h6
-rw-r--r--src/core/hle/applets/erreula.cpp3
-rw-r--r--src/core/hle/applets/erreula.h3
-rw-r--r--src/core/hle/applets/mii_selector.cpp3
-rw-r--r--src/core/hle/applets/mii_selector.h3
-rw-r--r--src/core/hle/applets/swkbd.h3
-rw-r--r--src/core/hle/kernel/address_arbiter.cpp6
-rw-r--r--src/core/hle/kernel/client_port.cpp6
-rw-r--r--src/core/hle/kernel/event.cpp6
-rw-r--r--src/core/hle/kernel/kernel.h3
-rw-r--r--src/core/hle/kernel/mutex.cpp6
-rw-r--r--src/core/hle/kernel/process.cpp12
-rw-r--r--src/core/hle/kernel/resource_limit.cpp9
-rw-r--r--src/core/hle/kernel/resource_limit.h4
-rw-r--r--src/core/hle/kernel/semaphore.cpp6
-rw-r--r--src/core/hle/kernel/server_port.cpp11
-rw-r--r--src/core/hle/kernel/server_port.h4
-rw-r--r--src/core/hle/kernel/session.cpp6
-rw-r--r--src/core/hle/kernel/shared_memory.cpp6
-rw-r--r--src/core/hle/kernel/thread.cpp6
-rw-r--r--src/core/hle/kernel/timer.cpp9
-rw-r--r--src/core/hle/result.h3
-rw-r--r--src/core/hle/service/am/am.cpp3
-rw-r--r--src/core/hle/service/am/am_app.cpp2
-rw-r--r--src/core/hle/service/am/am_net.cpp2
-rw-r--r--src/core/hle/service/am/am_sys.cpp46
-rw-r--r--src/core/hle/service/am/am_u.cpp72
-rw-r--r--src/core/hle/service/apt/apt.cpp6
-rw-r--r--src/core/hle/service/apt/apt.h14
-rw-r--r--src/core/hle/service/apt/apt_a.cpp5
-rw-r--r--src/core/hle/service/apt/apt_s.cpp5
-rw-r--r--src/core/hle/service/apt/apt_u.cpp5
-rw-r--r--src/core/hle/service/boss/boss.cpp3
-rw-r--r--src/core/hle/service/cam/cam.h54
-rw-r--r--src/core/hle/service/cam/cam_u.cpp2
-rw-r--r--src/core/hle/service/cecd/cecd_u.cpp2
-rw-r--r--src/core/hle/service/cfg/cfg.cpp13
-rw-r--r--src/core/hle/service/cfg/cfg.h15
-rw-r--r--src/core/hle/service/cfg/cfg_i.cpp2
-rw-r--r--src/core/hle/service/cfg/cfg_s.cpp2
-rw-r--r--src/core/hle/service/cfg/cfg_u.cpp2
-rw-r--r--src/core/hle/service/dlp/dlp.cpp3
-rw-r--r--src/core/hle/service/err_f.cpp4
-rw-r--r--src/core/hle/service/frd/frd.cpp3
-rw-r--r--src/core/hle/service/frd/frd_u.cpp2
-rw-r--r--src/core/hle/service/fs/archive.cpp12
-rw-r--r--src/core/hle/service/fs/fs_user.cpp3
-rw-r--r--src/core/hle/service/gsp_gpu.cpp7
-rw-r--r--src/core/hle/service/gsp_lcd.cpp14
-rw-r--r--src/core/hle/service/hid/hid.cpp9
-rw-r--r--src/core/hle/service/hid/hid_spvr.cpp2
-rw-r--r--src/core/hle/service/hid/hid_user.cpp2
-rw-r--r--src/core/hle/service/ir/ir_rst.cpp2
-rw-r--r--src/core/hle/service/ir/ir_u.cpp29
-rw-r--r--src/core/hle/service/ir/ir_user.cpp2
-rw-r--r--src/core/hle/service/ldr_ro/cro_helper.cpp47
-rw-r--r--src/core/hle/service/ldr_ro/cro_helper.h9
-rw-r--r--src/core/hle/service/ldr_ro/ldr_ro.cpp14
-rw-r--r--src/core/hle/service/ndm/ndm.cpp13
-rw-r--r--src/core/hle/service/ndm/ndm.h9
-rw-r--r--src/core/hle/service/ndm/ndm_u.cpp2
-rw-r--r--src/core/hle/service/news/news.cpp3
-rw-r--r--src/core/hle/service/news/news_s.cpp2
-rw-r--r--src/core/hle/service/nim/nim.cpp3
-rw-r--r--src/core/hle/service/nim/nim_u.cpp2
-rw-r--r--src/core/hle/service/ptm/ptm.cpp3
-rw-r--r--src/core/hle/service/ptm/ptm_sysm.cpp2
-rw-r--r--src/core/hle/service/ptm/ptm_u.cpp2
-rw-r--r--src/core/hle/service/soc_u.cpp154
-rw-r--r--src/core/hle/service/ssl_c.cpp3
-rw-r--r--src/core/hle/service/y2r_u.cpp4
-rw-r--r--src/core/hw/hw.cpp3
-rw-r--r--src/core/hw/y2r.cpp32
-rw-r--r--src/core/loader/3dsx.h3
-rw-r--r--src/core/loader/elf.h3
-rw-r--r--src/core/loader/loader.h6
-rw-r--r--src/core/loader/ncch.h3
-rw-r--r--src/core/tracer/citrace.h7
-rw-r--r--src/core/tracer/recorder.cpp3
-rw-r--r--src/video_core/clipper.cpp3
-rw-r--r--src/video_core/command_processor.cpp3
-rw-r--r--src/video_core/debug_utils/debug_utils.cpp37
-rw-r--r--src/video_core/debug_utils/debug_utils.h6
-rw-r--r--src/video_core/gpu_debugger.h3
-rw-r--r--src/video_core/pica.h25
-rw-r--r--src/video_core/primitive_assembly.cpp3
-rw-r--r--src/video_core/rasterizer.cpp42
-rw-r--r--src/video_core/rasterizer_interface.h3
-rw-r--r--src/video_core/renderer_base.h3
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp10
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.h9
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer_cache.cpp4
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer_cache.h4
-rw-r--r--src/video_core/renderer_opengl/gl_shader_gen.cpp4
-rw-r--r--src/video_core/renderer_opengl/pica_to_gl.h16
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.cpp32
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.h7
-rw-r--r--src/video_core/shader/shader.cpp4
-rw-r--r--src/video_core/shader/shader.h3
-rw-r--r--src/video_core/shader/shader_interpreter.cpp5
-rw-r--r--src/video_core/shader/shader_jit_x64.cpp3
-rw-r--r--src/video_core/swrasterizer.h15
169 files changed, 808 insertions, 812 deletions
diff --git a/src/audio_core/codec.cpp b/src/audio_core/codec.cpp
index c7efae753..4edfe9be0 100644
--- a/src/audio_core/codec.cpp
+++ b/src/audio_core/codec.cpp
@@ -23,7 +23,7 @@ StereoBuffer16 DecodeADPCM(const u8* const data, const size_t sample_count,
constexpr size_t FRAME_LEN = 8;
constexpr size_t SAMPLES_PER_FRAME = 14;
- constexpr std::array<int, 16> SIGNED_NIBBLES{
+ constexpr std::array<int, 16> SIGNED_NIBBLES = {
{0, 1, 2, 3, 4, 5, 6, 7, -8, -7, -6, -5, -4, -3, -2, -1}};
const size_t ret_size =
diff --git a/src/audio_core/hle/dsp.cpp b/src/audio_core/hle/dsp.cpp
index 5c8afa111..aaa3a280f 100644
--- a/src/audio_core/hle/dsp.cpp
+++ b/src/audio_core/hle/dsp.cpp
@@ -49,7 +49,8 @@ static SharedMemory& WriteRegion() {
static std::array<Source, num_sources> sources = {
Source(0), Source(1), Source(2), Source(3), Source(4), Source(5), Source(6), Source(7),
Source(8), Source(9), Source(10), Source(11), Source(12), Source(13), Source(14), Source(15),
- Source(16), Source(17), Source(18), Source(19), Source(20), Source(21), Source(22), Source(23)};
+ Source(16), Source(17), Source(18), Source(19), Source(20), Source(21), Source(22), Source(23),
+};
static Mixers mixers;
static StereoFrame16 GenerateCurrentFrame() {
diff --git a/src/audio_core/hle/dsp.h b/src/audio_core/hle/dsp.h
index 5b216eb87..f4c4b01e2 100644
--- a/src/audio_core/hle/dsp.h
+++ b/src/audio_core/hle/dsp.h
@@ -23,16 +23,15 @@ class Sink;
namespace DSP {
namespace HLE {
-// The application-accessible region of DSP memory consists of two parts.
-// Both are marked as IO and have Read/Write permissions.
+// The application-accessible region of DSP memory consists of two parts. Both are marked as IO and
+// have Read/Write permissions.
//
// First Region: 0x1FF50000 (Size: 0x8000)
// Second Region: 0x1FF70000 (Size: 0x8000)
//
// The DSP reads from each region alternately based on the frame counter for each region much like a
// double-buffer. The frame counter is located as the very last u16 of each region and is
-// incremented
-// each audio tick.
+// incremented each audio tick.
constexpr VAddr region0_base = 0x1FF50000;
constexpr VAddr region1_base = 0x1FF70000;
@@ -92,14 +91,12 @@ static_assert(std::is_trivially_copyable<u32_dsp>::value, "u32_dsp isn't trivial
// See also: DSP::HLE::PipeRead.
//
// Note that the above addresses do vary slightly between audio firmwares observed; the addresses
-// are
-// not fixed in stone. The addresses above are only an examplar; they're what this implementation
-// does and provides to applications.
+// are not fixed in stone. The addresses above are only an examplar; they're what this
+// implementation does and provides to applications.
//
// Application requests the DSP service to convert DSP addresses into ARM11 virtual addresses using
-// the
-// ConvertProcessAddressFromDspDram service call. Applications seem to derive the addresses for the
-// second region via:
+// the ConvertProcessAddressFromDspDram service call. Applications seem to derive the addresses for
+// the second region via:
// second_region_dsp_addr = first_region_dsp_addr | 0x10000
//
// Applications maintain most of its own audio state, the memory region is used mainly for
@@ -107,7 +104,7 @@ static_assert(std::is_trivially_copyable<u32_dsp>::value, "u32_dsp isn't trivial
//
// In the documentation below, filter and effect transfer functions are specified in the z domain.
// (If you are more familiar with the Laplace transform, z = exp(sT). The z domain is the digital
-// frequency domain, just like how the s domain is the analog frequency domain.)
+// frequency domain, just like how the s domain is the analog frequency domain.)
#define INSERT_PADDING_DSPWORDS(num_words) INSERT_PADDING_BYTES(2 * (num_words))
@@ -137,8 +134,8 @@ struct SourceConfiguration {
BitField<0, 1, u32_le> format_dirty;
BitField<1, 1, u32_le> mono_or_stereo_dirty;
BitField<2, 1, u32_le> adpcm_coefficients_dirty;
- BitField<3, 1, u32_le>
- partial_embedded_buffer_dirty; ///< Tends to be set when a looped buffer is queued.
+ /// Tends to be set when a looped buffer is queued.
+ BitField<3, 1, u32_le> partial_embedded_buffer_dirty;
BitField<4, 1, u32_le> partial_reset_flag;
BitField<16, 1, u32_le> enable_dirty;
@@ -146,8 +143,8 @@ struct SourceConfiguration {
BitField<18, 1, u32_le> rate_multiplier_dirty;
BitField<19, 1, u32_le> buffer_queue_dirty;
BitField<20, 1, u32_le> loop_related_dirty;
- BitField<21, 1, u32_le>
- play_position_dirty; ///< Tends to also be set when embedded buffer is updated.
+ /// Tends to also be set when embedded buffer is updated.
+ BitField<21, 1, u32_le> play_position_dirty;
BitField<22, 1, u32_le> filters_enabled_dirty;
BitField<23, 1, u32_le> simple_filter_dirty;
BitField<24, 1, u32_le> biquad_filter_dirty;
@@ -162,9 +159,9 @@ struct SourceConfiguration {
// Gain control
/**
- * Gain is between 0.0-1.0. This determines how much will this source appear on
- * each of the 12 channels that feed into the intermediate mixers.
- * Each of the three intermediate mixers is fed two left and two right channels.
+ * Gain is between 0.0-1.0. This determines how much will this source appear on each of the
+ * 12 channels that feed into the intermediate mixers. Each of the three intermediate mixers
+ * is fed two left and two right channels.
*/
float_le gain[3][4];
@@ -173,7 +170,11 @@ struct SourceConfiguration {
/// Multiplier for sample rate. Resampling occurs with the selected interpolation method.
float_le rate_multiplier;
- enum class InterpolationMode : u8 { Polyphase = 0, Linear = 1, None = 2 };
+ enum class InterpolationMode : u8 {
+ Polyphase = 0,
+ Linear = 1,
+ None = 2,
+ };
InterpolationMode interpolation_mode;
INSERT_PADDING_BYTES(1); ///< Interpolation related
@@ -197,8 +198,7 @@ struct SourceConfiguration {
* The transfer function of this filter is:
* H(z) = (b0 + b1 z^-1 + b2 z^-2) / (1 - a1 z^-1 - a2 z^-2)
* Nintendo chose to negate the feedbackward coefficients. This differs from standard
- * notation
- * as in: https://ccrma.stanford.edu/~jos/filters/Direct_Form_I.html
+ * notation as in: https://ccrma.stanford.edu/~jos/filters/Direct_Form_I.html
* Values are signed fixed point with 14 fractional bits.
*/
struct BiquadFilter {
@@ -246,8 +246,8 @@ struct SourceConfiguration {
u8 is_looping;
/// This value is shown in SourceStatus::previous_buffer_id when this buffer has
- /// finished.
- /// This allows the emulated application to tell what buffer is currently playing
+ /// finished. This allows the emulated application to tell what buffer is currently
+ /// playing.
u16_le buffer_id;
INSERT_PADDING_DSPWORDS(1);
@@ -275,9 +275,16 @@ struct SourceConfiguration {
/// Note a sample takes up different number of bytes in different buffer formats.
u32_dsp length;
- enum class MonoOrStereo : u16_le { Mono = 1, Stereo = 2 };
+ enum class MonoOrStereo : u16_le {
+ Mono = 1,
+ Stereo = 2,
+ };
- enum class Format : u16_le { PCM8 = 0, PCM16 = 1, ADPCM = 2 };
+ enum class Format : u16_le {
+ PCM8 = 0,
+ PCM16 = 1,
+ ADPCM = 2,
+ };
union {
u16_le flags1_raw;
@@ -349,12 +356,16 @@ struct DspConfiguration {
};
/// The DSP has three intermediate audio mixers. This controls the volume level (0.0-1.0) for
- /// each at the final mixer
+ /// each at the final mixer.
float_le volume[3];
INSERT_PADDING_DSPWORDS(3);
- enum class OutputFormat : u16_le { Mono = 0, Stereo = 1, Surround = 2 };
+ enum class OutputFormat : u16_le {
+ Mono = 0,
+ Stereo = 1,
+ Surround = 2,
+ };
OutputFormat output_format;
@@ -386,9 +397,10 @@ struct DspConfiguration {
u16_le enable;
INSERT_PADDING_DSPWORDS(1);
u16_le outputs;
- u32_dsp work_buffer_address; ///< The application allocates a block of memory for the DSP to
- /// use as a work buffer.
- u16_le frame_count; ///< Frames to delay by
+ /// The application allocates a block of memory for the DSP to use as a work buffer.
+ u32_dsp work_buffer_address;
+ /// Frames to delay by
+ u16_le frame_count;
// Coefficients
s16_le g; ///< Fixed point with 7 fractional bits
diff --git a/src/audio_core/hle/filter.cpp b/src/audio_core/hle/filter.cpp
index ab8814e59..da2a4684e 100644
--- a/src/audio_core/hle/filter.cpp
+++ b/src/audio_core/hle/filter.cpp
@@ -61,6 +61,7 @@ void SourceFilters::SimpleFilter::Reset() {
void SourceFilters::SimpleFilter::Configure(
SourceConfiguration::Configuration::SimpleFilter config) {
+
a1 = config.a1;
b0 = config.b0;
}
@@ -91,6 +92,7 @@ void SourceFilters::BiquadFilter::Reset() {
void SourceFilters::BiquadFilter::Configure(
SourceConfiguration::Configuration::BiquadFilter config) {
+
a1 = config.a1;
a2 = config.a2;
b0 = config.b0;
diff --git a/src/audio_core/hle/mixers.cpp b/src/audio_core/hle/mixers.cpp
index a661a7b27..126f328bc 100644
--- a/src/audio_core/hle/mixers.cpp
+++ b/src/audio_core/hle/mixers.cpp
@@ -77,9 +77,8 @@ void Mixers::ParseConfig(DspConfiguration& config) {
if (config.headphones_connected_dirty) {
config.headphones_connected_dirty.Assign(0);
- // Do nothing.
- // (Note: Whether headphones are connected does affect coefficients used for surround
- // sound.)
+ // Do nothing. (Note: Whether headphones are connected does affect coefficients used for
+ // surround sound.)
LOG_TRACE(Audio_DSP, "mixers headphones_connected=%hu", config.headphones_connected);
}
diff --git a/src/audio_core/hle/pipe.cpp b/src/audio_core/hle/pipe.cpp
index fe67d2503..f2b6d6552 100644
--- a/src/audio_core/hle/pipe.cpp
+++ b/src/audio_core/hle/pipe.cpp
@@ -97,7 +97,8 @@ static void AudioPipeWriteStructAddresses() {
0x8000 + offsetof(SharedMemory, unknown11) / 2,
0x8000 + offsetof(SharedMemory, unknown12) / 2,
0x8000 + offsetof(SharedMemory, unknown13) / 2,
- 0x8000 + offsetof(SharedMemory, unknown14) / 2};
+ 0x8000 + offsetof(SharedMemory, unknown14) / 2,
+ };
// Begin with a u16 denoting the number of structs.
WriteU16(DspPipe::Audio, static_cast<u16>(struct_addresses.size()));
@@ -118,7 +119,12 @@ void PipeWrite(DspPipe pipe_number, const std::vector<u8>& buffer) {
return;
}
- enum class StateChange { Initalize = 0, Shutdown = 1, Wakeup = 2, Sleep = 3 };
+ enum class StateChange {
+ Initalize = 0,
+ Shutdown = 1,
+ Wakeup = 2,
+ Sleep = 3,
+ };
// The difference between Initialize and Wakeup is that Input state is maintained
// when sleeping but isn't when turning it off and on again. (TODO: Implement this.)
diff --git a/src/audio_core/hle/pipe.h b/src/audio_core/hle/pipe.h
index 73b857a90..6d7fd92ab 100644
--- a/src/audio_core/hle/pipe.h
+++ b/src/audio_core/hle/pipe.h
@@ -15,7 +15,12 @@ namespace HLE {
/// Reset the pipes by setting pipe positions back to the beginning.
void ResetPipes();
-enum class DspPipe { Debug = 0, Dma = 1, Audio = 2, Binary = 3 };
+enum class DspPipe {
+ Debug = 0,
+ Dma = 1,
+ Audio = 2,
+ Binary = 3,
+};
constexpr size_t NUM_DSP_PIPE = 8;
/**
@@ -46,7 +51,12 @@ size_t GetPipeReadableSize(DspPipe pipe_number);
*/
void PipeWrite(DspPipe pipe_number, const std::vector<u8>& buffer);
-enum class DspState { Off, On, Sleeping };
+enum class DspState {
+ Off,
+ On,
+ Sleeping,
+};
+
/// Get the state of the DSP
DspState GetDspState();
diff --git a/src/audio_core/hle/source.cpp b/src/audio_core/hle/source.cpp
index fad0ce2ad..249acc449 100644
--- a/src/audio_core/hle/source.cpp
+++ b/src/audio_core/hle/source.cpp
@@ -163,16 +163,18 @@ void Source::ParseConfig(SourceConfiguration::Configuration& config,
if (config.embedded_buffer_dirty) {
config.embedded_buffer_dirty.Assign(0);
- state.input_queue.emplace(Buffer{config.physical_address,
- config.length,
- static_cast<u8>(config.adpcm_ps),
- {config.adpcm_yn[0], config.adpcm_yn[1]},
- config.adpcm_dirty.ToBool(),
- config.is_looping.ToBool(),
- config.buffer_id,
- state.mono_or_stereo,
- state.format,
- false});
+ state.input_queue.emplace(Buffer{
+ config.physical_address,
+ config.length,
+ static_cast<u8>(config.adpcm_ps),
+ {config.adpcm_yn[0], config.adpcm_yn[1]},
+ config.adpcm_dirty.ToBool(),
+ config.is_looping.ToBool(),
+ config.buffer_id,
+ state.mono_or_stereo,
+ state.format,
+ false,
+ });
LOG_TRACE(Audio_DSP, "enqueuing embedded addr=0x%08x len=%u id=%hu",
config.physical_address, config.length, config.buffer_id);
}
@@ -182,16 +184,18 @@ void Source::ParseConfig(SourceConfiguration::Configuration& config,
for (size_t i = 0; i < 4; i++) {
if (config.buffers_dirty & (1 << i)) {
const auto& b = config.buffers[i];
- state.input_queue.emplace(Buffer{b.physical_address,
- b.length,
- static_cast<u8>(b.adpcm_ps),
- {b.adpcm_yn[0], b.adpcm_yn[1]},
- b.adpcm_dirty != 0,
- b.is_looping != 0,
- b.buffer_id,
- state.mono_or_stereo,
- state.format,
- true});
+ state.input_queue.emplace(Buffer{
+ b.physical_address,
+ b.length,
+ static_cast<u8>(b.adpcm_ps),
+ {b.adpcm_yn[0], b.adpcm_yn[1]},
+ b.adpcm_dirty != 0,
+ b.is_looping != 0,
+ b.buffer_id,
+ state.mono_or_stereo,
+ state.format,
+ true,
+ });
LOG_TRACE(Audio_DSP, "enqueuing queued %zu addr=0x%08x len=%u id=%hu", i,
b.physical_address, b.length, b.buffer_id);
}
diff --git a/src/audio_core/interpolate.cpp b/src/audio_core/interpolate.cpp
index 7751c545d..cb1c58a67 100644
--- a/src/audio_core/interpolate.cpp
+++ b/src/audio_core/interpolate.cpp
@@ -71,15 +71,17 @@ StereoBuffer16 None(State& state, const StereoBuffer16& input, float rate_multip
StereoBuffer16 Linear(State& state, const StereoBuffer16& input, float rate_multiplier) {
// Note on accuracy: Some values that this produces are +/- 1 from the actual firmware.
- return StepOverSamples(state, input, rate_multiplier, [](u64 fraction, const auto& x0,
- const auto& x1, const auto& x2) {
- // This is a saturated subtraction. (Verified by black-box fuzzing.)
- s64 delta0 = MathUtil::Clamp<s64>(x1[0] - x0[0], -32768, 32767);
- s64 delta1 = MathUtil::Clamp<s64>(x1[1] - x0[1], -32768, 32767);
-
- return std::array<s16, 2>{static_cast<s16>(x0[0] + fraction * delta0 / scale_factor),
- static_cast<s16>(x0[1] + fraction * delta1 / scale_factor)};
- });
+ return StepOverSamples(state, input, rate_multiplier,
+ [](u64 fraction, const auto& x0, const auto& x1, const auto& x2) {
+ // This is a saturated subtraction. (Verified by black-box fuzzing.)
+ s64 delta0 = MathUtil::Clamp<s64>(x1[0] - x0[0], -32768, 32767);
+ s64 delta1 = MathUtil::Clamp<s64>(x1[1] - x0[1], -32768, 32767);
+
+ return std::array<s16, 2>{
+ static_cast<s16>(x0[0] + fraction * delta0 / scale_factor),
+ static_cast<s16>(x0[1] + fraction * delta1 / scale_factor),
+ };
+ });
}
} // namespace AudioInterp
diff --git a/src/audio_core/interpolate.h b/src/audio_core/interpolate.h
index 99e5b9657..2d2e60311 100644
--- a/src/audio_core/interpolate.h
+++ b/src/audio_core/interpolate.h
@@ -25,7 +25,7 @@ struct State {
* @param input Input buffer.
* @param rate_multiplier Stretch factor. Must be a positive non-zero value.
* rate_multiplier > 1.0 performs decimation and rate_multipler < 1.0
- * performs upsampling.
+ * performs upsampling.
* @return The resampled audio buffer.
*/
StereoBuffer16 None(State& state, const StereoBuffer16& input, float rate_multiplier);
@@ -35,7 +35,7 @@ StereoBuffer16 None(State& state, const StereoBuffer16& input, float rate_multip
* @param input Input buffer.
* @param rate_multiplier Stretch factor. Must be a positive non-zero value.
* rate_multiplier > 1.0 performs decimation and rate_multipler < 1.0
- * performs upsampling.
+ * performs upsampling.
* @return The resampled audio buffer.
*/
StereoBuffer16 Linear(State& state, const StereoBuffer16& input, float rate_multiplier);
diff --git a/src/audio_core/null_sink.h b/src/audio_core/null_sink.h
index b82cd3b9a..9931c4778 100644
--- a/src/audio_core/null_sink.h
+++ b/src/audio_core/null_sink.h
@@ -19,8 +19,7 @@ public:
return native_sample_rate;
}
- void EnqueueSamples(const s16*, size_t) override {
- }
+ void EnqueueSamples(const s16*, size_t) override {}
size_t SamplesInQueue() const override {
return 0;
diff --git a/src/audio_core/sink.h b/src/audio_core/sink.h
index c938e87d2..f5ce55a6b 100644
--- a/src/audio_core/sink.h
+++ b/src/audio_core/sink.h
@@ -12,8 +12,8 @@ namespace AudioCore {
/**
* This class is an interface for an audio sink. An audio sink accepts samples in stereo signed
- * PCM16 format to be output.
- * Sinks *do not* handle resampling and expect the correct sample rate. They are dumb outputs.
+ * PCM16 format to be output. Sinks *do not* handle resampling and expect the correct sample rate.
+ * They are dumb outputs.
*/
class Sink {
public:
diff --git a/src/audio_core/sink_details.h b/src/audio_core/sink_details.h
index 34110c97a..4b30cf835 100644
--- a/src/audio_core/sink_details.h
+++ b/src/audio_core/sink_details.h
@@ -14,8 +14,7 @@ class Sink;
struct SinkDetails {
SinkDetails(const char* id_, std::function<std::unique_ptr<Sink>()> factory_)
- : id(id_), factory(factory_) {
- }
+ : id(id_), factory(factory_) {}
/// Name for this sink.
const char* id;
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp
index 7b387e258..1b8f8cffe 100644
--- a/src/citra/citra.cpp
+++ b/src/citra/citra.cpp
@@ -69,10 +69,12 @@ int main(int argc, char** argv) {
#endif
std::string boot_filename;
- static struct option long_options[] = {{"gdbport", required_argument, 0, 'g'},
- {"help", no_argument, 0, 'h'},
- {"version", no_argument, 0, 'v'},
- {0, 0, 0, 0}};
+ static struct option long_options[] = {
+ {"gdbport", required_argument, 0, 'g'},
+ {"help", no_argument, 0, 'h'},
+ {"version", no_argument, 0, 'v'},
+ {0, 0, 0, 0},
+ };
while (optind < argc) {
char arg = getopt_long(argc, argv, "g:hv", long_options, &option_index);
diff --git a/src/citra/emu_window/emu_window_sdl2.cpp b/src/citra/emu_window/emu_window_sdl2.cpp
index 12f3e2c71..42f2a7553 100644
--- a/src/citra/emu_window/emu_window_sdl2.cpp
+++ b/src/citra/emu_window/emu_window_sdl2.cpp
@@ -181,5 +181,6 @@ void EmuWindow_SDL2::ReloadSetKeymaps() {
void EmuWindow_SDL2::OnMinimalClientAreaChangeRequest(
const std::pair<unsigned, unsigned>& minimal_size) {
+
SDL_SetWindowMinimumSize(render_window, minimal_size.first, minimal_size.second);
}
diff --git a/src/citra/emu_window/emu_window_sdl2.h b/src/citra/emu_window/emu_window_sdl2.h
index 693dfb14b..d4d86821d 100644
--- a/src/citra/emu_window/emu_window_sdl2.h
+++ b/src/citra/emu_window/emu_window_sdl2.h
@@ -47,8 +47,8 @@ private:
void OnResize();
/// Called when a configuration change affects the minimal size of the window
- void
- OnMinimalClientAreaChangeRequest(const std::pair<unsigned, unsigned>& minimal_size) override;
+ void OnMinimalClientAreaChangeRequest(
+ const std::pair<unsigned, unsigned>& minimal_size) override;
/// Is the window still open?
bool is_open = true;
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 01cc6b9ca..53d035b32 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -28,8 +28,7 @@
#define COPYRIGHT "Copyright (C) 2013-2014 Citra Team"
EmuThread::EmuThread(GRenderWindow* render_window)
- : exec_step(false), running(false), stop_run(false), render_window(render_window) {
-}
+ : exec_step(false), running(false), stop_run(false), render_window(render_window) {}
void EmuThread::run() {
render_window->MakeCurrent();
@@ -84,8 +83,7 @@ void EmuThread::run() {
class GGLWidgetInternal : public QGLWidget {
public:
GGLWidgetInternal(QGLFormat fmt, GRenderWindow* parent)
- : QGLWidget(fmt, parent), parent(parent) {
- }
+ : QGLWidget(fmt, parent), parent(parent) {}
void paintEvent(QPaintEvent* ev) override {
if (do_painting) {
@@ -153,8 +151,7 @@ void GRenderWindow::DoneCurrent() {
child->doneCurrent();
}
-void GRenderWindow::PollEvents() {
-}
+void GRenderWindow::PollEvents() {}
// On Qt 5.0+, this correctly gets the size of the framebuffer (pixels).
//
@@ -306,8 +303,8 @@ void GRenderWindow::OnEmulationStopping() {
void GRenderWindow::showEvent(QShowEvent* event) {
QWidget::showEvent(event);
-// windowHandle() is not initialized until the Window is shown, so we connect it here.
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+ // windowHandle() is not initialized until the Window is shown, so we connect it here.
connect(this->windowHandle(), SIGNAL(screenChanged(QScreen*)), this,
SLOT(OnFramebufferSizeChanged()), Qt::UniqueConnection);
#endif
diff --git a/src/citra_qt/bootmanager.h b/src/citra_qt/bootmanager.h
index e0e4341df..59241684d 100644
--- a/src/citra_qt/bootmanager.h
+++ b/src/citra_qt/bootmanager.h
@@ -144,8 +144,8 @@ signals:
void Closed();
private:
- void
- OnMinimalClientAreaChangeRequest(const std::pair<unsigned, unsigned>& minimal_size) override;
+ void OnMinimalClientAreaChangeRequest(
+ const std::pair<unsigned, unsigned>& minimal_size) override;
GGLWidgetInternal* child;
diff --git a/src/citra_qt/configure_audio.cpp b/src/citra_qt/configure_audio.cpp
index 29900536c..944047d05 100644
--- a/src/citra_qt/configure_audio.cpp
+++ b/src/citra_qt/configure_audio.cpp
@@ -22,8 +22,7 @@ ConfigureAudio::ConfigureAudio(QWidget* parent)
this->setConfiguration();
}
-ConfigureAudio::~ConfigureAudio() {
-}
+ConfigureAudio::~ConfigureAudio() {}
void ConfigureAudio::setConfiguration() {
int new_sink_index = 0;
diff --git a/src/citra_qt/configure_debug.cpp b/src/citra_qt/configure_debug.cpp
index b6b44723c..dde8d670e 100644
--- a/src/citra_qt/configure_debug.cpp
+++ b/src/citra_qt/configure_debug.cpp
@@ -12,8 +12,7 @@ ConfigureDebug::ConfigureDebug(QWidget* parent) : QWidget(parent), ui(new Ui::Co
this->setConfiguration();
}
-ConfigureDebug::~ConfigureDebug() {
-}
+ConfigureDebug::~ConfigureDebug() {}
void ConfigureDebug::setConfiguration() {
ui->toggle_gdbstub->setChecked(Settings::values.use_gdbstub);
diff --git a/src/citra_qt/configure_dialog.cpp b/src/citra_qt/configure_dialog.cpp
index 837934c81..c33c95540 100644
--- a/src/citra_qt/configure_dialog.cpp
+++ b/src/citra_qt/configure_dialog.cpp
@@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "citra_qt/config.h"
#include "citra_qt/configure_dialog.h"
+#include "citra_qt/config.h"
#include "ui_configure.h"
#include "core/settings.h"
@@ -13,11 +13,9 @@ ConfigureDialog::ConfigureDialog(QWidget* parent) : QDialog(parent), ui(new Ui::
this->setConfiguration();
}
-ConfigureDialog::~ConfigureDialog() {
-}
+ConfigureDialog::~ConfigureDialog() {}
-void ConfigureDialog::setConfiguration() {
-}
+void ConfigureDialog::setConfiguration() {}
void ConfigureDialog::applyConfiguration() {
ui->generalTab->applyConfiguration();
diff --git a/src/citra_qt/configure_general.cpp b/src/citra_qt/configure_general.cpp
index 7bfba6dd0..3e6f76bfe 100644
--- a/src/citra_qt/configure_general.cpp
+++ b/src/citra_qt/configure_general.cpp
@@ -11,14 +11,14 @@
ConfigureGeneral::ConfigureGeneral(QWidget* parent)
: QWidget(parent), ui(new Ui::ConfigureGeneral) {
+
ui->setupUi(this);
this->setConfiguration();
ui->toggle_cpu_jit->setEnabled(!System::IsPoweredOn());
}
-ConfigureGeneral::~ConfigureGeneral() {
-}
+ConfigureGeneral::~ConfigureGeneral() {}
void ConfigureGeneral::setConfiguration() {
ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan);
diff --git a/src/citra_qt/configure_graphics.cpp b/src/citra_qt/configure_graphics.cpp
index adc9cb5ef..bde6727cc 100644
--- a/src/citra_qt/configure_graphics.cpp
+++ b/src/citra_qt/configure_graphics.cpp
@@ -10,14 +10,14 @@
ConfigureGraphics::ConfigureGraphics(QWidget* parent)
: QWidget(parent), ui(new Ui::ConfigureGraphics) {
+
ui->setupUi(this);
this->setConfiguration();
ui->toggle_vsync->setEnabled(!System::IsPoweredOn());
}
-ConfigureGraphics::~ConfigureGraphics() {
-}
+ConfigureGraphics::~ConfigureGraphics() {}
void ConfigureGraphics::setConfiguration() {
ui->toggle_hw_renderer->setChecked(Settings::values.use_hw_renderer);
diff --git a/src/citra_qt/configure_input.cpp b/src/citra_qt/configure_input.cpp
index af473f841..7900134ca 100644
--- a/src/citra_qt/configure_input.cpp
+++ b/src/citra_qt/configure_input.cpp
@@ -10,34 +10,35 @@
ConfigureInput::ConfigureInput(QWidget* parent)
: QWidget(parent), ui(std::make_unique<Ui::ConfigureInput>()) {
+
ui->setupUi(this);
// Initialize mapping of input enum to UI button.
input_mapping = {
- {std::make_pair(Settings::NativeInput::Values::A, ui->buttonA)},
- {std::make_pair(Settings::NativeInput::Values::B, ui->buttonB)},
- {std::make_pair(Settings::NativeInput::Values::X, ui->buttonX)},
- {std::make_pair(Settings::NativeInput::Values::Y, ui->buttonY)},
- {std::make_pair(Settings::NativeInput::Values::L, ui->buttonL)},
- {std::make_pair(Settings::NativeInput::Values::R, ui->buttonR)},
- {std::make_pair(Settings::NativeInput::Values::ZL, ui->buttonZL)},
- {std::make_pair(Settings::NativeInput::Values::ZR, ui->buttonZR)},
- {std::make_pair(Settings::NativeInput::Values::START, ui->buttonStart)},
- {std::make_pair(Settings::NativeInput::Values::SELECT, ui->buttonSelect)},
- {std::make_pair(Settings::NativeInput::Values::HOME, ui->buttonHome)},
- {std::make_pair(Settings::NativeInput::Values::DUP, ui->buttonDpadUp)},
- {std::make_pair(Settings::NativeInput::Values::DDOWN, ui->buttonDpadDown)},
- {std::make_pair(Settings::NativeInput::Values::DLEFT, ui->buttonDpadLeft)},
- {std::make_pair(Settings::NativeInput::Values::DRIGHT, ui->buttonDpadRight)},
- {std::make_pair(Settings::NativeInput::Values::CUP, ui->buttonCStickUp)},
- {std::make_pair(Settings::NativeInput::Values::CDOWN, ui->buttonCStickDown)},
- {std::make_pair(Settings::NativeInput::Values::CLEFT, ui->buttonCStickLeft)},
- {std::make_pair(Settings::NativeInput::Values::CRIGHT, ui->buttonCStickRight)},
- {std::make_pair(Settings::NativeInput::Values::CIRCLE_UP, ui->buttonCircleUp)},
- {std::make_pair(Settings::NativeInput::Values::CIRCLE_DOWN, ui->buttonCircleDown)},
- {std::make_pair(Settings::NativeInput::Values::CIRCLE_LEFT, ui->buttonCircleLeft)},
- {std::make_pair(Settings::NativeInput::Values::CIRCLE_RIGHT, ui->buttonCircleRight)},
- {std::make_pair(Settings::NativeInput::Values::CIRCLE_MODIFIER, ui->buttonCircleMod)},
+ {Settings::NativeInput::Values::A, ui->buttonA},
+ {Settings::NativeInput::Values::B, ui->buttonB},
+ {Settings::NativeInput::Values::X, ui->buttonX},
+ {Settings::NativeInput::Values::Y, ui->buttonY},
+ {Settings::NativeInput::Values::L, ui->buttonL},
+ {Settings::NativeInput::Values::R, ui->buttonR},
+ {Settings::NativeInput::Values::ZL, ui->buttonZL},
+ {Settings::NativeInput::Values::ZR, ui->buttonZR},
+ {Settings::NativeInput::Values::START, ui->buttonStart},
+ {Settings::NativeInput::Values::SELECT, ui->buttonSelect},
+ {Settings::NativeInput::Values::HOME, ui->buttonHome},
+ {Settings::NativeInput::Values::DUP, ui->buttonDpadUp},
+ {Settings::NativeInput::Values::DDOWN, ui->buttonDpadDown},
+ {Settings::NativeInput::Values::DLEFT, ui->buttonDpadLeft},
+ {Settings::NativeInput::Values::DRIGHT, ui->buttonDpadRight},
+ {Settings::NativeInput::Values::CUP, ui->buttonCStickUp},
+ {Settings::NativeInput::Values::CDOWN, ui->buttonCStickDown},
+ {Settings::NativeInput::Values::CLEFT, ui->buttonCStickLeft},
+ {Settings::NativeInput::Values::CRIGHT, ui->buttonCStickRight},
+ {Settings::NativeInput::Values::CIRCLE_UP, ui->buttonCircleUp},
+ {Settings::NativeInput::Values::CIRCLE_DOWN, ui->buttonCircleDown},
+ {Settings::NativeInput::Values::CIRCLE_LEFT, ui->buttonCircleLeft},
+ {Settings::NativeInput::Values::CIRCLE_RIGHT, ui->buttonCircleRight},
+ {Settings::NativeInput::Values::CIRCLE_MODIFIER, ui->buttonCircleMod},
};
// Attach handle click method to each button click.
diff --git a/src/citra_qt/configure_system.cpp b/src/citra_qt/configure_system.cpp
index d89b342df..732e15dda 100644
--- a/src/citra_qt/configure_system.cpp
+++ b/src/citra_qt/configure_system.cpp
@@ -10,7 +10,9 @@
#include "core/hle/service/fs/archive.h"
#include "core/system.h"
-static const std::array<int, 12> days_in_month = {{31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}};
+static const std::array<int, 12> days_in_month = {{
+ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31,
+}};
ConfigureSystem::ConfigureSystem(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureSystem) {
ui->setupUi(this);
@@ -20,8 +22,7 @@ ConfigureSystem::ConfigureSystem(QWidget* parent) : QWidget(parent), ui(new Ui::
this->setConfiguration();
}
-ConfigureSystem::~ConfigureSystem() {
-}
+ConfigureSystem::~ConfigureSystem() {}
void ConfigureSystem::setConfiguration() {
enabled = !System::IsPoweredOn();
@@ -51,8 +52,8 @@ void ConfigureSystem::setConfiguration() {
void ConfigureSystem::ReadSystemSettings() {
// set username
username = Service::CFG::GetUsername();
- // ui->edit_username->setText(QString::fromStdU16String(username)); // TODO(wwylele): Use this
- // when we move to Qt 5.5
+ // TODO(wwylele): Use this when we move to Qt 5.5
+ // ui->edit_username->setText(QString::fromStdU16String(username));
ui->edit_username->setText(
QString::fromUtf16(reinterpret_cast<const ushort*>(username.data())));
@@ -80,8 +81,8 @@ void ConfigureSystem::applyConfiguration() {
bool modified = false;
// apply username
- // std::u16string new_username = ui->edit_username->text().toStdU16String(); // TODO(wwylele):
- // Use this when we move to Qt 5.5
+ // TODO(wwylele): Use this when we move to Qt 5.5
+ // std::u16string new_username = ui->edit_username->text().toStdU16String();
std::u16string new_username(
reinterpret_cast<const char16_t*>(ui->edit_username->text().utf16()));
if (new_username != username) {
diff --git a/src/citra_qt/debugger/callstack.cpp b/src/citra_qt/debugger/callstack.cpp
index a87046acb..db266b506 100644
--- a/src/citra_qt/debugger/callstack.cpp
+++ b/src/citra_qt/debugger/callstack.cpp
@@ -78,8 +78,7 @@ void CallstackWidget::OnDebugModeEntered() {
}
}
-void CallstackWidget::OnDebugModeLeft() {
-}
+void CallstackWidget::OnDebugModeLeft() {}
void CallstackWidget::Clear() {
for (int row = 0; row < callstack_model->rowCount(); row++) {
diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp
index b523fe9a7..803e8b172 100644
--- a/src/citra_qt/debugger/disassembler.cpp
+++ b/src/citra_qt/debugger/disassembler.cpp
@@ -19,8 +19,7 @@
DisassemblerModel::DisassemblerModel(QObject* parent)
: QAbstractListModel(parent), base_address(0), code_size(0), program_counter(0),
- selection(QModelIndex()) {
-}
+ selection(QModelIndex()) {}
int DisassemblerModel::columnCount(const QModelIndex& parent) const {
return 3;
@@ -241,8 +240,7 @@ void DisassemblerWidget::OnDebugModeEntered() {
model_index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
}
-void DisassemblerWidget::OnDebugModeLeft() {
-}
+void DisassemblerWidget::OnDebugModeLeft() {}
int DisassemblerWidget::SelectedRow() {
QModelIndex index = disasm_ui.treeView->selectionModel()->currentIndex();
diff --git a/src/citra_qt/debugger/graphics_breakpoints.cpp b/src/citra_qt/debugger/graphics_breakpoints.cpp
index 953840e7f..b31eba533 100644
--- a/src/citra_qt/debugger/graphics_breakpoints.cpp
+++ b/src/citra_qt/debugger/graphics_breakpoints.cpp
@@ -16,8 +16,7 @@
BreakPointModel::BreakPointModel(std::shared_ptr<Pica::DebugContext> debug_context, QObject* parent)
: QAbstractListModel(parent), context_weak(debug_context),
at_breakpoint(debug_context->at_breakpoint),
- active_breakpoint(debug_context->active_breakpoint) {
-}
+ active_breakpoint(debug_context->active_breakpoint) {}
int BreakPointModel::columnCount(const QModelIndex& parent) const {
return 1;
@@ -42,7 +41,8 @@ QVariant BreakPointModel::data(const QModelIndex& index, int role) const {
{Pica::DebugContext::Event::IncomingDisplayTransfer,
tr("Incoming display transfer")},
{Pica::DebugContext::Event::GSPCommandProcessed, tr("GSP command processed")},
- {Pica::DebugContext::Event::BufferSwapped, tr("Buffers swapped")}};
+ {Pica::DebugContext::Event::BufferSwapped, tr("Buffers swapped")},
+ };
DEBUG_ASSERT(map.size() == static_cast<size_t>(Pica::DebugContext::Event::NumEvents));
return (map.find(event) != map.end()) ? map.at(event) : QString();
diff --git a/src/citra_qt/debugger/graphics_cmdlists.cpp b/src/citra_qt/debugger/graphics_cmdlists.cpp
index daf1cf1de..b088ad29d 100644
--- a/src/citra_qt/debugger/graphics_cmdlists.cpp
+++ b/src/citra_qt/debugger/graphics_cmdlists.cpp
@@ -51,8 +51,7 @@ public:
}
};
-GPUCommandListModel::GPUCommandListModel(QObject* parent) : QAbstractListModel(parent) {
-}
+GPUCommandListModel::GPUCommandListModel(QObject* parent) : QAbstractListModel(parent) {}
int GPUCommandListModel::rowCount(const QModelIndex& parent) const {
return static_cast<int>(pica_trace.writes.size());
diff --git a/src/citra_qt/debugger/graphics_surface.cpp b/src/citra_qt/debugger/graphics_surface.cpp
index 839fca124..bb998acc4 100644
--- a/src/citra_qt/debugger/graphics_surface.cpp
+++ b/src/citra_qt/debugger/graphics_surface.cpp
@@ -25,10 +25,8 @@
#include "video_core/utils.h"
SurfacePicture::SurfacePicture(QWidget* parent, GraphicsSurfaceWidget* surface_widget_)
- : QLabel(parent), surface_widget(surface_widget_) {
-}
-SurfacePicture::~SurfacePicture() {
-}
+ : QLabel(parent), surface_widget(surface_widget_) {}
+SurfacePicture::~SurfacePicture() {}
void SurfacePicture::mousePressEvent(QMouseEvent* event) {
// Only do something while the left mouse button is held down
@@ -707,9 +705,8 @@ unsigned int GraphicsSurfaceWidget::NibblesPerPixel(GraphicsSurfaceWidget::Forma
case Format::D16:
return 2 * 2;
default:
- UNREACHABLE_MSG("GraphicsSurfaceWidget::BytesPerPixel: this "
- "should not be reached as this function should "
- "be given a format which is in "
+ UNREACHABLE_MSG("GraphicsSurfaceWidget::BytesPerPixel: this should not be reached as this "
+ "function should be given a format which is in "
"GraphicsSurfaceWidget::Format. Instead got %i",
static_cast<int>(format));
return 0;
diff --git a/src/citra_qt/debugger/graphics_vertex_shader.cpp b/src/citra_qt/debugger/graphics_vertex_shader.cpp
index c49327f9c..0f02bc3da 100644
--- a/src/citra_qt/debugger/graphics_vertex_shader.cpp
+++ b/src/citra_qt/debugger/graphics_vertex_shader.cpp
@@ -29,8 +29,7 @@ using nihstro::SourceRegister;
using nihstro::SwizzlePattern;
GraphicsVertexShaderModel::GraphicsVertexShaderModel(GraphicsVertexShaderWidget* parent)
- : QAbstractTableModel(parent), par(parent) {
-}
+ : QAbstractTableModel(parent), par(parent) {}
int GraphicsVertexShaderModel::columnCount(const QModelIndex& parent) const {
return 3;
diff --git a/src/citra_qt/debugger/ramview.cpp b/src/citra_qt/debugger/ramview.cpp
index 63f2850e1..10a09dda8 100644
--- a/src/citra_qt/debugger/ramview.cpp
+++ b/src/citra_qt/debugger/ramview.cpp
@@ -4,8 +4,7 @@
#include "citra_qt/debugger/ramview.h"
-GRamView::GRamView(QWidget* parent) : QHexEdit(parent) {
-}
+GRamView::GRamView(QWidget* parent) : QHexEdit(parent) {}
void GRamView::OnCPUStepped() {
// TODO: QHexEdit doesn't show vertical scroll bars for > 10MB data streams...
diff --git a/src/citra_qt/debugger/registers.cpp b/src/citra_qt/debugger/registers.cpp
index 82da0022f..87c8c3418 100644
--- a/src/citra_qt/debugger/registers.cpp
+++ b/src/citra_qt/debugger/registers.cpp
@@ -75,8 +75,7 @@ void RegistersWidget::OnDebugModeEntered() {
UpdateVFPSystemRegisterValues();
}
-void RegistersWidget::OnDebugModeLeft() {
-}
+void RegistersWidget::OnDebugModeLeft() {}
void RegistersWidget::OnEmulationStarting(EmuThread* emu_thread) {
setEnabled(true);
diff --git a/src/citra_qt/game_list_p.h b/src/citra_qt/game_list_p.h
index bcb3fccbd..c8a9ee5db 100644
--- a/src/citra_qt/game_list_p.h
+++ b/src/citra_qt/game_list_p.h
@@ -59,12 +59,9 @@ static QString GetQStringShortTitleFromSMDH(const Loader::SMDH& smdh,
class GameListItem : public QStandardItem {
public:
- GameListItem() : QStandardItem() {
- }
- GameListItem(const QString& string) : QStandardItem(string) {
- }
- virtual ~GameListItem() override {
- }
+ GameListItem() : QStandardItem() {}
+ GameListItem(const QString& string) : QStandardItem(string) {}
+ virtual ~GameListItem() override {}
};
/**
@@ -79,8 +76,7 @@ public:
static const int FullPathRole = Qt::UserRole + 1;
static const int TitleRole = Qt::UserRole + 2;
- GameListItemPath() : GameListItem() {
- }
+ GameListItemPath() : GameListItem() {}
GameListItemPath(const QString& game_path, const std::vector<u8>& smdh_data) : GameListItem() {
setData(game_path, FullPathRole);
@@ -124,8 +120,7 @@ class GameListItemSize : public GameListItem {
public:
static const int SizeRole = Qt::UserRole + 1;
- GameListItemSize() : GameListItem() {
- }
+ GameListItemSize() : GameListItem() {}
GameListItemSize(const qulonglong size_bytes) : GameListItem() {
setData(size_bytes, SizeRole);
}
@@ -161,8 +156,7 @@ class GameListWorker : public QObject, public QRunnable {
public:
GameListWorker(QString dir_path, bool deep_scan)
- : QObject(), QRunnable(), dir_path(dir_path), deep_scan(deep_scan) {
- }
+ : QObject(), QRunnable(), dir_path(dir_path), deep_scan(deep_scan) {}
public slots:
/// Starts the processing of directory tree information.
diff --git a/src/citra_qt/hotkeys.cpp b/src/citra_qt/hotkeys.cpp
index 6301259d8..3e38223ee 100644
--- a/src/citra_qt/hotkeys.cpp
+++ b/src/citra_qt/hotkeys.cpp
@@ -12,8 +12,7 @@
#include "citra_qt/ui_settings.h"
struct Hotkey {
- Hotkey() : shortcut(nullptr), context(Qt::WindowShortcut) {
- }
+ Hotkey() : shortcut(nullptr), context(Qt::WindowShortcut) {}
QKeySequence keyseq;
QShortcut* shortcut;
diff --git a/src/citra_qt/main.h b/src/citra_qt/main.h
index 717c68382..10157310e 100644
--- a/src/citra_qt/main.h
+++ b/src/citra_qt/main.h
@@ -26,8 +26,8 @@ class GPUCommandListWidget;
class GMainWindow : public QMainWindow {
Q_OBJECT
- static const int max_recent_files_item =
- 10; ///< Max number of recently loaded items to keep track
+ /// Max number of recently loaded items to keep track of
+ static const int max_recent_files_item = 10;
// TODO: Make use of this!
enum {
diff --git a/src/common/bit_set.h b/src/common/bit_set.h
index b83cbbb36..c48b3b769 100644
--- a/src/common/bit_set.h
+++ b/src/common/bit_set.h
@@ -102,10 +102,8 @@ public:
// A reference to a particular bit, returned from operator[].
class Ref {
public:
- Ref(Ref&& other) : m_bs(other.m_bs), m_mask(other.m_mask) {
- }
- Ref(BitSet* bs, IntTy mask) : m_bs(bs), m_mask(mask) {
- }
+ Ref(Ref&& other) : m_bs(other.m_bs), m_mask(other.m_mask) {}
+ Ref(BitSet* bs, IntTy mask) : m_bs(bs), m_mask(mask) {}
operator bool() const {
return (m_bs->m_val & m_mask) != 0;
}
@@ -122,10 +120,8 @@ public:
// A STL-like iterator is required to be able to use range-based for loops.
class Iterator {
public:
- Iterator(const Iterator& other) : m_val(other.m_val), m_bit(other.m_bit) {
- }
- Iterator(IntTy val, int bit) : m_val(val), m_bit(bit) {
- }
+ Iterator(const Iterator& other) : m_val(other.m_val), m_bit(other.m_bit) {}
+ Iterator(IntTy val, int bit) : m_val(val), m_bit(bit) {}
Iterator& operator=(Iterator other) {
new (this) Iterator(other);
return *this;
@@ -160,10 +156,8 @@ public:
int m_bit;
};
- BitSet() : m_val(0) {
- }
- explicit BitSet(IntTy val) : m_val(val) {
- }
+ BitSet() : m_val(0) {}
+ explicit BitSet(IntTy val) : m_val(val) {}
BitSet(std::initializer_list<int> init) {
m_val = 0;
for (int bit : init)
diff --git a/src/common/chunk_file.h b/src/common/chunk_file.h
index 3b36c0a9e..2bf3c774b 100644
--- a/src/common/chunk_file.h
+++ b/src/common/chunk_file.h
@@ -50,8 +50,7 @@ class PointerWrap;
class PointerWrapSection {
public:
PointerWrapSection(PointerWrap& p, int ver, const char* title)
- : p_(p), ver_(ver), title_(title) {
- }
+ : p_(p), ver_(ver), title_(title) {}
~PointerWrapSection();
bool operator==(const int& v) const {
@@ -134,11 +133,9 @@ public:
Error error;
public:
- PointerWrap(u8** ptr_, Mode mode_) : ptr(ptr_), mode(mode_), error(ERROR_NONE) {
- }
+ PointerWrap(u8** ptr_, Mode mode_) : ptr(ptr_), mode(mode_), error(ERROR_NONE) {}
PointerWrap(unsigned char** ptr_, int mode_)
- : ptr((u8**)ptr_), mode((Mode)mode_), error(ERROR_NONE) {
- }
+ : ptr((u8**)ptr_), mode((Mode)mode_), error(ERROR_NONE) {}
PointerWrapSection Section(const char* title, int ver) {
return Section(title, ver, ver);
diff --git a/src/common/code_block.h b/src/common/code_block.h
index 58696737e..099088925 100644
--- a/src/common/code_block.h
+++ b/src/common/code_block.h
@@ -27,8 +27,7 @@ protected:
size_t region_size;
public:
- CodeBlock() : region(nullptr), region_size(0) {
- }
+ CodeBlock() : region(nullptr), region_size(0) {}
virtual ~CodeBlock() {
if (region)
FreeCodeSpace();
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index ad5bdbc08..7032c2117 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -86,8 +86,7 @@ inline u64 _rotr64(u64 x, unsigned int shift) {
extern "C" {
__declspec(dllimport) void __stdcall DebugBreak(void);
}
-#define Crash() \
- { DebugBreak(); }
+#define Crash() DebugBreak()
// cstdlib provides these on MSVC
#define rotr _rotr
diff --git a/src/common/emu_window.h b/src/common/emu_window.h
index de8badd4f..20131300d 100644
--- a/src/common/emu_window.h
+++ b/src/common/emu_window.h
@@ -229,8 +229,7 @@ protected:
circle_pad_y = 0;
touch_pressed = false;
}
- virtual ~EmuWindow() {
- }
+ virtual ~EmuWindow() {}
/**
* Processes any pending configuration changes from the last SetConfig call.
@@ -272,8 +271,8 @@ private:
* For the request to be honored, EmuWindow implementations will usually reimplement this
* function.
*/
- virtual void
- OnMinimalClientAreaChangeRequest(const std::pair<unsigned, unsigned>& minimal_size) {
+ virtual void OnMinimalClientAreaChangeRequest(
+ const std::pair<unsigned, unsigned>& minimal_size) {
// By default, ignore this request and do nothing.
}
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index c8723a4b3..96afe2ca0 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -828,8 +828,7 @@ void SplitFilename83(const std::string& filename, std::array<char, 9>& short_nam
}
}
-IOFile::IOFile() {
-}
+IOFile::IOFile() {}
IOFile::IOFile(const std::string& filename, const char openmode[]) {
Open(filename, openmode);
diff --git a/src/common/math_util.h b/src/common/math_util.h
index 696bd43ea..41d89666c 100644
--- a/src/common/math_util.h
+++ b/src/common/math_util.h
@@ -27,12 +27,10 @@ struct Rectangle {
T right;
T bottom;
- Rectangle() {
- }
+ Rectangle() {}
Rectangle(T left, T top, T right, T bottom)
- : left(left), top(top), right(right), bottom(bottom) {
- }
+ : left(left), top(top), right(right), bottom(bottom) {}
T GetWidth() const {
return std::abs(static_cast<typename std::make_signed<T>::type>(right - left));
diff --git a/src/common/profiler.cpp b/src/common/profiler.cpp
index 992ec25b2..231a0afc1 100644
--- a/src/common/profiler.cpp
+++ b/src/common/profiler.cpp
@@ -14,8 +14,7 @@ namespace Common {
namespace Profiling {
ProfilingManager::ProfilingManager()
- : last_frame_end(Clock::now()), this_frame_start(Clock::now()) {
-}
+ : last_frame_end(Clock::now()), this_frame_start(Clock::now()) {}
void ProfilingManager::BeginFrame() {
this_frame_start = Clock::now();
diff --git a/src/common/scope_exit.h b/src/common/scope_exit.h
index 73b2a262e..072ab285d 100644
--- a/src/common/scope_exit.h
+++ b/src/common/scope_exit.h
@@ -10,8 +10,7 @@
namespace detail {
template <typename Func>
struct ScopeExitHelper {
- explicit ScopeExitHelper(Func&& func) : func(std::move(func)) {
- }
+ explicit ScopeExitHelper(Func&& func) : func(std::move(func)) {}
~ScopeExitHelper() {
func();
}
diff --git a/src/common/swap.h b/src/common/swap.h
index 1794144fb..72c50d789 100644
--- a/src/common/swap.h
+++ b/src/common/swap.h
@@ -168,8 +168,7 @@ public:
return swap(value);
}
swap_struct_t() = default;
- swap_struct_t(const T& v) : value(swap(v)) {
- }
+ swap_struct_t(const T& v) : value(swap(v)) {}
template <typename S>
swapped_t& operator=(const S& source) {
diff --git a/src/common/synchronized_wrapper.h b/src/common/synchronized_wrapper.h
index 8dc4ddeac..04b4f2e51 100644
--- a/src/common/synchronized_wrapper.h
+++ b/src/common/synchronized_wrapper.h
@@ -19,8 +19,7 @@ template <typename T>
class SynchronizedWrapper {
public:
template <typename... Args>
- SynchronizedWrapper(Args&&... args) : data(std::forward<Args>(args)...) {
- }
+ SynchronizedWrapper(Args&&... args) : data(std::forward<Args>(args)...) {}
private:
template <typename U>
diff --git a/src/common/thread.h b/src/common/thread.h
index b189dc764..499c151c2 100644
--- a/src/common/thread.h
+++ b/src/common/thread.h
@@ -39,8 +39,7 @@ void SetCurrentThreadAffinity(u32 mask);
class Event {
public:
- Event() : is_set(false) {
- }
+ Event() : is_set(false) {}
void Set() {
std::lock_guard<std::mutex> lk(mutex);
@@ -71,8 +70,7 @@ private:
class Barrier {
public:
- explicit Barrier(size_t count_) : count(count_), waiting(0), generation(0) {
- }
+ explicit Barrier(size_t count_) : count(count_), waiting(0), generation(0) {}
/// Blocks until all "count" threads have called Sync()
void Sync() {
diff --git a/src/common/vector_math.h b/src/common/vector_math.h
index b2d630829..2d56f168c 100644
--- a/src/common/vector_math.h
+++ b/src/common/vector_math.h
@@ -60,10 +60,8 @@ public:
}
Vec2() = default;
- Vec2(const T a[2]) : x(a[0]), y(a[1]) {
- }
- Vec2(const T& _x, const T& _y) : x(_x), y(_y) {
- }
+ Vec2(const T a[2]) : x(a[0]), y(a[1]) {}
+ Vec2(const T& _x, const T& _y) : x(_x), y(_y) {}
template <typename T2>
Vec2<T2> Cast() const {
@@ -201,10 +199,8 @@ public:
}
Vec3() = default;
- Vec3(const T a[3]) : x(a[0]), y(a[1]), z(a[2]) {
- }
- Vec3(const T& _x, const T& _y, const T& _z) : x(_x), y(_y), z(_z) {
- }
+ Vec3(const T a[3]) : x(a[0]), y(a[1]), z(a[2]) {}
+ Vec3(const T& _x, const T& _y, const T& _z) : x(_x), y(_y), z(_z) {}
template <typename T2>
Vec3<T2> Cast() const {
@@ -409,10 +405,8 @@ public:
}
Vec4() = default;
- Vec4(const T a[4]) : x(a[0]), y(a[1]), z(a[2]), w(a[3]) {
- }
- Vec4(const T& _x, const T& _y, const T& _z, const T& _w) : x(_x), y(_y), z(_z), w(_w) {
- }
+ Vec4(const T a[4]) : x(a[0]), y(a[1]), z(a[2]), w(a[3]) {}
+ Vec4(const T& _x, const T& _y, const T& _z, const T& _w) : x(_x), y(_y), z(_z), w(_w) {}
template <typename T2>
Vec4<T2> Cast() const {
diff --git a/src/common/x64/emitter.cpp b/src/common/x64/emitter.cpp
index 1a9fd6a6b..7cf350b4a 100644
--- a/src/common/x64/emitter.cpp
+++ b/src/common/x64/emitter.cpp
@@ -222,7 +222,7 @@ void OpArg::WriteVex(XEmitter* emit, X64Reg regOp1, X64Reg regOp2, int L, int pp
void OpArg::WriteRest(XEmitter* emit, int extraBytes, X64Reg _operandReg,
bool warn_64bit_offset) const {
if (_operandReg == INVALID_REG)
- _operandReg = (X64Reg) this->operandReg;
+ _operandReg = (X64Reg)this->operandReg;
int mod = 0;
int ireg = indexReg;
bool SIB = false;
diff --git a/src/common/x64/emitter.h b/src/common/x64/emitter.h
index 467f7812f..6c9dc3d6b 100644
--- a/src/common/x64/emitter.h
+++ b/src/common/x64/emitter.h
@@ -233,8 +233,7 @@ struct OpArg {
constexpr OpArg() = default; // dummy op arg, used for storage
constexpr OpArg(u64 offset_, int scale_, X64Reg rmReg = RAX, X64Reg scaledReg = RAX)
: scale(static_cast<u8>(scale_)), offsetOrBaseReg(static_cast<u16>(rmReg)),
- indexReg(static_cast<u16>(scaledReg)), offset(offset_) {
- }
+ indexReg(static_cast<u16>(scaledReg)), offset(offset_) {}
constexpr bool operator==(const OpArg& b) const {
return operandReg == b.operandReg && scale == b.scale &&
@@ -454,8 +453,7 @@ public:
code = code_ptr;
flags_locked = false;
}
- virtual ~XEmitter() {
- }
+ virtual ~XEmitter() {}
void WriteModRM(int mod, int rm, int reg);
void WriteSIB(int scale, int index, int base);
diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h
index 919da6737..e466b21b2 100644
--- a/src/core/arm/arm_interface.h
+++ b/src/core/arm/arm_interface.h
@@ -15,8 +15,7 @@ struct ThreadContext;
/// Generic ARM11 CPU interface
class ARM_Interface : NonCopyable {
public:
- virtual ~ARM_Interface() {
- }
+ virtual ~ARM_Interface() {}
/**
* Runs the CPU for the given number of instructions
diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp
index d84917529..912560402 100644
--- a/src/core/arm/dyncom/arm_dyncom.cpp
+++ b/src/core/arm/dyncom/arm_dyncom.cpp
@@ -21,8 +21,7 @@ ARM_DynCom::ARM_DynCom(PrivilegeMode initial_mode) {
state = std::make_unique<ARMul_State>(initial_mode);
}
-ARM_DynCom::~ARM_DynCom() {
-}
+ARM_DynCom::~ARM_DynCom() {}
void ARM_DynCom::ClearInstructionCache() {
state->instruction_cache.clear();
diff --git a/src/core/arm/dyncom/arm_dyncom_trans.cpp b/src/core/arm/dyncom/arm_dyncom_trans.cpp
index e056d890c..526cf28f3 100644
--- a/src/core/arm/dyncom/arm_dyncom_trans.cpp
+++ b/src/core/arm/dyncom/arm_dyncom_trans.cpp
@@ -1883,6 +1883,7 @@ const transop_fp_t arm_instruction_trans[] = {
// All the thumb instructions should be placed the end of table
INTERPRETER_TRANSLATE(b_2_thumb), INTERPRETER_TRANSLATE(b_cond_thumb),
INTERPRETER_TRANSLATE(bl_1_thumb), INTERPRETER_TRANSLATE(bl_2_thumb),
- INTERPRETER_TRANSLATE(blx_1_thumb)};
+ INTERPRETER_TRANSLATE(blx_1_thumb),
+};
const size_t arm_instruction_trans_len = sizeof(arm_instruction_trans) / sizeof(transop_fp_t);
diff --git a/src/core/arm/skyeye_common/armstate.h b/src/core/arm/skyeye_common/armstate.h
index 66567c285..f31fb207c 100644
--- a/src/core/arm/skyeye_common/armstate.h
+++ b/src/core/arm/skyeye_common/armstate.h
@@ -237,10 +237,8 @@ private:
void ResetMPCoreCP15Registers();
// Defines a reservation granule of 2 words, which protects the first 2 words starting at the
- // tag.
- // This is the smallest granule allowed by the v7 spec, and is coincidentally just large enough
- // to
- // support LDR/STREXD.
+ // tag. This is the smallest granule allowed by the v7 spec, and is coincidentally just large
+ // enough to support LDR/STREXD.
static const u32 RESERVATION_GRANULE_MASK = 0xFFFFFFF8;
u32 exclusive_tag; // The address for which the local monitor is in exclusive access mode
diff --git a/src/core/arm/skyeye_common/vfp/vfpdouble.cpp b/src/core/arm/skyeye_common/vfp/vfpdouble.cpp
index 4d89743e7..2886f351f 100644
--- a/src/core/arm/skyeye_common/vfp/vfpdouble.cpp
+++ b/src/core/arm/skyeye_common/vfp/vfpdouble.cpp
@@ -51,10 +51,10 @@
* ===========================================================================
*/
-#include "core/arm/skyeye_common/vfp/vfp.h"
#include <algorithm>
#include "common/logging/log.h"
#include "core/arm/skyeye_common/vfp/asm_vfp.h"
+#include "core/arm/skyeye_common/vfp/vfp.h"
#include "core/arm/skyeye_common/vfp/vfp_helper.h"
static struct vfp_double vfp_double_default_qnan = {
diff --git a/src/core/arm/skyeye_common/vfp/vfpsingle.cpp b/src/core/arm/skyeye_common/vfp/vfpsingle.cpp
index 3c21efe62..bf157e2c3 100644
--- a/src/core/arm/skyeye_common/vfp/vfpsingle.cpp
+++ b/src/core/arm/skyeye_common/vfp/vfpsingle.cpp
@@ -280,13 +280,15 @@ static u32 vfp_single_fneg(ARMul_State* state, int sd, int unused, s32 m, u32 fp
return 0;
}
-static const u16 sqrt_oddadjust[] = {0x0004, 0x0022, 0x005d, 0x00b1, 0x011d, 0x019f,
- 0x0236, 0x02e0, 0x039c, 0x0468, 0x0545, 0x0631,
- 0x072b, 0x0832, 0x0946, 0x0a67};
+static const u16 sqrt_oddadjust[] = {
+ 0x0004, 0x0022, 0x005d, 0x00b1, 0x011d, 0x019f, 0x0236, 0x02e0,
+ 0x039c, 0x0468, 0x0545, 0x0631, 0x072b, 0x0832, 0x0946, 0x0a67,
+};
-static const u16 sqrt_evenadjust[] = {0x0a2d, 0x08af, 0x075a, 0x0629, 0x051a, 0x0429,
- 0x0356, 0x029e, 0x0200, 0x0179, 0x0109, 0x00af,
- 0x0068, 0x0034, 0x0012, 0x0002};
+static const u16 sqrt_evenadjust[] = {
+ 0x0a2d, 0x08af, 0x075a, 0x0629, 0x051a, 0x0429, 0x0356, 0x029e,
+ 0x0200, 0x0179, 0x0109, 0x00af, 0x0068, 0x0034, 0x0012, 0x0002,
+};
u32 vfp_estimate_sqrt_significand(u32 exponent, u32 significand) {
int index;
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 4f9eca416..71a13dd33 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -28,8 +28,7 @@ void RunLoop(int tight_loop) {
GDBStub::HandlePacket();
// If the loop is halted and we want to step, use a tiny (1) number of instructions to
- // execute.
- // Otherwise get out of the loop function.
+ // execute. Otherwise, get out of the loop function.
if (GDBStub::GetCpuHaltFlag()) {
if (GDBStub::GetCpuStepFlag()) {
GDBStub::SetCpuStepFlag(false);
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index b7b988cf1..fb88ecaf2 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -23,11 +23,9 @@ int g_clock_rate_arm11 = 268123480;
namespace CoreTiming {
struct EventType {
- EventType() {
- }
+ EventType() {}
- EventType(TimedCallback cb, const char* n) : callback(cb), name(n) {
- }
+ EventType(TimedCallback cb, const char* n) : callback(cb), name(n) {}
TimedCallback callback;
const char* name;
diff --git a/src/core/file_sys/archive_backend.h b/src/core/file_sys/archive_backend.h
index 79fde9710..7f64fe4e2 100644
--- a/src/core/file_sys/archive_backend.h
+++ b/src/core/file_sys/archive_backend.h
@@ -21,7 +21,13 @@ class FileBackend;
class DirectoryBackend;
// Path string type
-enum LowPathType : u32 { Invalid = 0, Empty = 1, Binary = 2, Char = 3, Wchar = 4 };
+enum LowPathType : u32 {
+ Invalid = 0,
+ Empty = 1,
+ Binary = 2,
+ Char = 3,
+ Wchar = 4,
+};
union Mode {
u32 hex;
@@ -32,12 +38,9 @@ union Mode {
class Path {
public:
- Path() : type(Invalid) {
- }
- Path(const char* path) : type(Char), string(path) {
- }
- Path(std::vector<u8> binary_data) : type(Binary), binary(std::move(binary_data)) {
- }
+ Path() : type(Invalid) {}
+ Path(const char* path) : type(Char), string(path) {}
+ Path(std::vector<u8> binary_data) : type(Binary), binary(std::move(binary_data)) {}
Path(LowPathType type, u32 size, u32 pointer);
LowPathType GetType() const {
@@ -61,22 +64,18 @@ private:
std::u16string u16str;
};
+/// Parameters of the archive, as specified in the Create or Format call.
struct ArchiveFormatInfo {
- u32_le total_size; ///< The pre-defined size of the archive, as specified in the Create or
- /// Format call
- u32_le number_directories; ///< The pre-defined number of directories in the archive, as
- /// specified in the Create or Format call
- u32_le number_files; ///< The pre-defined number of files in the archive, as specified in the
- /// Create or Format call
- u8 duplicate_data; ///< Whether the archive should duplicate the data, as specified in the
- /// Create or Format call
+ u32_le total_size; ///< The pre-defined size of the archive.
+ u32_le number_directories; ///< The pre-defined number of directories in the archive.
+ u32_le number_files; ///< The pre-defined number of files in the archive.
+ u8 duplicate_data; ///< Whether the archive should duplicate the data.
};
static_assert(std::is_pod<ArchiveFormatInfo>::value, "ArchiveFormatInfo is not POD");
class ArchiveBackend : NonCopyable {
public:
- virtual ~ArchiveBackend() {
- }
+ virtual ~ArchiveBackend() {}
/**
* Get a descriptive name for the archive (e.g. "RomFS", "SaveData", etc.)
@@ -153,8 +152,7 @@ public:
class ArchiveFactory : NonCopyable {
public:
- virtual ~ArchiveFactory() {
- }
+ virtual ~ArchiveFactory() {}
/**
* Get a descriptive name for the archive (e.g. "RomFS", "SaveData", etc.)
diff --git a/src/core/file_sys/archive_savedata.cpp b/src/core/file_sys/archive_savedata.cpp
index 9a264091f..860f2fca8 100644
--- a/src/core/file_sys/archive_savedata.cpp
+++ b/src/core/file_sys/archive_savedata.cpp
@@ -48,11 +48,10 @@ ResultVal<std::unique_ptr<ArchiveBackend>> ArchiveFactory_SaveData::Open(const P
std::string concrete_mount_point =
GetSaveDataPath(mount_point, Kernel::g_current_process->codeset->program_id);
if (!FileUtil::Exists(concrete_mount_point)) {
- // When a SaveData archive is created for the first time, it is not yet formatted
- // and the save file/directory structure expected by the game has not yet been initialized.
+ // When a SaveData archive is created for the first time, it is not yet formatted and the
+ // save file/directory structure expected by the game has not yet been initialized.
// Returning the NotFormatted error code will signal the game to provision the SaveData
- // archive
- // with the files and folders that it expects.
+ // archive with the files and folders that it expects.
return ResultCode(ErrorDescription::FS_NotFormatted, ErrorModule::FS,
ErrorSummary::InvalidState, ErrorLevel::Status);
}
diff --git a/src/core/file_sys/archive_savedatacheck.cpp b/src/core/file_sys/archive_savedatacheck.cpp
index fd9b84302..50fe004fe 100644
--- a/src/core/file_sys/archive_savedatacheck.cpp
+++ b/src/core/file_sys/archive_savedatacheck.cpp
@@ -30,8 +30,7 @@ static std::string GetSaveDataCheckPath(const std::string& mount_point, u32 high
}
ArchiveFactory_SaveDataCheck::ArchiveFactory_SaveDataCheck(const std::string& nand_directory)
- : mount_point(GetSaveDataCheckContainerPath(nand_directory)) {
-}
+ : mount_point(GetSaveDataCheckContainerPath(nand_directory)) {}
ResultVal<std::unique_ptr<ArchiveBackend>> ArchiveFactory_SaveDataCheck::Open(const Path& path) {
auto vec = path.AsBinary();
diff --git a/src/core/file_sys/archive_systemsavedata.cpp b/src/core/file_sys/archive_systemsavedata.cpp
index 1fb858247..0261ab547 100644
--- a/src/core/file_sys/archive_systemsavedata.cpp
+++ b/src/core/file_sys/archive_systemsavedata.cpp
@@ -49,8 +49,7 @@ Path ConstructSystemSaveDataBinaryPath(u32 high, u32 low) {
}
ArchiveFactory_SystemSaveData::ArchiveFactory_SystemSaveData(const std::string& nand_path)
- : base_path(GetSystemSaveDataContainerPath(nand_path)) {
-}
+ : base_path(GetSystemSaveDataContainerPath(nand_path)) {}
ResultVal<std::unique_ptr<ArchiveBackend>> ArchiveFactory_SystemSaveData::Open(const Path& path) {
std::string fullpath = GetSystemSaveDataPath(base_path, path);
diff --git a/src/core/file_sys/directory_backend.h b/src/core/file_sys/directory_backend.h
index c402ee60b..9706e909b 100644
--- a/src/core/file_sys/directory_backend.h
+++ b/src/core/file_sys/directory_backend.h
@@ -38,10 +38,8 @@ static_assert(offsetof(Entry, file_size) == 0x220, "Wrong offset for file_size i
class DirectoryBackend : NonCopyable {
public:
- DirectoryBackend() {
- }
- virtual ~DirectoryBackend() {
- }
+ DirectoryBackend() {}
+ virtual ~DirectoryBackend() {}
/**
* Open the directory
diff --git a/src/core/file_sys/disk_archive.h b/src/core/file_sys/disk_archive.h
index 3f620128f..64e36f5ea 100644
--- a/src/core/file_sys/disk_archive.h
+++ b/src/core/file_sys/disk_archive.h
@@ -29,8 +29,7 @@ namespace FileSys {
*/
class DiskArchive : public ArchiveBackend {
public:
- DiskArchive(const std::string& mount_point_) : mount_point(mount_point_) {
- }
+ DiskArchive(const std::string& mount_point_) : mount_point(mount_point_) {}
virtual std::string GetName() const override {
return "DiskArchive: " + mount_point;
diff --git a/src/core/file_sys/file_backend.h b/src/core/file_sys/file_backend.h
index 9eae697c2..3496facd4 100644
--- a/src/core/file_sys/file_backend.h
+++ b/src/core/file_sys/file_backend.h
@@ -16,10 +16,8 @@ namespace FileSys {
class FileBackend : NonCopyable {
public:
- FileBackend() {
- }
- virtual ~FileBackend() {
- }
+ FileBackend() {}
+ virtual ~FileBackend() {}
/**
* Open the file
diff --git a/src/core/file_sys/ivfc_archive.h b/src/core/file_sys/ivfc_archive.h
index dab1958f6..0d15550da 100644
--- a/src/core/file_sys/ivfc_archive.h
+++ b/src/core/file_sys/ivfc_archive.h
@@ -30,8 +30,7 @@ namespace FileSys {
class IVFCArchive : public ArchiveBackend {
public:
IVFCArchive(std::shared_ptr<FileUtil::IOFile> file, u64 offset, u64 size)
- : romfs_file(file), data_offset(offset), data_size(size) {
- }
+ : romfs_file(file), data_offset(offset), data_size(size) {}
std::string GetName() const override;
@@ -55,8 +54,7 @@ protected:
class IVFCFile : public FileBackend {
public:
IVFCFile(std::shared_ptr<FileUtil::IOFile> file, u64 offset, u64 size)
- : romfs_file(file), data_offset(offset), data_size(size) {
- }
+ : romfs_file(file), data_offset(offset), data_size(size) {}
ResultCode Open() override {
return RESULT_SUCCESS;
@@ -68,8 +66,7 @@ public:
bool Close() const override {
return false;
}
- void Flush() const override {
- }
+ void Flush() const override {}
private:
std::shared_ptr<FileUtil::IOFile> romfs_file;
diff --git a/src/core/hle/applets/applet.h b/src/core/hle/applets/applet.h
index 350a58594..1850ad261 100644
--- a/src/core/hle/applets/applet.h
+++ b/src/core/hle/applets/applet.h
@@ -14,10 +14,8 @@ namespace Applets {
class Applet {
public:
- virtual ~Applet() {
- }
- Applet(Service::APT::AppletId id) : id(id) {
- }
+ virtual ~Applet() {}
+ Applet(Service::APT::AppletId id) : id(id) {}
/**
* Creates an instance of the Applet subclass identified by the parameter.
diff --git a/src/core/hle/applets/erreula.cpp b/src/core/hle/applets/erreula.cpp
index 144d6a152..457cbb1bd 100644
--- a/src/core/hle/applets/erreula.cpp
+++ b/src/core/hle/applets/erreula.cpp
@@ -67,8 +67,7 @@ ResultCode ErrEula::StartImpl(const Service::APT::AppletStartupParameter& parame
return RESULT_SUCCESS;
}
-void ErrEula::Update() {
-}
+void ErrEula::Update() {}
} // namespace Applets
} // namespace HLE
diff --git a/src/core/hle/applets/erreula.h b/src/core/hle/applets/erreula.h
index dd1d1aee4..a7ec7ec01 100644
--- a/src/core/hle/applets/erreula.h
+++ b/src/core/hle/applets/erreula.h
@@ -12,8 +12,7 @@ namespace Applets {
class ErrEula final : public Applet {
public:
- explicit ErrEula(Service::APT::AppletId id) : Applet(id) {
- }
+ explicit ErrEula(Service::APT::AppletId id) : Applet(id) {}
ResultCode ReceiveParameter(const Service::APT::MessageParameter& parameter) override;
ResultCode StartImpl(const Service::APT::AppletStartupParameter& parameter) override;
diff --git a/src/core/hle/applets/mii_selector.cpp b/src/core/hle/applets/mii_selector.cpp
index 19e603eda..79264d349 100644
--- a/src/core/hle/applets/mii_selector.cpp
+++ b/src/core/hle/applets/mii_selector.cpp
@@ -85,7 +85,6 @@ ResultCode MiiSelector::StartImpl(const Service::APT::AppletStartupParameter& pa
return RESULT_SUCCESS;
}
-void MiiSelector::Update() {
-}
+void MiiSelector::Update() {}
}
} // namespace
diff --git a/src/core/hle/applets/mii_selector.h b/src/core/hle/applets/mii_selector.h
index dba4abc8d..26966a271 100644
--- a/src/core/hle/applets/mii_selector.h
+++ b/src/core/hle/applets/mii_selector.h
@@ -66,8 +66,7 @@ ASSERT_REG_POSITION(unk_6C, 0x6C);
class MiiSelector final : public Applet {
public:
- MiiSelector(Service::APT::AppletId id) : Applet(id), started(false) {
- }
+ MiiSelector(Service::APT::AppletId id) : Applet(id), started(false) {}
ResultCode ReceiveParameter(const Service::APT::MessageParameter& parameter) override;
ResultCode StartImpl(const Service::APT::AppletStartupParameter& parameter) override;
diff --git a/src/core/hle/applets/swkbd.h b/src/core/hle/applets/swkbd.h
index f50673912..4e2f9de62 100644
--- a/src/core/hle/applets/swkbd.h
+++ b/src/core/hle/applets/swkbd.h
@@ -53,8 +53,7 @@ static_assert(sizeof(SoftwareKeyboardConfig) == 0x400, "Software Keyboard Config
class SoftwareKeyboard final : public Applet {
public:
- SoftwareKeyboard(Service::APT::AppletId id) : Applet(id), started(false) {
- }
+ SoftwareKeyboard(Service::APT::AppletId id) : Applet(id), started(false) {}
ResultCode ReceiveParameter(const Service::APT::MessageParameter& parameter) override;
ResultCode StartImpl(const Service::APT::AppletStartupParameter& parameter) override;
diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp
index 2ff652f13..3506c2d48 100644
--- a/src/core/hle/kernel/address_arbiter.cpp
+++ b/src/core/hle/kernel/address_arbiter.cpp
@@ -16,10 +16,8 @@
namespace Kernel {
-AddressArbiter::AddressArbiter() {
-}
-AddressArbiter::~AddressArbiter() {
-}
+AddressArbiter::AddressArbiter() {}
+AddressArbiter::~AddressArbiter() {}
SharedPtr<AddressArbiter> AddressArbiter::Create(std::string name) {
SharedPtr<AddressArbiter> address_arbiter(new AddressArbiter);
diff --git a/src/core/hle/kernel/client_port.cpp b/src/core/hle/kernel/client_port.cpp
index 5df769c6a..444ce8d45 100644
--- a/src/core/hle/kernel/client_port.cpp
+++ b/src/core/hle/kernel/client_port.cpp
@@ -10,9 +10,7 @@
namespace Kernel {
-ClientPort::ClientPort() {
-}
-ClientPort::~ClientPort() {
-}
+ClientPort::ClientPort() {}
+ClientPort::~ClientPort() {}
} // namespace
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp
index 63375818d..f056eb7c3 100644
--- a/src/core/hle/kernel/event.cpp
+++ b/src/core/hle/kernel/event.cpp
@@ -14,10 +14,8 @@
namespace Kernel {
-Event::Event() {
-}
-Event::~Event() {
-}
+Event::Event() {}
+Event::~Event() {}
SharedPtr<Event> Event::Create(ResetType reset_type, std::string name) {
SharedPtr<Event> evt(new Event);
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h
index cc39652d5..c683fcb80 100644
--- a/src/core/hle/kernel/kernel.h
+++ b/src/core/hle/kernel/kernel.h
@@ -58,8 +58,7 @@ enum {
class Object : NonCopyable {
public:
- virtual ~Object() {
- }
+ virtual ~Object() {}
/// Returns a unique identifier for the object. For debugging purposes only.
unsigned int GetObjectId() const {
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp
index f92810804..edb97d324 100644
--- a/src/core/hle/kernel/mutex.cpp
+++ b/src/core/hle/kernel/mutex.cpp
@@ -33,10 +33,8 @@ void ReleaseThreadMutexes(Thread* thread) {
thread->held_mutexes.clear();
}
-Mutex::Mutex() {
-}
-Mutex::~Mutex() {
-}
+Mutex::Mutex() {}
+Mutex::~Mutex() {}
SharedPtr<Mutex> Mutex::Create(bool initial_locked, std::string name) {
SharedPtr<Mutex> mutex(new Mutex);
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp
index cc37e574c..b764f750f 100644
--- a/src/core/hle/kernel/process.cpp
+++ b/src/core/hle/kernel/process.cpp
@@ -26,10 +26,8 @@ SharedPtr<CodeSet> CodeSet::Create(std::string name, u64 program_id) {
return codeset;
}
-CodeSet::CodeSet() {
-}
-CodeSet::~CodeSet() {
-}
+CodeSet::CodeSet() {}
+CodeSet::~CodeSet() {}
u32 Process::next_process_id;
@@ -282,10 +280,8 @@ ResultCode Process::LinearFree(VAddr target, u32 size) {
return RESULT_SUCCESS;
}
-Kernel::Process::Process() {
-}
-Kernel::Process::~Process() {
-}
+Kernel::Process::Process() {}
+Kernel::Process::~Process() {}
SharedPtr<Process> g_current_process;
}
diff --git a/src/core/hle/kernel/resource_limit.cpp b/src/core/hle/kernel/resource_limit.cpp
index 7bd1c1e08..bb0baed6f 100644
--- a/src/core/hle/kernel/resource_limit.cpp
+++ b/src/core/hle/kernel/resource_limit.cpp
@@ -12,10 +12,8 @@ namespace Kernel {
static SharedPtr<ResourceLimit> resource_limits[4];
-ResourceLimit::ResourceLimit() {
-}
-ResourceLimit::~ResourceLimit() {
-}
+ResourceLimit::ResourceLimit() {}
+ResourceLimit::~ResourceLimit() {}
SharedPtr<ResourceLimit> ResourceLimit::Create(std::string name) {
SharedPtr<ResourceLimit> resource_limit(new ResourceLimit);
@@ -150,7 +148,6 @@ void ResourceLimitsInit() {
resource_limits[static_cast<u8>(ResourceLimitCategory::OTHER)] = resource_limit;
}
-void ResourceLimitsShutdown() {
-}
+void ResourceLimitsShutdown() {}
} // namespace
diff --git a/src/core/hle/kernel/resource_limit.h b/src/core/hle/kernel/resource_limit.h
index c08e744e6..5d8b31a2d 100644
--- a/src/core/hle/kernel/resource_limit.h
+++ b/src/core/hle/kernel/resource_limit.h
@@ -92,8 +92,8 @@ public:
s32 max_cpu_time = 0;
// TODO(Subv): Increment these in their respective Kernel::T::Create functions, keeping in mind
- // that
- // APPLICATION resource limits should not be affected by the objects created by service modules.
+ // that APPLICATION resource limits should not be affected by the objects created by service
+ // modules.
// Currently we have no way of distinguishing if a Create was called by the running application,
// or by a service module. Approach this once we have separated the service modules into their
// own processes
diff --git a/src/core/hle/kernel/semaphore.cpp b/src/core/hle/kernel/semaphore.cpp
index 71e41079b..16ac22f1d 100644
--- a/src/core/hle/kernel/semaphore.cpp
+++ b/src/core/hle/kernel/semaphore.cpp
@@ -10,10 +10,8 @@
namespace Kernel {
-Semaphore::Semaphore() {
-}
-Semaphore::~Semaphore() {
-}
+Semaphore::Semaphore() {}
+Semaphore::~Semaphore() {}
ResultVal<SharedPtr<Semaphore>> Semaphore::Create(s32 initial_count, s32 max_count,
std::string name) {
diff --git a/src/core/hle/kernel/server_port.cpp b/src/core/hle/kernel/server_port.cpp
index 7c690fa7f..57e93cad4 100644
--- a/src/core/hle/kernel/server_port.cpp
+++ b/src/core/hle/kernel/server_port.cpp
@@ -13,10 +13,8 @@
namespace Kernel {
-ServerPort::ServerPort() {
-}
-ServerPort::~ServerPort() {
-}
+ServerPort::ServerPort() {}
+ServerPort::~ServerPort() {}
bool ServerPort::ShouldWait() {
// If there are no pending sessions, we wait until a new one is added.
@@ -27,8 +25,9 @@ void ServerPort::Acquire() {
ASSERT_MSG(!ShouldWait(), "object unavailable!");
}
-std::tuple<SharedPtr<ServerPort>, SharedPtr<ClientPort>>
-ServerPort::CreatePortPair(u32 max_sessions, std::string name) {
+std::tuple<SharedPtr<ServerPort>, SharedPtr<ClientPort>> ServerPort::CreatePortPair(
+ u32 max_sessions, std::string name) {
+
SharedPtr<ServerPort> server_port(new ServerPort);
SharedPtr<ClientPort> client_port(new ClientPort);
diff --git a/src/core/hle/kernel/server_port.h b/src/core/hle/kernel/server_port.h
index e43d48674..c3f2ae177 100644
--- a/src/core/hle/kernel/server_port.h
+++ b/src/core/hle/kernel/server_port.h
@@ -23,8 +23,8 @@ public:
* @param name Optional name of the ports
* @return The created port tuple
*/
- static std::tuple<SharedPtr<ServerPort>, SharedPtr<ClientPort>>
- CreatePortPair(u32 max_sessions, std::string name = "UnknownPort");
+ static std::tuple<SharedPtr<ServerPort>, SharedPtr<ClientPort>> CreatePortPair(
+ u32 max_sessions, std::string name = "UnknownPort");
std::string GetTypeName() const override {
return "ServerPort";
diff --git a/src/core/hle/kernel/session.cpp b/src/core/hle/kernel/session.cpp
index 61457845a..8a2a7e3fd 100644
--- a/src/core/hle/kernel/session.cpp
+++ b/src/core/hle/kernel/session.cpp
@@ -7,8 +7,6 @@
namespace Kernel {
-Session::Session() {
-}
-Session::~Session() {
-}
+Session::Session() {}
+Session::~Session() {}
}
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp
index 74f40930c..bf511a338 100644
--- a/src/core/hle/kernel/shared_memory.cpp
+++ b/src/core/hle/kernel/shared_memory.cpp
@@ -12,10 +12,8 @@
namespace Kernel {
-SharedMemory::SharedMemory() {
-}
-SharedMemory::~SharedMemory() {
-}
+SharedMemory::SharedMemory() {}
+SharedMemory::~SharedMemory() {}
SharedPtr<SharedMemory> SharedMemory::Create(SharedPtr<Process> owner_process, u32 size,
MemoryPermission permissions,
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 59272715f..0df03c9d5 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -61,10 +61,8 @@ inline static u32 const NewThreadId() {
return next_thread_id++;
}
-Thread::Thread() {
-}
-Thread::~Thread() {
-}
+Thread::Thread() {}
+Thread::~Thread() {}
Thread* GetCurrentThread() {
return current_thread;
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp
index 255cb1aca..427a81923 100644
--- a/src/core/hle/kernel/timer.cpp
+++ b/src/core/hle/kernel/timer.cpp
@@ -20,10 +20,8 @@ static int timer_callback_event_type;
// us to simply use a pool index or similar.
static Kernel::HandleTable timer_callback_handle_table;
-Timer::Timer() {
-}
-Timer::~Timer() {
-}
+Timer::Timer() {}
+Timer::~Timer() {}
SharedPtr<Timer> Timer::Create(ResetType reset_type, std::string name) {
SharedPtr<Timer> timer(new Timer);
@@ -103,7 +101,6 @@ void TimersInit() {
timer_callback_event_type = CoreTiming::RegisterEvent("TimerCallback", TimerCallback);
}
-void TimersShutdown() {
-}
+void TimersShutdown() {}
} // namespace
diff --git a/src/core/hle/result.h b/src/core/hle/result.h
index 6e3dd9cd2..492c1ffa6 100644
--- a/src/core/hle/result.h
+++ b/src/core/hle/result.h
@@ -213,8 +213,7 @@ union ResultCode {
// error
BitField<31, 1, u32> is_error;
- explicit ResultCode(u32 raw) : raw(raw) {
- }
+ explicit ResultCode(u32 raw) : raw(raw) {}
ResultCode(ErrorDescription description_, ErrorModule module_, ErrorSummary summary_,
ErrorLevel level_)
: raw(0) {
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index b653523a4..528bb1848 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -186,8 +186,7 @@ void Init() {
AddService(new AM_U_Interface);
}
-void Shutdown() {
-}
+void Shutdown() {}
} // namespace AM
diff --git a/src/core/hle/service/am/am_app.cpp b/src/core/hle/service/am/am_app.cpp
index bfc1ca6bd..827e60335 100644
--- a/src/core/hle/service/am/am_app.cpp
+++ b/src/core/hle/service/am/am_app.cpp
@@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/am/am.h"
#include "core/hle/service/am/am_app.h"
+#include "core/hle/service/am/am.h"
namespace Service {
namespace AM {
diff --git a/src/core/hle/service/am/am_net.cpp b/src/core/hle/service/am/am_net.cpp
index 3a597a34c..d9d9d78c8 100644
--- a/src/core/hle/service/am/am_net.cpp
+++ b/src/core/hle/service/am/am_net.cpp
@@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/am/am.h"
#include "core/hle/service/am/am_net.h"
+#include "core/hle/service/am/am.h"
namespace Service {
namespace AM {
diff --git a/src/core/hle/service/am/am_sys.cpp b/src/core/hle/service/am/am_sys.cpp
index 8bb58cab7..6f441f9e7 100644
--- a/src/core/hle/service/am/am_sys.cpp
+++ b/src/core/hle/service/am/am_sys.cpp
@@ -2,33 +2,35 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/am/am.h"
#include "core/hle/service/am/am_sys.h"
+#include "core/hle/service/am/am.h"
namespace Service {
namespace AM {
-const Interface::FunctionInfo FunctionTable[] = {{0x00010040, GetTitleCount, "GetTitleCount"},
- {0x00020082, GetTitleList, "GetTitleList"},
- {0x00030084, GetTitleInfo, "GetTitleInfo"},
- {0x000400C0, nullptr, "DeleteApplicationTitle"},
- {0x000500C0, nullptr, "GetTitleProductCode"},
- {0x000600C0, nullptr, "GetTitleExtDataId"},
- {0x00070080, DeleteTicket, "DeleteTicket"},
- {0x00080000, GetTicketCount, "GetTicketCount"},
- {0x00090082, GetTicketList, "GetTicketList"},
- {0x000A0000, nullptr, "GetDeviceID"},
- {0x000D0084, nullptr, "GetPendingTitleInfo"},
- {0x000E00C0, nullptr, "DeletePendingTitle"},
- {0x00140040, nullptr, "FinalizePendingTitles"},
- {0x00150040, nullptr, "DeleteAllPendingTitles"},
- {0x00180080, nullptr, "InitializeTitleDatabase"},
- {0x00190040, nullptr, "ReloadDBS"},
- {0x001A00C0, nullptr, "GetDSiWareExportSize"},
- {0x001B0144, nullptr, "ExportDSiWare"},
- {0x001C0084, nullptr, "ImportDSiWare"},
- {0x00230080, nullptr, "GetPendingTitleCount"},
- {0x002400C2, nullptr, "GetPendingTitleList"}};
+const Interface::FunctionInfo FunctionTable[] = {
+ {0x00010040, GetTitleCount, "GetTitleCount"},
+ {0x00020082, GetTitleList, "GetTitleList"},
+ {0x00030084, GetTitleInfo, "GetTitleInfo"},
+ {0x000400C0, nullptr, "DeleteApplicationTitle"},
+ {0x000500C0, nullptr, "GetTitleProductCode"},
+ {0x000600C0, nullptr, "GetTitleExtDataId"},
+ {0x00070080, DeleteTicket, "DeleteTicket"},
+ {0x00080000, GetTicketCount, "GetTicketCount"},
+ {0x00090082, GetTicketList, "GetTicketList"},
+ {0x000A0000, nullptr, "GetDeviceID"},
+ {0x000D0084, nullptr, "GetPendingTitleInfo"},
+ {0x000E00C0, nullptr, "DeletePendingTitle"},
+ {0x00140040, nullptr, "FinalizePendingTitles"},
+ {0x00150040, nullptr, "DeleteAllPendingTitles"},
+ {0x00180080, nullptr, "InitializeTitleDatabase"},
+ {0x00190040, nullptr, "ReloadDBS"},
+ {0x001A00C0, nullptr, "GetDSiWareExportSize"},
+ {0x001B0144, nullptr, "ExportDSiWare"},
+ {0x001C0084, nullptr, "ImportDSiWare"},
+ {0x00230080, nullptr, "GetPendingTitleCount"},
+ {0x002400C2, nullptr, "GetPendingTitleList"},
+};
AM_SYS_Interface::AM_SYS_Interface() {
Register(FunctionTable);
diff --git a/src/core/hle/service/am/am_u.cpp b/src/core/hle/service/am/am_u.cpp
index 32d47741f..c40e56205 100644
--- a/src/core/hle/service/am/am_u.cpp
+++ b/src/core/hle/service/am/am_u.cpp
@@ -2,46 +2,48 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/am/am.h"
#include "core/hle/service/am/am_u.h"
+#include "core/hle/service/am/am.h"
namespace Service {
namespace AM {
-const Interface::FunctionInfo FunctionTable[] = {{0x00010040, GetTitleCount, "GetTitleCount"},
- {0x00020082, GetTitleList, "GetTitleList"},
- {0x00030084, GetTitleInfo, "GetTitleInfo"},
- {0x000400C0, nullptr, "DeleteApplicationTitle"},
- {0x000500C0, nullptr, "GetTitleProductCode"},
- {0x000600C0, nullptr, "GetTitleExtDataId"},
- {0x00070080, DeleteTicket, "DeleteTicket"},
- {0x00080000, GetTicketCount, "GetTicketCount"},
- {0x00090082, GetTicketList, "GetTicketList"},
- {0x000A0000, nullptr, "GetDeviceID"},
- {0x000D0084, nullptr, "GetPendingTitleInfo"},
- {0x000E00C0, nullptr, "DeletePendingTitle"},
- {0x00140040, nullptr, "FinalizePendingTitles"},
- {0x00150040, nullptr, "DeleteAllPendingTitles"},
- {0x00180080, nullptr, "InitializeTitleDatabase"},
- {0x00190040, nullptr, "ReloadDBS"},
- {0x001A00C0, nullptr, "GetDSiWareExportSize"},
- {0x001B0144, nullptr, "ExportDSiWare"},
- {0x001C0084, nullptr, "ImportDSiWare"},
- {0x00230080, nullptr, "TitleIDListGetTotal2"},
- {0x002400C2, nullptr, "GetTitleIDList2"},
- {0x04010080, nullptr, "InstallFIRM"},
- {0x04020040, nullptr, "StartInstallCIADB0"},
- {0x04030000, nullptr, "StartInstallCIADB1"},
- {0x04040002, nullptr, "AbortCIAInstall"},
- {0x04050002, nullptr, "CloseCIAFinalizeInstall"},
- {0x04060002, nullptr, "CloseCIA"},
- {0x040700C2, nullptr, "FinalizeTitlesInstall"},
- {0x04080042, nullptr, "GetCiaFileInfo"},
- {0x040E00C2, nullptr, "InstallTitlesFinish"},
- {0x040F0000, nullptr, "InstallNATIVEFIRM"},
- {0x041000C0, nullptr, "DeleteTitle"},
- {0x04120000, nullptr, "Initialize"},
- {0x041700C0, nullptr, "MigrateAGBtoSAV"}};
+const Interface::FunctionInfo FunctionTable[] = {
+ {0x00010040, GetTitleCount, "GetTitleCount"},
+ {0x00020082, GetTitleList, "GetTitleList"},
+ {0x00030084, GetTitleInfo, "GetTitleInfo"},
+ {0x000400C0, nullptr, "DeleteApplicationTitle"},
+ {0x000500C0, nullptr, "GetTitleProductCode"},
+ {0x000600C0, nullptr, "GetTitleExtDataId"},
+ {0x00070080, DeleteTicket, "DeleteTicket"},
+ {0x00080000, GetTicketCount, "GetTicketCount"},
+ {0x00090082, GetTicketList, "GetTicketList"},
+ {0x000A0000, nullptr, "GetDeviceID"},
+ {0x000D0084, nullptr, "GetPendingTitleInfo"},
+ {0x000E00C0, nullptr, "DeletePendingTitle"},
+ {0x00140040, nullptr, "FinalizePendingTitles"},
+ {0x00150040, nullptr, "DeleteAllPendingTitles"},
+ {0x00180080, nullptr, "InitializeTitleDatabase"},
+ {0x00190040, nullptr, "ReloadDBS"},
+ {0x001A00C0, nullptr, "GetDSiWareExportSize"},
+ {0x001B0144, nullptr, "ExportDSiWare"},
+ {0x001C0084, nullptr, "ImportDSiWare"},
+ {0x00230080, nullptr, "TitleIDListGetTotal2"},
+ {0x002400C2, nullptr, "GetTitleIDList2"},
+ {0x04010080, nullptr, "InstallFIRM"},
+ {0x04020040, nullptr, "StartInstallCIADB0"},
+ {0x04030000, nullptr, "StartInstallCIADB1"},
+ {0x04040002, nullptr, "AbortCIAInstall"},
+ {0x04050002, nullptr, "CloseCIAFinalizeInstall"},
+ {0x04060002, nullptr, "CloseCIA"},
+ {0x040700C2, nullptr, "FinalizeTitlesInstall"},
+ {0x04080042, nullptr, "GetCiaFileInfo"},
+ {0x040E00C2, nullptr, "InstallTitlesFinish"},
+ {0x040F0000, nullptr, "InstallNATIVEFIRM"},
+ {0x041000C0, nullptr, "DeleteTitle"},
+ {0x04120000, nullptr, "Initialize"},
+ {0x041700C0, nullptr, "MigrateAGBtoSAV"},
+};
AM_U_Interface::AM_U_Interface() {
Register(FunctionTable);
diff --git a/src/core/hle/service/apt/apt.cpp b/src/core/hle/service/apt/apt.cpp
index c798e8752..dfc1e9c08 100644
--- a/src/core/hle/service/apt/apt.cpp
+++ b/src/core/hle/service/apt/apt.cpp
@@ -90,10 +90,8 @@ void GetSharedFont(Service::Interface* self) {
cmd_buff[0] = IPC::MakeHeader(0x44, 2, 2);
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
// Since the SharedMemory interface doesn't provide the address at which the memory was
- // allocated,
- // the real APT service calculates this address by scanning the entire address space (using
- // svcQueryMemory)
- // and searches for an allocation of the same size as the Shared Font.
+ // allocated, the real APT service calculates this address by scanning the entire address space
+ // (using svcQueryMemory) and searches for an allocation of the same size as the Shared Font.
cmd_buff[2] = target_address;
cmd_buff[3] = IPC::CopyHandleDesc();
cmd_buff[4] = Kernel::g_handle_table.Create(shared_font_mem).MoveFrom();
diff --git a/src/core/hle/service/apt/apt.h b/src/core/hle/service/apt/apt.h
index fe8b8a7b8..7597b0d3e 100644
--- a/src/core/hle/service/apt/apt.h
+++ b/src/core/hle/service/apt/apt.h
@@ -183,12 +183,10 @@ void GetAppletInfo(Service::Interface* self);
/**
* APT::IsRegistered service function. This returns whether the specified AppID is registered with
- * NS yet.
- * An AppID is "registered" once the process associated with the AppID uses APT:Enable. Home Menu
- * uses this
- * command to determine when the launched process is running and to determine when to stop using GSP
- * etc,
- * while displaying the "Nintendo 3DS" loading screen.
+ * NS yet. An AppID is "registered" once the process associated with the AppID uses APT:Enable. Home
+ * Menu uses this command to determine when the launched process is running and to determine when to
+ * stop using GSP, etc., while displaying the "Nintendo 3DS" loading screen.
+ *
* Inputs:
* 1 : AppID
* Outputs:
@@ -264,10 +262,10 @@ void GlanceParameter(Service::Interface* self);
* (same flag cleared by APT:ReceiveParameter).
* Inputs:
* 1 : Flag, when non-zero NS will compare the word after this one with a field in the NS
- * state.
+ * state.
* 2 : Unknown, this is the same as the first unknown field returned by APT:ReceiveParameter.
* 3 : Flag, when non-zero NS will compare the word after this one with a field in the NS
- * state.
+ * state.
* 4 : AppID
* Outputs:
* 0 : Return header
diff --git a/src/core/hle/service/apt/apt_a.cpp b/src/core/hle/service/apt/apt_a.cpp
index 7d47d7675..09198d52b 100644
--- a/src/core/hle/service/apt/apt_a.cpp
+++ b/src/core/hle/service/apt/apt_a.cpp
@@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/apt/apt.h"
#include "core/hle/service/apt/apt_a.h"
+#include "core/hle/service/apt/apt.h"
namespace Service {
namespace APT {
@@ -36,7 +36,8 @@ const Interface::FunctionInfo FunctionTable[] = {
{0x00550040, SetScreenCapPostPermission, "SetScreenCapPostPermission"},
{0x00560000, GetScreenCapPostPermission, "GetScreenCapPostPermission"},
{0x01010000, CheckNew3DSApp, "CheckNew3DSApp"},
- {0x01020000, CheckNew3DS, "CheckNew3DS"}};
+ {0x01020000, CheckNew3DS, "CheckNew3DS"},
+};
APT_A_Interface::APT_A_Interface() {
Register(FunctionTable);
diff --git a/src/core/hle/service/apt/apt_s.cpp b/src/core/hle/service/apt/apt_s.cpp
index 76e71669c..f5afb78e8 100644
--- a/src/core/hle/service/apt/apt_s.cpp
+++ b/src/core/hle/service/apt/apt_s.cpp
@@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/apt/apt.h"
#include "core/hle/service/apt/apt_s.h"
+#include "core/hle/service/apt/apt.h"
namespace Service {
namespace APT {
@@ -96,7 +96,8 @@ const Interface::FunctionInfo FunctionTable[] = {
{0x00560000, GetScreenCapPostPermission, "GetScreenCapPostPermission"},
{0x00580002, nullptr, "GetProgramID"},
{0x01010000, CheckNew3DSApp, "CheckNew3DSApp"},
- {0x01020000, CheckNew3DS, "CheckNew3DS"}};
+ {0x01020000, CheckNew3DS, "CheckNew3DS"},
+};
APT_S_Interface::APT_S_Interface() {
Register(FunctionTable);
diff --git a/src/core/hle/service/apt/apt_u.cpp b/src/core/hle/service/apt/apt_u.cpp
index 9c6223dd7..184534b01 100644
--- a/src/core/hle/service/apt/apt_u.cpp
+++ b/src/core/hle/service/apt/apt_u.cpp
@@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/apt/apt.h"
#include "core/hle/service/apt/apt_u.h"
+#include "core/hle/service/apt/apt.h"
namespace Service {
namespace APT {
@@ -96,7 +96,8 @@ const Interface::FunctionInfo FunctionTable[] = {
{0x00560000, GetScreenCapPostPermission, "GetScreenCapPostPermission"},
{0x00580002, nullptr, "GetProgramID"},
{0x01010000, CheckNew3DSApp, "CheckNew3DSApp"},
- {0x01020000, CheckNew3DS, "CheckNew3DS"}};
+ {0x01020000, CheckNew3DS, "CheckNew3DS"},
+};
APT_U_Interface::APT_U_Interface() {
Register(FunctionTable);
diff --git a/src/core/hle/service/boss/boss.cpp b/src/core/hle/service/boss/boss.cpp
index 867b31fbf..757a8c2c7 100644
--- a/src/core/hle/service/boss/boss.cpp
+++ b/src/core/hle/service/boss/boss.cpp
@@ -17,8 +17,7 @@ void Init() {
AddService(new BOSS_U_Interface);
}
-void Shutdown() {
-}
+void Shutdown() {}
} // namespace BOSS
diff --git a/src/core/hle/service/cam/cam.h b/src/core/hle/service/cam/cam.h
index a87183493..ec9b835f1 100644
--- a/src/core/hle/service/cam/cam.h
+++ b/src/core/hle/service/cam/cam.h
@@ -24,14 +24,31 @@ enum class CameraSelect : u8 {
In1Out1 = Out1 | In1,
Out1Out2 = Out1 | Out2,
In1Out2 = In1 | Out2,
- All = Out1 | In1 | Out2
+ All = Out1 | In1 | Out2,
};
-enum class Effect : u8 { None = 0, Mono = 1, Sepia = 2, Negative = 3, Negafilm = 4, Sepia01 = 5 };
+enum class Effect : u8 {
+ None = 0,
+ Mono = 1,
+ Sepia = 2,
+ Negative = 3,
+ Negafilm = 4,
+ Sepia01 = 5,
+};
-enum class Context : u8 { None = 0, A = 1, B = 2, Both = A | B };
+enum class Context : u8 {
+ None = 0,
+ A = 1,
+ B = 2,
+ Both = A | B,
+};
-enum class Flip : u8 { None = 0, Horizontal = 1, Vertical = 2, Reverse = 3 };
+enum class Flip : u8 {
+ None = 0,
+ Horizontal = 1,
+ Vertical = 2,
+ Reverse = 3,
+};
enum class Size : u8 {
VGA = 0,
@@ -42,7 +59,7 @@ enum class Size : u8 {
DS_LCD = 5,
DS_LCDx4 = 6,
CTR_TOP_LCD = 7,
- CTR_BOTTOM_LCD = QVGA
+ CTR_BOTTOM_LCD = QVGA,
};
enum class FrameRate : u8 {
@@ -58,10 +75,14 @@ enum class FrameRate : u8 {
Rate_30_To_5 = 9,
Rate_15_To_10 = 10,
Rate_20_To_10 = 11,
- Rate_30_To_10 = 12
+ Rate_30_To_10 = 12,
};
-enum class ShutterSoundType : u8 { Normal = 0, Movie = 1, MovieEnd = 2 };
+enum class ShutterSoundType : u8 {
+ Normal = 0,
+ Movie = 1,
+ MovieEnd = 2,
+};
enum class WhiteBalance : u8 {
BalanceAuto = 0,
@@ -77,10 +98,16 @@ enum class WhiteBalance : u8 {
BalanceDaylight = Balance5200K,
BalanceCloudy = Balance6000K,
BalanceHorizon = Balance6000K,
- BalanceShade = Balance7000K
+ BalanceShade = Balance7000K,
};
-enum class PhotoMode : u8 { Normal = 0, Portrait = 1, Landscape = 2, Nightview = 3, Letter0 = 4 };
+enum class PhotoMode : u8 {
+ Normal = 0,
+ Portrait = 1,
+ Landscape = 2,
+ Nightview = 3,
+ Letter0 = 4,
+};
enum class LensCorrection : u8 {
Off = 0,
@@ -88,7 +115,7 @@ enum class LensCorrection : u8 {
On90 = 2,
Dark = Off,
Normal = On70,
- Bright = On90
+ Bright = On90,
};
enum class Contrast : u8 {
@@ -105,10 +132,13 @@ enum class Contrast : u8 {
Pattern11 = 11,
Low = Pattern05,
Normal = Pattern06,
- High = Pattern07
+ High = Pattern07,
};
-enum class OutputFormat : u8 { YUV422 = 0, RGB565 = 1 };
+enum class OutputFormat : u8 {
+ YUV422 = 0,
+ RGB565 = 1,
+};
/// Stereo camera calibration data.
struct StereoCameraCalibrationData {
diff --git a/src/core/hle/service/cam/cam_u.cpp b/src/core/hle/service/cam/cam_u.cpp
index af2123e5b..125aa7d1f 100644
--- a/src/core/hle/service/cam/cam_u.cpp
+++ b/src/core/hle/service/cam/cam_u.cpp
@@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/cam/cam.h"
#include "core/hle/service/cam/cam_u.h"
+#include "core/hle/service/cam/cam.h"
namespace Service {
namespace CAM {
diff --git a/src/core/hle/service/cecd/cecd_u.cpp b/src/core/hle/service/cecd/cecd_u.cpp
index 4b747de7b..f220bba12 100644
--- a/src/core/hle/service/cecd/cecd_u.cpp
+++ b/src/core/hle/service/cecd/cecd_u.cpp
@@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/cecd/cecd.h"
#include "core/hle/service/cecd/cecd_u.h"
+#include "core/hle/service/cecd/cecd.h"
namespace Service {
namespace CECD {
diff --git a/src/core/hle/service/cfg/cfg.cpp b/src/core/hle/service/cfg/cfg.cpp
index fe97a69d1..aff033bde 100644
--- a/src/core/hle/service/cfg/cfg.cpp
+++ b/src/core/hle/service/cfg/cfg.cpp
@@ -101,8 +101,9 @@ static const ConsoleCountryInfo COUNTRY_INFO = {{0, 0, 0}, UNITED_STATES_COUNTRY
* Thanks Normmatt for providing this information
*/
static const std::array<float, 8> STEREO_CAMERA_SETTINGS = {
- {62.0f, 289.0f, 76.80000305175781f, 46.08000183105469f, 10.0f, 5.0f, 55.58000183105469f,
- 21.56999969482422f}};
+ 62.0f, 289.0f, 76.80000305175781f, 46.08000183105469f,
+ 10.0f, 5.0f, 55.58000183105469f, 21.56999969482422f,
+};
static_assert(sizeof(STEREO_CAMERA_SETTINGS) == 0x20,
"STEREO_CAMERA_SETTINGS must be exactly 0x20 bytes");
@@ -110,8 +111,9 @@ static const u32 CONFIG_SAVEFILE_SIZE = 0x8000;
static std::array<u8, CONFIG_SAVEFILE_SIZE> cfg_config_file_buffer;
static Service::FS::ArchiveHandle cfg_system_save_data_archive;
-static const std::vector<u8> cfg_system_savedata_id = {0x00, 0x00, 0x00, 0x00,
- 0x17, 0x00, 0x01, 0x00};
+static const std::vector<u8> cfg_system_savedata_id = {
+ 0x00, 0x00, 0x00, 0x00, 0x17, 0x00, 0x01, 0x00,
+};
void GetCountryCodeString(Service::Interface* self) {
u32* cmd_buff = Kernel::GetCommandBuffer();
@@ -528,8 +530,7 @@ void Init() {
LoadConfigNANDSaveFile();
}
-void Shutdown() {
-}
+void Shutdown() {}
void SetUsername(const std::u16string& name) {
ASSERT(name.size() <= 10);
diff --git a/src/core/hle/service/cfg/cfg.h b/src/core/hle/service/cfg/cfg.h
index 8cb231d72..c7c2ab41d 100644
--- a/src/core/hle/service/cfg/cfg.h
+++ b/src/core/hle/service/cfg/cfg.h
@@ -79,7 +79,7 @@ static const std::array<u16, 187> country_codes = {{
C("CN"), 0, 0, 0, 0, 0, 0, 0, // 160-167
C("AE"), C("IN"), C("EG"), C("OM"), C("QA"), C("KW"), C("SA"), C("SY"), // 168-175
C("BH"), C("JO"), 0, 0, 0, 0, 0, 0, // 176-183
- C("SM"), C("VA"), C("BM") // 184-186
+ C("SM"), C("VA"), C("BM"), // 184-186
}};
/**
@@ -218,8 +218,9 @@ void FormatConfig(Service::Interface* self);
/**
* Reads a block with the specified id and flag from the Config savegame buffer
- * and writes the output to output.
- * The input size must match exactly the size of the requested block
+ * and writes the output to output. The input size must match exactly the size of the requested
+ * block.
+ *
* @param block_id The id of the block we want to read
* @param size The size of the block we want to read
* @param flag The requested block must have this flag set
@@ -230,8 +231,8 @@ ResultCode GetConfigInfoBlock(u32 block_id, u32 size, u32 flag, void* output);
/**
* Reads data from input and writes to a block with the specified id and flag
- * in the Config savegame buffer.
- * The input size must match exactly the size of the target block
+ * in the Config savegame buffer. The input size must match exactly the size of the target block.
+ *
* @param block_id The id of the block we want to write
* @param size The size of the block we want to write
* @param flag The target block must have this flag set
@@ -242,8 +243,8 @@ ResultCode SetConfigInfoBlock(u32 block_id, u32 size, u32 flag, const void* inpu
/**
* Creates a block with the specified id and writes the input data to the cfg savegame buffer in
- * memory.
- * The config savegame file in the filesystem is not updated.
+ * memory. The config savegame file in the filesystem is not updated.
+ *
* @param block_id The id of the block we want to create
* @param size The size of the block we want to create
* @param flags The flags of the new block
diff --git a/src/core/hle/service/cfg/cfg_i.cpp b/src/core/hle/service/cfg/cfg_i.cpp
index 2ff52c8b8..ed0217e53 100644
--- a/src/core/hle/service/cfg/cfg_i.cpp
+++ b/src/core/hle/service/cfg/cfg_i.cpp
@@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/cfg/cfg.h"
#include "core/hle/service/cfg/cfg_i.h"
+#include "core/hle/service/cfg/cfg.h"
namespace Service {
namespace CFG {
diff --git a/src/core/hle/service/cfg/cfg_s.cpp b/src/core/hle/service/cfg/cfg_s.cpp
index eed26dec7..51e7b9752 100644
--- a/src/core/hle/service/cfg/cfg_s.cpp
+++ b/src/core/hle/service/cfg/cfg_s.cpp
@@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/cfg/cfg.h"
#include "core/hle/service/cfg/cfg_s.h"
+#include "core/hle/service/cfg/cfg.h"
namespace Service {
namespace CFG {
diff --git a/src/core/hle/service/cfg/cfg_u.cpp b/src/core/hle/service/cfg/cfg_u.cpp
index f28217134..3f812291b 100644
--- a/src/core/hle/service/cfg/cfg_u.cpp
+++ b/src/core/hle/service/cfg/cfg_u.cpp
@@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/cfg/cfg.h"
#include "core/hle/service/cfg/cfg_u.h"
+#include "core/hle/service/cfg/cfg.h"
namespace Service {
namespace CFG {
diff --git a/src/core/hle/service/dlp/dlp.cpp b/src/core/hle/service/dlp/dlp.cpp
index fd124e819..8f4b67a5d 100644
--- a/src/core/hle/service/dlp/dlp.cpp
+++ b/src/core/hle/service/dlp/dlp.cpp
@@ -17,8 +17,7 @@ void Init() {
AddService(new DLP_SRVR_Interface);
}
-void Shutdown() {
-}
+void Shutdown() {}
} // namespace DLP
} // namespace Service
diff --git a/src/core/hle/service/err_f.cpp b/src/core/hle/service/err_f.cpp
index 2cd8269de..a23f5896d 100644
--- a/src/core/hle/service/err_f.cpp
+++ b/src/core/hle/service/err_f.cpp
@@ -173,7 +173,9 @@ static void ThrowFatalError(Service::Interface* self) {
cmd_buff[1] = 0; // No error
}
-const Interface::FunctionInfo FunctionTable[] = {{0x00010800, ThrowFatalError, "ThrowFatalError"}};
+const Interface::FunctionInfo FunctionTable[] = {
+ {0x00010800, ThrowFatalError, "ThrowFatalError"},
+};
////////////////////////////////////////////////////////////////////////////////////////////////////
// Interface class
diff --git a/src/core/hle/service/frd/frd.cpp b/src/core/hle/service/frd/frd.cpp
index 1e9fe178f..050665b48 100644
--- a/src/core/hle/service/frd/frd.cpp
+++ b/src/core/hle/service/frd/frd.cpp
@@ -108,8 +108,7 @@ void Init() {
AddService(new FRD_U_Interface);
}
-void Shutdown() {
-}
+void Shutdown() {}
} // namespace FRD
diff --git a/src/core/hle/service/frd/frd_u.cpp b/src/core/hle/service/frd/frd_u.cpp
index bd1c9c16b..92b53f2ef 100644
--- a/src/core/hle/service/frd/frd_u.cpp
+++ b/src/core/hle/service/frd/frd_u.cpp
@@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/frd/frd.h"
#include "core/hle/service/frd/frd_u.h"
+#include "core/hle/service/frd/frd.h"
namespace Service {
namespace FRD {
diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp
index 1b851eade..77fe5ab6c 100644
--- a/src/core/hle/service/fs/archive.cpp
+++ b/src/core/hle/service/fs/archive.cpp
@@ -90,11 +90,9 @@ enum class DirectoryCommand : u32 {
};
File::File(std::unique_ptr<FileSys::FileBackend>&& backend, const FileSys::Path& path)
- : path(path), priority(0), backend(std::move(backend)) {
-}
+ : path(path), priority(0), backend(std::move(backend)) {}
-File::~File() {
-}
+File::~File() {}
ResultVal<bool> File::SyncRequest() {
u32* cmd_buff = Kernel::GetCommandBuffer();
@@ -205,11 +203,9 @@ ResultVal<bool> File::SyncRequest() {
Directory::Directory(std::unique_ptr<FileSys::DirectoryBackend>&& backend,
const FileSys::Path& path)
- : path(path), backend(std::move(backend)) {
-}
+ : path(path), backend(std::move(backend)) {}
-Directory::~Directory() {
-}
+Directory::~Directory() {}
ResultVal<bool> Directory::SyncRequest() {
u32* cmd_buff = Kernel::GetCommandBuffer();
diff --git a/src/core/hle/service/fs/fs_user.cpp b/src/core/hle/service/fs/fs_user.cpp
index a0adad634..605832214 100644
--- a/src/core/hle/service/fs/fs_user.cpp
+++ b/src/core/hle/service/fs/fs_user.cpp
@@ -968,7 +968,8 @@ const Interface::FunctionInfo FunctionTable[] = {
{0x086700C4, nullptr, "ControlSecureSave"},
{0x08680000, nullptr, "GetMediaType"},
{0x08690000, nullptr, "GetNandEraseCount"},
- {0x086A0082, nullptr, "ReadNandReport"}};
+ {0x086A0082, nullptr, "ReadNandReport"},
+};
////////////////////////////////////////////////////////////////////////////////////////////////////
// Interface class
diff --git a/src/core/hle/service/gsp_gpu.cpp b/src/core/hle/service/gsp_gpu.cpp
index b273aac47..2dff1e16c 100644
--- a/src/core/hle/service/gsp_gpu.cpp
+++ b/src/core/hle/service/gsp_gpu.cpp
@@ -29,10 +29,9 @@ const static u32 REGS_BEGIN = 0x1EB00000;
namespace GSP_GPU {
-const ResultCode
- ERR_GSP_REGS_OUTOFRANGE_OR_MISALIGNED(ErrorDescription::OutofRangeOrMisalignedAddress,
- ErrorModule::GX, ErrorSummary::InvalidArgument,
- ErrorLevel::Usage); // 0xE0E02A01
+const ResultCode ERR_GSP_REGS_OUTOFRANGE_OR_MISALIGNED(
+ ErrorDescription::OutofRangeOrMisalignedAddress, ErrorModule::GX, ErrorSummary::InvalidArgument,
+ ErrorLevel::Usage); // 0xE0E02A01
const ResultCode ERR_GSP_REGS_MISALIGNED(ErrorDescription::MisalignedSize, ErrorModule::GX,
ErrorSummary::InvalidArgument,
ErrorLevel::Usage); // 0xE0E02BF2
diff --git a/src/core/hle/service/gsp_lcd.cpp b/src/core/hle/service/gsp_lcd.cpp
index 3922cd197..b916dd759 100644
--- a/src/core/hle/service/gsp_lcd.cpp
+++ b/src/core/hle/service/gsp_lcd.cpp
@@ -9,11 +9,15 @@
namespace GSP_LCD {
-const Interface::FunctionInfo FunctionTable[] = {{0x000F0000, nullptr, "PowerOnAllBacklights"},
- {0x00100000, nullptr, "PowerOffAllBacklights"},
- {0x00110040, nullptr, "PowerOnBacklight"},
- {0x00120040, nullptr, "PowerOffBacklight"},
- {0x00130040, nullptr, "SetLedForceOff"}};
+const Interface::FunctionInfo FunctionTable[] = {
+ // clang-format off
+ {0x000F0000, nullptr, "PowerOnAllBacklights"},
+ {0x00100000, nullptr, "PowerOffAllBacklights"},
+ {0x00110040, nullptr, "PowerOnBacklight"},
+ {0x00120040, nullptr, "PowerOffBacklight"},
+ {0x00130040, nullptr, "SetLedForceOff"},
+ // clang-format on
+};
////////////////////////////////////////////////////////////////////////////////////////////////////
// Interface class
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index d915a3105..5a2edd3c0 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -40,11 +40,10 @@ static int enable_accelerometer_count = 0; // positive means enabled
static int enable_gyroscope_count = 0; // positive means enabled
static PadState GetCirclePadDirectionState(s16 circle_pad_x, s16 circle_pad_y) {
- constexpr float TAN30 = 0.577350269,
- TAN60 =
- 1 / TAN30; // 30 degree and 60 degree are angular thresholds for directions
- constexpr int CIRCLE_PAD_THRESHOLD_SQUARE =
- 40 * 40; // a circle pad radius greater than 40 will trigger circle pad direction
+ // 30 degree and 60 degree are angular thresholds for directions
+ constexpr float TAN30 = 0.577350269, TAN60 = 1 / TAN30;
+ // a circle pad radius greater than 40 will trigger circle pad direction
+ constexpr int CIRCLE_PAD_THRESHOLD_SQUARE = 40 * 40;
PadState state;
state.hex = 0;
diff --git a/src/core/hle/service/hid/hid_spvr.cpp b/src/core/hle/service/hid/hid_spvr.cpp
index 09007e304..00a0902c8 100644
--- a/src/core/hle/service/hid/hid_spvr.cpp
+++ b/src/core/hle/service/hid/hid_spvr.cpp
@@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/hid/hid.h"
#include "core/hle/service/hid/hid_spvr.h"
+#include "core/hle/service/hid/hid.h"
namespace Service {
namespace HID {
diff --git a/src/core/hle/service/hid/hid_user.cpp b/src/core/hle/service/hid/hid_user.cpp
index 42591543c..433e175bb 100644
--- a/src/core/hle/service/hid/hid_user.cpp
+++ b/src/core/hle/service/hid/hid_user.cpp
@@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/hid/hid.h"
#include "core/hle/service/hid/hid_user.h"
+#include "core/hle/service/hid/hid.h"
namespace Service {
namespace HID {
diff --git a/src/core/hle/service/ir/ir_rst.cpp b/src/core/hle/service/ir/ir_rst.cpp
index 1f10ebd3d..5e7a011ff 100644
--- a/src/core/hle/service/ir/ir_rst.cpp
+++ b/src/core/hle/service/ir/ir_rst.cpp
@@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/ir/ir.h"
#include "core/hle/service/ir/ir_rst.h"
+#include "core/hle/service/ir/ir.h"
namespace Service {
namespace IR {
diff --git a/src/core/hle/service/ir/ir_u.cpp b/src/core/hle/service/ir/ir_u.cpp
index be4049da9..429615f31 100644
--- a/src/core/hle/service/ir/ir_u.cpp
+++ b/src/core/hle/service/ir/ir_u.cpp
@@ -8,15 +8,26 @@ namespace Service {
namespace IR {
const Interface::FunctionInfo FunctionTable[] = {
- {0x00010000, nullptr, "Initialize"}, {0x00020000, nullptr, "Shutdown"},
- {0x00030042, nullptr, "StartSendTransfer"}, {0x00040000, nullptr, "WaitSendTransfer"},
- {0x000500C2, nullptr, "StartRecvTransfer"}, {0x00060000, nullptr, "WaitRecvTransfer"},
- {0x00070080, nullptr, "GetRecvTransferCount"}, {0x00080000, nullptr, "GetSendState"},
- {0x00090040, nullptr, "SetBitRate"}, {0x000A0000, nullptr, "GetBitRate"},
- {0x000B0040, nullptr, "SetIRLEDState"}, {0x000C0000, nullptr, "GetIRLEDRecvState"},
- {0x000D0000, nullptr, "GetSendFinishedEvent"}, {0x000E0000, nullptr, "GetRecvFinishedEvent"},
- {0x000F0000, nullptr, "GetTransferState"}, {0x00100000, nullptr, "GetErrorStatus"},
- {0x00110040, nullptr, "SetSleepModeActive"}, {0x00120040, nullptr, "SetSleepModeState"},
+ // clang-format off
+ {0x00010000, nullptr, "Initialize"},
+ {0x00020000, nullptr, "Shutdown"},
+ {0x00030042, nullptr, "StartSendTransfer"},
+ {0x00040000, nullptr, "WaitSendTransfer"},
+ {0x000500C2, nullptr, "StartRecvTransfer"},
+ {0x00060000, nullptr, "WaitRecvTransfer"},
+ {0x00070080, nullptr, "GetRecvTransferCount"},
+ {0x00080000, nullptr, "GetSendState"},
+ {0x00090040, nullptr, "SetBitRate"},
+ {0x000A0000, nullptr, "GetBitRate"},
+ {0x000B0040, nullptr, "SetIRLEDState"},
+ {0x000C0000, nullptr, "GetIRLEDRecvState"},
+ {0x000D0000, nullptr, "GetSendFinishedEvent"},
+ {0x000E0000, nullptr, "GetRecvFinishedEvent"},
+ {0x000F0000, nullptr, "GetTransferState"},
+ {0x00100000, nullptr, "GetErrorStatus"},
+ {0x00110040, nullptr, "SetSleepModeActive"},
+ {0x00120040, nullptr, "SetSleepModeState"},
+ // clang-format off
};
IR_U_Interface::IR_U_Interface() {
diff --git a/src/core/hle/service/ir/ir_user.cpp b/src/core/hle/service/ir/ir_user.cpp
index 6cff1d544..cca71a0dd 100644
--- a/src/core/hle/service/ir/ir_user.cpp
+++ b/src/core/hle/service/ir/ir_user.cpp
@@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/ir/ir.h"
#include "core/hle/service/ir/ir_user.h"
+#include "core/hle/service/ir/ir.h"
namespace Service {
namespace IR {
diff --git a/src/core/hle/service/ldr_ro/cro_helper.cpp b/src/core/hle/service/ldr_ro/cro_helper.cpp
index 5757a4e64..b5da9a960 100644
--- a/src/core/hle/service/ldr_ro/cro_helper.cpp
+++ b/src/core/hle/service/ldr_ro/cro_helper.cpp
@@ -22,21 +22,23 @@ static ResultCode CROFormatError(u32 description) {
ErrorSummary::WrongArgument, ErrorLevel::Permanent);
}
-const std::array<int, 17> CROHelper::ENTRY_SIZE{
- {1, // code
- 1, // data
- 1, // module name
- sizeof(SegmentEntry), sizeof(ExportNamedSymbolEntry), sizeof(ExportIndexedSymbolEntry),
- 1, // export strings
- sizeof(ExportTreeEntry), sizeof(ImportModuleEntry), sizeof(ExternalRelocationEntry),
- sizeof(ImportNamedSymbolEntry), sizeof(ImportIndexedSymbolEntry),
- sizeof(ImportAnonymousSymbolEntry),
- 1, // import strings
- sizeof(StaticAnonymousSymbolEntry), sizeof(InternalRelocationEntry),
- sizeof(StaticRelocationEntry)}};
-
-const std::array<CROHelper::HeaderField, 4> CROHelper::FIX_BARRIERS{
- {Fix0Barrier, Fix1Barrier, Fix2Barrier, Fix3Barrier}};
+const std::array<int, 17> CROHelper::ENTRY_SIZE{{
+ 1, // code
+ 1, // data
+ 1, // module name
+ sizeof(SegmentEntry), sizeof(ExportNamedSymbolEntry), sizeof(ExportIndexedSymbolEntry),
+ 1, // export strings
+ sizeof(ExportTreeEntry), sizeof(ImportModuleEntry), sizeof(ExternalRelocationEntry),
+ sizeof(ImportNamedSymbolEntry), sizeof(ImportIndexedSymbolEntry),
+ sizeof(ImportAnonymousSymbolEntry),
+ 1, // import strings
+ sizeof(StaticAnonymousSymbolEntry), sizeof(InternalRelocationEntry),
+ sizeof(StaticRelocationEntry),
+}};
+
+const std::array<CROHelper::HeaderField, 4> CROHelper::FIX_BARRIERS{{
+ Fix0Barrier, Fix1Barrier, Fix2Barrier, Fix3Barrier,
+}};
VAddr CROHelper::SegmentTagToAddress(SegmentTag segment_tag) const {
u32 segment_num = GetField(SegmentNum);
@@ -204,13 +206,14 @@ ResultCode CROHelper::RebaseHeader(u32 cro_size) {
return error;
// verifies that all offsets are in the correct order
- constexpr std::array<HeaderField, 18> OFFSET_ORDER = {
- {CodeOffset, ModuleNameOffset, SegmentTableOffset, ExportNamedSymbolTableOffset,
- ExportTreeTableOffset, ExportIndexedSymbolTableOffset, ExportStringsOffset,
- ImportModuleTableOffset, ExternalRelocationTableOffset, ImportNamedSymbolTableOffset,
- ImportIndexedSymbolTableOffset, ImportAnonymousSymbolTableOffset, ImportStringsOffset,
- StaticAnonymousSymbolTableOffset, InternalRelocationTableOffset,
- StaticRelocationTableOffset, DataOffset, FileSize}};
+ constexpr std::array<HeaderField, 18> OFFSET_ORDER = {{
+ CodeOffset, ModuleNameOffset, SegmentTableOffset, ExportNamedSymbolTableOffset,
+ ExportTreeTableOffset, ExportIndexedSymbolTableOffset, ExportStringsOffset,
+ ImportModuleTableOffset, ExternalRelocationTableOffset, ImportNamedSymbolTableOffset,
+ ImportIndexedSymbolTableOffset, ImportAnonymousSymbolTableOffset, ImportStringsOffset,
+ StaticAnonymousSymbolTableOffset, InternalRelocationTableOffset,
+ StaticRelocationTableOffset, DataOffset, FileSize,
+ }};
u32 prev_offset = GetField(OFFSET_ORDER[0]);
u32 cur_offset;
diff --git a/src/core/hle/service/ldr_ro/cro_helper.h b/src/core/hle/service/ldr_ro/cro_helper.h
index e4457d4be..e1b8221bd 100644
--- a/src/core/hle/service/ldr_ro/cro_helper.h
+++ b/src/core/hle/service/ldr_ro/cro_helper.h
@@ -40,8 +40,7 @@ static constexpr u32 CRO_HASH_SIZE = 0x80;
/// Represents a loaded module (CRO) with interfaces manipulating it.
class CROHelper final {
public:
- explicit CROHelper(VAddr cro_address) : module_address(cro_address) {
- }
+ explicit CROHelper(VAddr cro_address) : module_address(cro_address) {}
std::string ModuleName() const {
return Memory::ReadCString(GetField(ModuleNameOffset), GetField(ModuleNameSize));
@@ -152,8 +151,7 @@ private:
/**
* Each item in this enum represents a u32 field in the header begin from address+0x80,
- * successively.
- * We don't directly use a struct here, to avoid GetPointer, reinterpret_cast, or
+ * successively. We don't directly use a struct here, to avoid GetPointer, reinterpret_cast, or
* Read/WriteBlock repeatedly.
*/
enum HeaderField {
@@ -234,8 +232,7 @@ private:
BitField<4, 28, u32_le> offset_into_segment;
SegmentTag() = default;
- explicit SegmentTag(u32 raw_) : raw(raw_) {
- }
+ explicit SegmentTag(u32 raw_) : raw(raw_) {}
};
/// Information of a segment in this module.
diff --git a/src/core/hle/service/ldr_ro/ldr_ro.cpp b/src/core/hle/service/ldr_ro/ldr_ro.cpp
index ae5d3921f..a8fc2c015 100644
--- a/src/core/hle/service/ldr_ro/ldr_ro.cpp
+++ b/src/core/hle/service/ldr_ro/ldr_ro.cpp
@@ -750,11 +750,17 @@ static void Shutdown(Service::Interface* self) {
}
const Interface::FunctionInfo FunctionTable[] = {
- {0x000100C2, Initialize, "Initialize"}, {0x00020082, LoadCRR, "LoadCRR"},
- {0x00030042, UnloadCRR, "UnloadCRR"}, {0x000402C2, LoadCRO<false>, "LoadCRO"},
- {0x000500C2, UnloadCRO, "UnloadCRO"}, {0x00060042, LinkCRO, "LinkCRO"},
- {0x00070042, UnlinkCRO, "UnlinkCRO"}, {0x00080042, Shutdown, "Shutdown"},
+ // clang-format off
+ {0x000100C2, Initialize, "Initialize"},
+ {0x00020082, LoadCRR, "LoadCRR"},
+ {0x00030042, UnloadCRR, "UnloadCRR"},
+ {0x000402C2, LoadCRO<false>, "LoadCRO"},
+ {0x000500C2, UnloadCRO, "UnloadCRO"},
+ {0x00060042, LinkCRO, "LinkCRO"},
+ {0x00070042, UnlinkCRO, "UnlinkCRO"},
+ {0x00080042, Shutdown, "Shutdown"},
{0x000902C2, LoadCRO<true>, "LoadCRO_New"},
+ // clang-format on
};
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/hle/service/ndm/ndm.cpp b/src/core/hle/service/ndm/ndm.cpp
index 9f1536aef..fcfa4b336 100644
--- a/src/core/hle/service/ndm/ndm.cpp
+++ b/src/core/hle/service/ndm/ndm.cpp
@@ -11,12 +11,16 @@
namespace Service {
namespace NDM {
-enum : u32 { DEFAULT_RETRY_INTERVAL = 10, DEFAULT_SCAN_INTERVAL = 30 };
+enum : u32 {
+ DEFAULT_RETRY_INTERVAL = 10,
+ DEFAULT_SCAN_INTERVAL = 30,
+};
static DaemonMask daemon_bit_mask = DaemonMask::Default;
static DaemonMask default_daemon_bit_mask = DaemonMask::Default;
-static std::array<DaemonStatus, 4> daemon_status = {DaemonStatus::Idle, DaemonStatus::Idle,
- DaemonStatus::Idle, DaemonStatus::Idle};
+static std::array<DaemonStatus, 4> daemon_status = {
+ DaemonStatus::Idle, DaemonStatus::Idle, DaemonStatus::Idle, DaemonStatus::Idle,
+};
static ExclusiveState exclusive_state = ExclusiveState::None;
static u32 scan_interval = DEFAULT_SCAN_INTERVAL;
static u32 retry_interval = DEFAULT_RETRY_INTERVAL;
@@ -227,8 +231,7 @@ void Init() {
AddService(new NDM_U_Interface);
}
-void Shutdown() {
-}
+void Shutdown() {}
} // namespace NDM
} // namespace Service
diff --git a/src/core/hle/service/ndm/ndm.h b/src/core/hle/service/ndm/ndm.h
index fb574541d..979e7fcf1 100644
--- a/src/core/hle/service/ndm/ndm.h
+++ b/src/core/hle/service/ndm/ndm.h
@@ -12,7 +12,12 @@ class Interface;
namespace NDM {
-enum class Daemon : u32 { Cec = 0, Boss = 1, Nim = 2, Friend = 3 };
+enum class Daemon : u32 {
+ Cec = 0,
+ Boss = 1,
+ Nim = 2,
+ Friend = 3,
+};
enum class DaemonMask : u32 {
None = 0,
@@ -21,7 +26,7 @@ enum class DaemonMask : u32 {
Nim = (1 << static_cast<u32>(Daemon::Nim)),
Friend = (1 << static_cast<u32>(Daemon::Friend)),
Default = Cec | Friend,
- All = Cec | Boss | Nim | Friend
+ All = Cec | Boss | Nim | Friend,
};
enum class DaemonStatus : u32 { Busy = 0, Idle = 1, Suspending = 2, Suspended = 3 };
diff --git a/src/core/hle/service/ndm/ndm_u.cpp b/src/core/hle/service/ndm/ndm_u.cpp
index f5c7a341a..4fc93850d 100644
--- a/src/core/hle/service/ndm/ndm_u.cpp
+++ b/src/core/hle/service/ndm/ndm_u.cpp
@@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/ndm/ndm.h"
#include "core/hle/service/ndm/ndm_u.h"
+#include "core/hle/service/ndm/ndm.h"
namespace Service {
namespace NDM {
diff --git a/src/core/hle/service/news/news.cpp b/src/core/hle/service/news/news.cpp
index 983e0777c..e09ea5681 100644
--- a/src/core/hle/service/news/news.cpp
+++ b/src/core/hle/service/news/news.cpp
@@ -19,8 +19,7 @@ void Init() {
AddService(new NEWS_U_Interface);
}
-void Shutdown() {
-}
+void Shutdown() {}
} // namespace NEWS
diff --git a/src/core/hle/service/news/news_s.cpp b/src/core/hle/service/news/news_s.cpp
index dda3d0f6a..0e4b650f3 100644
--- a/src/core/hle/service/news/news_s.cpp
+++ b/src/core/hle/service/news/news_s.cpp
@@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/news/news.h"
#include "core/hle/service/news/news_s.h"
+#include "core/hle/service/news/news.h"
namespace Service {
namespace NEWS {
diff --git a/src/core/hle/service/nim/nim.cpp b/src/core/hle/service/nim/nim.cpp
index f3c01d6e6..a7b76ed67 100644
--- a/src/core/hle/service/nim/nim.cpp
+++ b/src/core/hle/service/nim/nim.cpp
@@ -31,8 +31,7 @@ void Init() {
AddService(new NIM_U_Interface);
}
-void Shutdown() {
-}
+void Shutdown() {}
} // namespace NIM
diff --git a/src/core/hle/service/nim/nim_u.cpp b/src/core/hle/service/nim/nim_u.cpp
index 7e07d02e8..a4fd9781f 100644
--- a/src/core/hle/service/nim/nim_u.cpp
+++ b/src/core/hle/service/nim/nim_u.cpp
@@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/nim/nim.h"
#include "core/hle/service/nim/nim_u.h"
+#include "core/hle/service/nim/nim.h"
namespace Service {
namespace NIM {
diff --git a/src/core/hle/service/ptm/ptm.cpp b/src/core/hle/service/ptm/ptm.cpp
index 80fa09f5f..29b9071c8 100644
--- a/src/core/hle/service/ptm/ptm.cpp
+++ b/src/core/hle/service/ptm/ptm.cpp
@@ -144,8 +144,7 @@ void Init() {
}
}
-void Shutdown() {
-}
+void Shutdown() {}
} // namespace PTM
} // namespace Service
diff --git a/src/core/hle/service/ptm/ptm_sysm.cpp b/src/core/hle/service/ptm/ptm_sysm.cpp
index 693158dbf..590660f60 100644
--- a/src/core/hle/service/ptm/ptm_sysm.cpp
+++ b/src/core/hle/service/ptm/ptm_sysm.cpp
@@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/ptm/ptm.h"
#include "core/hle/service/ptm/ptm_sysm.h"
+#include "core/hle/service/ptm/ptm.h"
namespace Service {
namespace PTM {
diff --git a/src/core/hle/service/ptm/ptm_u.cpp b/src/core/hle/service/ptm/ptm_u.cpp
index 65e868393..155e10df1 100644
--- a/src/core/hle/service/ptm/ptm_u.cpp
+++ b/src/core/hle/service/ptm/ptm_u.cpp
@@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/hle/service/ptm/ptm.h"
#include "core/hle/service/ptm/ptm_u.h"
+#include "core/hle/service/ptm/ptm.h"
namespace Service {
namespace PTM {
diff --git a/src/core/hle/service/soc_u.cpp b/src/core/hle/service/soc_u.cpp
index 695b286c0..302ab55b7 100644
--- a/src/core/hle/service/soc_u.cpp
+++ b/src/core/hle/service/soc_u.cpp
@@ -63,82 +63,84 @@ static const s32 SOCKET_ERROR_VALUE = -1;
namespace SOC_U {
/// Holds the translation from system network errors to 3DS network errors
-static const std::unordered_map<int, int> error_map = {{{E2BIG, 1},
- {ERRNO(EACCES), 2},
- {ERRNO(EADDRINUSE), 3},
- {ERRNO(EADDRNOTAVAIL), 4},
- {ERRNO(EAFNOSUPPORT), 5},
- {ERRNO(EAGAIN), 6},
- {ERRNO(EALREADY), 7},
- {ERRNO(EBADF), 8},
- {EBADMSG, 9},
- {EBUSY, 10},
- {ECANCELED, 11},
- {ECHILD, 12},
- {ERRNO(ECONNABORTED), 13},
- {ERRNO(ECONNREFUSED), 14},
- {ERRNO(ECONNRESET), 15},
- {EDEADLK, 16},
- {ERRNO(EDESTADDRREQ), 17},
- {EDOM, 18},
- {ERRNO(EDQUOT), 19},
- {EEXIST, 20},
- {ERRNO(EFAULT), 21},
- {EFBIG, 22},
- {ERRNO(EHOSTUNREACH), 23},
- {EIDRM, 24},
- {EILSEQ, 25},
- {ERRNO(EINPROGRESS), 26},
- {ERRNO(EINTR), 27},
- {ERRNO(EINVAL), 28},
- {EIO, 29},
- {ERRNO(EISCONN), 30},
- {EISDIR, 31},
- {ERRNO(ELOOP), 32},
- {ERRNO(EMFILE), 33},
- {EMLINK, 34},
- {ERRNO(EMSGSIZE), 35},
- {ERRNO(EMULTIHOP), 36},
- {ERRNO(ENAMETOOLONG), 37},
- {ERRNO(ENETDOWN), 38},
- {ERRNO(ENETRESET), 39},
- {ERRNO(ENETUNREACH), 40},
- {ENFILE, 41},
- {ERRNO(ENOBUFS), 42},
- {ENODATA, 43},
- {ENODEV, 44},
- {ENOENT, 45},
- {ENOEXEC, 46},
- {ENOLCK, 47},
- {ENOLINK, 48},
- {ENOMEM, 49},
- {ENOMSG, 50},
- {ERRNO(ENOPROTOOPT), 51},
- {ENOSPC, 52},
- {ENOSR, 53},
- {ENOSTR, 54},
- {ENOSYS, 55},
- {ERRNO(ENOTCONN), 56},
- {ENOTDIR, 57},
- {ERRNO(ENOTEMPTY), 58},
- {ERRNO(ENOTSOCK), 59},
- {ENOTSUP, 60},
- {ENOTTY, 61},
- {ENXIO, 62},
- {ERRNO(EOPNOTSUPP), 63},
- {EOVERFLOW, 64},
- {EPERM, 65},
- {EPIPE, 66},
- {EPROTO, 67},
- {ERRNO(EPROTONOSUPPORT), 68},
- {ERRNO(EPROTOTYPE), 69},
- {ERANGE, 70},
- {EROFS, 71},
- {ESPIPE, 72},
- {ESRCH, 73},
- {ERRNO(ESTALE), 74},
- {ETIME, 75},
- {ERRNO(ETIMEDOUT), 76}}};
+static const std::unordered_map<int, int> error_map = {{
+ {E2BIG, 1},
+ {ERRNO(EACCES), 2},
+ {ERRNO(EADDRINUSE), 3},
+ {ERRNO(EADDRNOTAVAIL), 4},
+ {ERRNO(EAFNOSUPPORT), 5},
+ {ERRNO(EAGAIN), 6},
+ {ERRNO(EALREADY), 7},
+ {ERRNO(EBADF), 8},
+ {EBADMSG, 9},
+ {EBUSY, 10},
+ {ECANCELED, 11},
+ {ECHILD, 12},
+ {ERRNO(ECONNABORTED), 13},
+ {ERRNO(ECONNREFUSED), 14},
+ {ERRNO(ECONNRESET), 15},
+ {EDEADLK, 16},
+ {ERRNO(EDESTADDRREQ), 17},
+ {EDOM, 18},
+ {ERRNO(EDQUOT), 19},
+ {EEXIST, 20},
+ {ERRNO(EFAULT), 21},
+ {EFBIG, 22},
+ {ERRNO(EHOSTUNREACH), 23},
+ {EIDRM, 24},
+ {EILSEQ, 25},
+ {ERRNO(EINPROGRESS), 26},
+ {ERRNO(EINTR), 27},
+ {ERRNO(EINVAL), 28},
+ {EIO, 29},
+ {ERRNO(EISCONN), 30},
+ {EISDIR, 31},
+ {ERRNO(ELOOP), 32},
+ {ERRNO(EMFILE), 33},
+ {EMLINK, 34},
+ {ERRNO(EMSGSIZE), 35},
+ {ERRNO(EMULTIHOP), 36},
+ {ERRNO(ENAMETOOLONG), 37},
+ {ERRNO(ENETDOWN), 38},
+ {ERRNO(ENETRESET), 39},
+ {ERRNO(ENETUNREACH), 40},
+ {ENFILE, 41},
+ {ERRNO(ENOBUFS), 42},
+ {ENODATA, 43},
+ {ENODEV, 44},
+ {ENOENT, 45},
+ {ENOEXEC, 46},
+ {ENOLCK, 47},
+ {ENOLINK, 48},
+ {ENOMEM, 49},
+ {ENOMSG, 50},
+ {ERRNO(ENOPROTOOPT), 51},
+ {ENOSPC, 52},
+ {ENOSR, 53},
+ {ENOSTR, 54},
+ {ENOSYS, 55},
+ {ERRNO(ENOTCONN), 56},
+ {ENOTDIR, 57},
+ {ERRNO(ENOTEMPTY), 58},
+ {ERRNO(ENOTSOCK), 59},
+ {ENOTSUP, 60},
+ {ENOTTY, 61},
+ {ENXIO, 62},
+ {ERRNO(EOPNOTSUPP), 63},
+ {EOVERFLOW, 64},
+ {EPERM, 65},
+ {EPIPE, 66},
+ {EPROTO, 67},
+ {ERRNO(EPROTONOSUPPORT), 68},
+ {ERRNO(EPROTOTYPE), 69},
+ {ERANGE, 70},
+ {EROFS, 71},
+ {ESPIPE, 72},
+ {ESRCH, 73},
+ {ERRNO(ESTALE), 74},
+ {ETIME, 75},
+ {ERRNO(ETIMEDOUT), 76},
+}};
/// Converts a network error from platform-specific to 3ds-specific
static int TranslateError(int error) {
diff --git a/src/core/hle/service/ssl_c.cpp b/src/core/hle/service/ssl_c.cpp
index 47c4a8cb0..78ab922ca 100644
--- a/src/core/hle/service/ssl_c.cpp
+++ b/src/core/hle/service/ssl_c.cpp
@@ -79,7 +79,8 @@ const Interface::FunctionInfo FunctionTable[] = {
{0x00190080, nullptr, "ContextSetClientCert"},
{0x001B0080, nullptr, "ContextClearOpt"},
{0x001E0040, nullptr, "DestroyContext"},
- {0x001F0082, nullptr, "ContextInitSharedmem"}};
+ {0x001F0082, nullptr, "ContextInitSharedmem"},
+};
////////////////////////////////////////////////////////////////////////////////////////////////////
// Interface class
diff --git a/src/core/hle/service/y2r_u.cpp b/src/core/hle/service/y2r_u.cpp
index 278548e0e..d3c6d073e 100644
--- a/src/core/hle/service/y2r_u.cpp
+++ b/src/core/hle/service/y2r_u.cpp
@@ -73,8 +73,8 @@ ResultCode ConversionConfiguration::SetInputLines(u16 lines) {
return RESULT_SUCCESS;
}
-ResultCode
-ConversionConfiguration::SetStandardCoefficient(StandardCoefficient standard_coefficient) {
+ResultCode ConversionConfiguration::SetStandardCoefficient(
+ StandardCoefficient standard_coefficient) {
size_t index = static_cast<size_t>(standard_coefficient);
if (index >= ARRAY_SIZE(standard_coefficients)) {
return ResultCode(ErrorDescription::InvalidEnumValue, ErrorModule::CAM,
diff --git a/src/core/hw/hw.cpp b/src/core/hw/hw.cpp
index db224c9aa..71f44cbc4 100644
--- a/src/core/hw/hw.cpp
+++ b/src/core/hw/hw.cpp
@@ -82,8 +82,7 @@ template void Write<u16>(u32 addr, const u16 data);
template void Write<u8>(u32 addr, const u8 data);
/// Update hardware
-void Update() {
-}
+void Update() {}
/// Initialize hardware
void Init() {
diff --git a/src/core/hw/y2r.cpp b/src/core/hw/y2r.cpp
index 5a68d7e65..838b14163 100644
--- a/src/core/hw/y2r.cpp
+++ b/src/core/hw/y2r.cpp
@@ -61,7 +61,7 @@ static void ConvertYUVToRGB(InputFormat input_format, const u8* input_Y, const u
s32 cY = c[0] * Y;
s32 r = cY + c[1] * V;
- s32 g = cY - c[3] * U - c[2] * V;
+ s32 g = cY - c[2] * V - c[3] * U;
s32 b = cY + c[4] * U;
const s32 rounding_offset = 0x18;
@@ -144,16 +144,30 @@ static void SendData(const u32* input, ConversionBuffer& buf, int amount_of_data
}
}
-static const u8 linear_lut[64] = {
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43,
- 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+static const u8 linear_lut[TILE_SIZE] = {
+ // clang-format off
+ 0, 1, 2, 3, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 13, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 36, 37, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55,
+ 56, 57, 58, 59, 60, 61, 62, 63,
+ // clang-format on
};
-static const u8 morton_lut[64] = {
- 0, 1, 4, 5, 16, 17, 20, 21, 2, 3, 6, 7, 18, 19, 22, 23, 8, 9, 12, 13, 24, 25,
- 28, 29, 10, 11, 14, 15, 26, 27, 30, 31, 32, 33, 36, 37, 48, 49, 52, 53, 34, 35, 38, 39,
- 50, 51, 54, 55, 40, 41, 44, 45, 56, 57, 60, 61, 42, 43, 46, 47, 58, 59, 62, 63,
+static const u8 morton_lut[TILE_SIZE] = {
+ // clang-format off
+ 0, 1, 4, 5, 16, 17, 20, 21,
+ 2, 3, 6, 7, 18, 19, 22, 23,
+ 8, 9, 12, 13, 24, 25, 28, 29,
+ 10, 11, 14, 15, 26, 27, 30, 31,
+ 32, 33, 36, 37, 48, 49, 52, 53,
+ 34, 35, 38, 39, 50, 51, 54, 55,
+ 40, 41, 44, 45, 56, 57, 60, 61,
+ 42, 43, 46, 47, 58, 59, 62, 63,
+ // clang-format on
};
static void RotateTile0(const ImageTile& input, ImageTile& output, int height,
diff --git a/src/core/loader/3dsx.h b/src/core/loader/3dsx.h
index 09a788a1c..8d15ba555 100644
--- a/src/core/loader/3dsx.h
+++ b/src/core/loader/3dsx.h
@@ -19,8 +19,7 @@ class AppLoader_THREEDSX final : public AppLoader {
public:
AppLoader_THREEDSX(FileUtil::IOFile&& file, const std::string& filename,
const std::string& filepath)
- : AppLoader(std::move(file)), filename(std::move(filename)), filepath(filepath) {
- }
+ : AppLoader(std::move(file)), filename(std::move(filename)), filepath(filepath) {}
/**
* Returns the type of the file
diff --git a/src/core/loader/elf.h b/src/core/loader/elf.h
index 0b1456c64..04a9b482d 100644
--- a/src/core/loader/elf.h
+++ b/src/core/loader/elf.h
@@ -18,8 +18,7 @@ namespace Loader {
class AppLoader_ELF final : public AppLoader {
public:
AppLoader_ELF(FileUtil::IOFile&& file, std::string filename)
- : AppLoader(std::move(file)), filename(std::move(filename)) {
- }
+ : AppLoader(std::move(file)), filename(std::move(filename)) {}
/**
* Returns the type of the file
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h
index 5f48d2ffe..fdfee835c 100644
--- a/src/core/loader/loader.h
+++ b/src/core/loader/loader.h
@@ -81,10 +81,8 @@ constexpr u32 MakeMagic(char a, char b, char c, char d) {
/// Interface for loading an application
class AppLoader : NonCopyable {
public:
- AppLoader(FileUtil::IOFile&& file) : file(std::move(file)) {
- }
- virtual ~AppLoader() {
- }
+ AppLoader(FileUtil::IOFile&& file) : file(std::move(file)) {}
+ virtual ~AppLoader() {}
/**
* Returns the type of this file
diff --git a/src/core/loader/ncch.h b/src/core/loader/ncch.h
index 0cd70f70c..f53f8100e 100644
--- a/src/core/loader/ncch.h
+++ b/src/core/loader/ncch.h
@@ -164,8 +164,7 @@ namespace Loader {
class AppLoader_NCCH final : public AppLoader {
public:
AppLoader_NCCH(FileUtil::IOFile&& file, const std::string& filepath)
- : AppLoader(std::move(file)), filepath(filepath) {
- }
+ : AppLoader(std::move(file)), filepath(filepath) {}
/**
* Returns the type of the file
diff --git a/src/core/tracer/citrace.h b/src/core/tracer/citrace.h
index ac26e872b..215f86359 100644
--- a/src/core/tracer/citrace.h
+++ b/src/core/tracer/citrace.h
@@ -76,7 +76,12 @@ struct CTMemoryLoad {
struct CTRegisterWrite {
u32 physical_address;
- enum : u32 { SIZE_8 = 0xD1, SIZE_16 = 0xD2, SIZE_32 = 0xD3, SIZE_64 = 0xD4 } size;
+ enum : u32 {
+ SIZE_8 = 0xD1,
+ SIZE_16 = 0xD2,
+ SIZE_32 = 0xD3,
+ SIZE_64 = 0xD4,
+ } size;
// TODO: Make it clearer which bits of this member are used for sizes other than 32 bits
u64 value;
diff --git a/src/core/tracer/recorder.cpp b/src/core/tracer/recorder.cpp
index 8fd0018c4..11a289b2c 100644
--- a/src/core/tracer/recorder.cpp
+++ b/src/core/tracer/recorder.cpp
@@ -12,8 +12,7 @@
namespace CiTrace {
-Recorder::Recorder(const InitialState& initial_state) : initial_state(initial_state) {
-}
+Recorder::Recorder(const InitialState& initial_state) : initial_state(initial_state) {}
void Recorder::Finish(const std::string& filename) {
// Setup CiTrace header
diff --git a/src/video_core/clipper.cpp b/src/video_core/clipper.cpp
index 747285866..82178d249 100644
--- a/src/video_core/clipper.cpp
+++ b/src/video_core/clipper.cpp
@@ -30,8 +30,7 @@ public:
ClippingEdge(Math::Vec4<float24> coeffs, Math::Vec4<float24> bias = Math::Vec4<float24>(
float24::FromFloat32(0), float24::FromFloat32(0),
float24::FromFloat32(0), float24::FromFloat32(0)))
- : coeffs(coeffs), bias(bias) {
- }
+ : coeffs(coeffs), bias(bias) {}
bool IsInside(const OutputVertex& vertex) const {
return Math::Dot(vertex.pos + bias, coeffs) <= float24::FromFloat32(0);
diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp
index 415b5f74c..04a4ee3a2 100644
--- a/src/video_core/command_processor.cpp
+++ b/src/video_core/command_processor.cpp
@@ -44,7 +44,8 @@ static u32 default_attr_write_buffer[3];
// Expand a 4-bit mask to 4-byte mask, e.g. 0b0101 -> 0x00FF00FF
static const u32 expand_bits_to_bytes[] = {
0x00000000, 0x000000ff, 0x0000ff00, 0x0000ffff, 0x00ff0000, 0x00ff00ff, 0x00ffff00, 0x00ffffff,
- 0xff000000, 0xff0000ff, 0xff00ff00, 0xff00ffff, 0xffff0000, 0xffff00ff, 0xffffff00, 0xffffffff};
+ 0xff000000, 0xff0000ff, 0xff00ff00, 0xff00ffff, 0xffff0000, 0xffff00ff, 0xffffff00, 0xffffffff,
+};
MICROPROFILE_DEFINE(GPU_Drawing, "GPU", "Drawing", MP_RGB(50, 50, 240));
diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp
index 1cb868ead..194e5833c 100644
--- a/src/video_core/debug_utils/debug_utils.cpp
+++ b/src/video_core/debug_utils/debug_utils.cpp
@@ -155,7 +155,8 @@ void DumpShader(const std::string& filename, const Regs::ShaderConfig& config,
{OutputAttributes::TEXCOORD2_V, {OutputRegisterInfo::TEXCOORD2, 2}},
{OutputAttributes::VIEW_X, {OutputRegisterInfo::VIEW, 1}},
{OutputAttributes::VIEW_Y, {OutputRegisterInfo::VIEW, 2}},
- {OutputAttributes::VIEW_Z, {OutputRegisterInfo::VIEW, 4}}};
+ {OutputAttributes::VIEW_Z, {OutputRegisterInfo::VIEW, 4}},
+ };
for (const auto& semantic : std::vector<OutputAttributes::Semantic>{
output_attributes[i].map_x, output_attributes[i].map_y, output_attributes[i].map_z,
@@ -529,14 +530,16 @@ const Math::Vec4<u8> LookupTexture(const u8* source, int x, int y, const Texture
unsigned table_index =
static_cast<int>((x < 2) ? table_index_1.Value() : table_index_2.Value());
- static const std::array<std::array<u8, 2>, 8> etc1_modifier_table = {{{{2, 8}},
- {{5, 17}},
- {{9, 29}},
- {{13, 42}},
- {{18, 60}},
- {{24, 80}},
- {{33, 106}},
- {{47, 183}}}};
+ static const std::array<std::array<u8, 2>, 8> etc1_modifier_table = {{
+ {{2, 8}},
+ {{5, 17}},
+ {{9, 29}},
+ {{13, 42}},
+ {{18, 60}},
+ {{24, 80}},
+ {{33, 106}},
+ {{47, 183}},
+ }};
int modifier = etc1_modifier_table.at(table_index).at(GetTableSubIndex(texel));
if (GetNegationFlag(texel))
@@ -713,9 +716,9 @@ static std::string GetTevStageConfigSourceString(const Pica::Regs::TevStageConfi
return src_it->second;
}
-static std::string
-GetTevStageConfigColorSourceString(const Pica::Regs::TevStageConfig::Source& source,
- const Pica::Regs::TevStageConfig::ColorModifier modifier) {
+static std::string GetTevStageConfigColorSourceString(
+ const Pica::Regs::TevStageConfig::Source& source,
+ const Pica::Regs::TevStageConfig::ColorModifier modifier) {
using ColorModifier = Pica::Regs::TevStageConfig::ColorModifier;
static const std::map<ColorModifier, std::string> color_modifier_map = {
{ColorModifier::SourceColor, "%source.rgb"},
@@ -739,9 +742,9 @@ GetTevStageConfigColorSourceString(const Pica::Regs::TevStageConfig::Source& sou
return ReplacePattern(modifier_str, "%source", src_str);
}
-static std::string
-GetTevStageConfigAlphaSourceString(const Pica::Regs::TevStageConfig::Source& source,
- const Pica::Regs::TevStageConfig::AlphaModifier modifier) {
+static std::string GetTevStageConfigAlphaSourceString(
+ const Pica::Regs::TevStageConfig::Source& source,
+ const Pica::Regs::TevStageConfig::AlphaModifier modifier) {
using AlphaModifier = Pica::Regs::TevStageConfig::AlphaModifier;
static const std::map<AlphaModifier, std::string> alpha_modifier_map = {
{AlphaModifier::SourceAlpha, "%source.a"},
@@ -763,8 +766,8 @@ GetTevStageConfigAlphaSourceString(const Pica::Regs::TevStageConfig::Source& sou
return ReplacePattern(modifier_str, "%source", src_str);
}
-static std::string
-GetTevStageConfigOperationString(const Pica::Regs::TevStageConfig::Operation& operation) {
+static std::string GetTevStageConfigOperationString(
+ const Pica::Regs::TevStageConfig::Operation& operation) {
using Operation = Pica::Regs::TevStageConfig::Operation;
static const std::map<Operation, std::string> combiner_map = {
{Operation::Replace, "%source1"},
diff --git a/src/video_core/debug_utils/debug_utils.h b/src/video_core/debug_utils/debug_utils.h
index 1a58f40ff..fe3ed247d 100644
--- a/src/video_core/debug_utils/debug_utils.h
+++ b/src/video_core/debug_utils/debug_utils.h
@@ -87,15 +87,13 @@ public:
* @param data Optional data pointer (if unused, this is a nullptr)
* @note This function will perform nothing unless it is overridden in the child class.
*/
- virtual void OnPicaBreakPointHit(Event, void*) {
- }
+ virtual void OnPicaBreakPointHit(Event, void*) {}
/**
* Action to perform when emulation is resumed from a breakpoint.
* @note This function will perform nothing unless it is overridden in the child class.
*/
- virtual void OnPicaResume() {
- }
+ virtual void OnPicaResume() {}
protected:
/**
diff --git a/src/video_core/gpu_debugger.h b/src/video_core/gpu_debugger.h
index e3ba80d8f..aea391619 100644
--- a/src/video_core/gpu_debugger.h
+++ b/src/video_core/gpu_debugger.h
@@ -15,8 +15,7 @@ public:
// Base class for all objects which need to be notified about GPU events
class DebuggerObserver {
public:
- DebuggerObserver() : observed(nullptr) {
- }
+ DebuggerObserver() : observed(nullptr) {}
virtual ~DebuggerObserver() {
if (observed)
diff --git a/src/video_core/pica.h b/src/video_core/pica.h
index 1d1a686e0..b2db609ec 100644
--- a/src/video_core/pica.h
+++ b/src/video_core/pica.h
@@ -176,7 +176,10 @@ struct Regs {
MirroredRepeat = 3,
};
- enum TextureFilter : u32 { Nearest = 0, Linear = 1 };
+ enum TextureFilter : u32 {
+ Nearest = 0,
+ Linear = 1,
+ };
union {
u32 raw;
@@ -300,9 +303,11 @@ struct Regs {
const TextureFormat format;
};
const std::array<FullTextureConfig, 3> GetTextures() const {
- return {{{texture0_enable.ToBool(), texture0, texture0_format},
- {texture1_enable.ToBool(), texture1, texture1_format},
- {texture2_enable.ToBool(), texture2, texture2_format}}};
+ return {{
+ {texture0_enable.ToBool(), texture0, texture0_format},
+ {texture1_enable.ToBool(), texture1, texture1_format},
+ {texture2_enable.ToBool(), texture2, texture2_format},
+ }};
}
// 0xc0-0xff: Texture Combiner (akin to glTexEnv)
@@ -523,7 +528,7 @@ struct Regs {
Decrement = 4,
Invert = 5,
IncrementWrap = 6,
- DecrementWrap = 7
+ DecrementWrap = 7,
};
struct {
@@ -1173,7 +1178,10 @@ struct Regs {
INSERT_PADDING_WORDS(0x07);
- enum class GPUMode : u32 { Drawing = 0, Configuring = 1 };
+ enum class GPUMode : u32 {
+ Drawing = 0,
+ Configuring = 1,
+ };
GPUMode gpu_mode;
@@ -1249,7 +1257,10 @@ struct Regs {
INSERT_PADDING_WORDS(0x2);
struct {
- enum Format : u32 { FLOAT24 = 0, FLOAT32 = 1 };
+ enum Format : u32 {
+ FLOAT24 = 0,
+ FLOAT32 = 1,
+ };
bool IsFloat32() const {
return format == FLOAT32;
diff --git a/src/video_core/primitive_assembly.cpp b/src/video_core/primitive_assembly.cpp
index 343edb191..901cca26b 100644
--- a/src/video_core/primitive_assembly.cpp
+++ b/src/video_core/primitive_assembly.cpp
@@ -12,8 +12,7 @@ namespace Pica {
template <typename VertexType>
PrimitiveAssembler<VertexType>::PrimitiveAssembler(Regs::TriangleTopology topology)
- : topology(topology), buffer_index(0) {
-}
+ : topology(topology), buffer_index(0) {}
template <typename VertexType>
void PrimitiveAssembler<VertexType>::SubmitVertex(VertexType& vtx,
diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp
index dbdc37ce6..f815d6cf0 100644
--- a/src/video_core/rasterizer.cpp
+++ b/src/video_core/rasterizer.cpp
@@ -268,10 +268,8 @@ static u8 PerformStencilAction(Regs::StencilAction action, u8 old_stencil, u8 re
// NOTE: Assuming that rasterizer coordinates are 12.4 fixed-point values
struct Fix12P4 {
- Fix12P4() {
- }
- Fix12P4(u16 val) : val(val) {
- }
+ Fix12P4() {}
+ Fix12P4(u16 val) : val(val) {}
static u16 FracMask() {
return 0xF;
@@ -491,7 +489,8 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0, const Shader
255),
(u8)(
GetInterpolatedAttribute(v0.color.a(), v1.color.a(), v2.color.a()).ToFloat32() *
- 255)};
+ 255),
+ };
Math::Vec2<float24> uv[3];
uv[0].u() = GetInterpolatedAttribute(v0.tc0.u(), v1.tc0.u(), v2.tc0.u());
@@ -604,7 +603,8 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0, const Shader
Math::Vec4<u8> combiner_buffer = {0, 0, 0, 0};
Math::Vec4<u8> next_combiner_buffer = {
regs.tev_combiner_buffer_color.r, regs.tev_combiner_buffer_color.g,
- regs.tev_combiner_buffer_color.b, regs.tev_combiner_buffer_color.a};
+ regs.tev_combiner_buffer_color.b, regs.tev_combiner_buffer_color.a,
+ };
for (unsigned tev_stage_index = 0; tev_stage_index < tev_stages.size();
++tev_stage_index) {
@@ -841,18 +841,16 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0, const Shader
Math::Vec3<u8> color_result[3] = {
GetColorModifier(tev_stage.color_modifier1, GetSource(tev_stage.color_source1)),
GetColorModifier(tev_stage.color_modifier2, GetSource(tev_stage.color_source2)),
- GetColorModifier(tev_stage.color_modifier3,
- GetSource(tev_stage.color_source3))};
+ GetColorModifier(tev_stage.color_modifier3, GetSource(tev_stage.color_source3)),
+ };
auto color_output = ColorCombine(tev_stage.color_op, color_result);
// alpha combiner
- std::array<u8, 3> alpha_result = {
- {GetAlphaModifier(tev_stage.alpha_modifier1,
- GetSource(tev_stage.alpha_source1)),
- GetAlphaModifier(tev_stage.alpha_modifier2,
- GetSource(tev_stage.alpha_source2)),
- GetAlphaModifier(tev_stage.alpha_modifier3,
- GetSource(tev_stage.alpha_source3))}};
+ std::array<u8, 3> alpha_result = {{
+ GetAlphaModifier(tev_stage.alpha_modifier1, GetSource(tev_stage.alpha_source1)),
+ GetAlphaModifier(tev_stage.alpha_modifier2, GetSource(tev_stage.alpha_source2)),
+ GetAlphaModifier(tev_stage.alpha_modifier3, GetSource(tev_stage.alpha_source3)),
+ }};
auto alpha_output = AlphaCombine(tev_stage.alpha_op, alpha_result);
combiner_output[0] =
@@ -1083,7 +1081,8 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0, const Shader
static_cast<u8>(output_merger.blend_const.r),
static_cast<u8>(output_merger.blend_const.g),
static_cast<u8>(output_merger.blend_const.b),
- static_cast<u8>(output_merger.blend_const.a)};
+ static_cast<u8>(output_merger.blend_const.a),
+ };
switch (factor) {
case Regs::BlendFactor::Zero:
@@ -1267,11 +1266,12 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0, const Shader
LogicOp(combiner_output.a(), dest.a(), output_merger.logic_op));
}
- const Math::Vec4<u8> result = {output_merger.red_enable ? blend_output.r() : dest.r(),
- output_merger.green_enable ? blend_output.g() : dest.g(),
- output_merger.blue_enable ? blend_output.b() : dest.b(),
- output_merger.alpha_enable ? blend_output.a()
- : dest.a()};
+ const Math::Vec4<u8> result = {
+ output_merger.red_enable ? blend_output.r() : dest.r(),
+ output_merger.green_enable ? blend_output.g() : dest.g(),
+ output_merger.blue_enable ? blend_output.b() : dest.b(),
+ output_merger.alpha_enable ? blend_output.a() : dest.a(),
+ };
if (regs.framebuffer.allow_color_write != 0)
DrawPixel(x >> 4, y >> 4, result);
diff --git a/src/video_core/rasterizer_interface.h b/src/video_core/rasterizer_interface.h
index ce834bd30..c7bd29f12 100644
--- a/src/video_core/rasterizer_interface.h
+++ b/src/video_core/rasterizer_interface.h
@@ -20,8 +20,7 @@ namespace VideoCore {
class RasterizerInterface {
public:
- virtual ~RasterizerInterface() {
- }
+ virtual ~RasterizerInterface() {}
/// Queues the primitive formed by the given vertices for rendering
virtual void AddTriangle(const Pica::Shader::OutputVertex& v0,
diff --git a/src/video_core/renderer_base.h b/src/video_core/renderer_base.h
index 22e2f9815..daacdb167 100644
--- a/src/video_core/renderer_base.h
+++ b/src/video_core/renderer_base.h
@@ -17,8 +17,7 @@ public:
/// Used to reference a framebuffer
enum kFramebuffer { kFramebuffer_VirtualXFB = 0, kFramebuffer_EFB, kFramebuffer_Texture };
- virtual ~RendererBase() {
- }
+ virtual ~RendererBase() {}
/// Swap buffers (render frame)
virtual void SwapBuffers() = 0;
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index 5021f48bc..37977464d 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -136,8 +136,7 @@ RasterizerOpenGL::RasterizerOpenGL() : shader_dirty(true) {
SyncDepthWriteMask();
}
-RasterizerOpenGL::~RasterizerOpenGL() {
-}
+RasterizerOpenGL::~RasterizerOpenGL() {}
/**
* This is a helper function to resolve an issue with opposite quaternions being interpolated by
@@ -1156,9 +1155,10 @@ void RasterizerOpenGL::SyncBlendColor() {
void RasterizerOpenGL::SyncFogColor() {
const auto& regs = Pica::g_state.regs;
- uniform_block_data.data.fog_color = {regs.fog_color.r.Value() / 255.0f,
- regs.fog_color.g.Value() / 255.0f,
- regs.fog_color.b.Value() / 255.0f};
+ uniform_block_data.data.fog_color = {
+ regs.fog_color.r.Value() / 255.0f, regs.fog_color.g.Value() / 255.0f,
+ regs.fog_color.b.Value() / 255.0f,
+ };
uniform_block_data.dirty = true;
}
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h
index 70e9e64ef..60d70539c 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.h
+++ b/src/video_core/renderer_opengl/gl_rasterizer.h
@@ -41,12 +41,9 @@ struct ScreenInfo;
* two separate shaders sharing the same key.
*
* We use a union because "implicitly-defined copy/move constructor for a union X copies the object
- * representation of X."
- * and "implicitly-defined copy assignment operator for a union X copies the object representation
- * (3.9) of X."
- * = Bytewise copy instead of memberwise copy.
- * This is important because the padding bytes are included in the hash and comparison between
- * objects.
+ * representation of X." and "implicitly-defined copy assignment operator for a union X copies the
+ * object representation (3.9) of X." = Bytewise copy instead of memberwise copy. This is important
+ * because the padding bytes are included in the hash and comparison between objects.
*/
union PicaShaderConfig {
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
index 8f1477bcd..ec3300ca6 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
@@ -522,8 +522,8 @@ CachedSurface* RasterizerCacheOpenGL::GetSurfaceRect(const CachedSurface& params
return GetSurface(params, match_res_scale, load_if_create);
}
-CachedSurface*
-RasterizerCacheOpenGL::GetTextureSurface(const Pica::Regs::FullTextureConfig& config) {
+CachedSurface* RasterizerCacheOpenGL::GetTextureSurface(
+ const Pica::Regs::FullTextureConfig& config) {
Pica::DebugUtils::TextureInfo info =
Pica::DebugUtils::TextureInfo::FromPicaRegister(config.config, config.format);
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.h b/src/video_core/renderer_opengl/gl_rasterizer_cache.h
index db5b649da..b2272bda8 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer_cache.h
+++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.h
@@ -212,8 +212,8 @@ public:
/// Gets the color and depth surfaces and rect (resolution scaled) based on the framebuffer
/// configuration
- std::tuple<CachedSurface*, CachedSurface*, MathUtil::Rectangle<int>>
- GetFramebufferSurfaces(const Pica::Regs::FramebufferConfig& config);
+ std::tuple<CachedSurface*, CachedSurface*, MathUtil::Rectangle<int>> GetFramebufferSurfaces(
+ const Pica::Regs::FramebufferConfig& config);
/// Attempt to get a surface that exactly matches the fill region and format
CachedSurface* TryGetFillSurface(const GPU::Regs::MemoryFillConfig& config);
diff --git a/src/video_core/renderer_opengl/gl_shader_gen.cpp b/src/video_core/renderer_opengl/gl_shader_gen.cpp
index f86cffee5..9392c67b8 100644
--- a/src/video_core/renderer_opengl/gl_shader_gen.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_gen.cpp
@@ -293,9 +293,7 @@ static void AppendAlphaTestCondition(std::string& out, Regs::CompareFunc func) {
case CompareFunc::LessThanOrEqual:
case CompareFunc::GreaterThan:
case CompareFunc::GreaterThanOrEqual: {
- static const char* op[] = {
- "!=", "==", ">=", ">", "<=", "<",
- };
+ static const char* op[] = {"!=", "==", ">=", ">", "<=", "<"};
unsigned index = (unsigned)func - (unsigned)CompareFunc::Equal;
out += "int(last_tex_env_out.a * 255.0f) " + std::string(op[index]) + " alphatest_ref";
break;
diff --git a/src/video_core/renderer_opengl/pica_to_gl.h b/src/video_core/renderer_opengl/pica_to_gl.h
index a604e94d4..415358b6c 100644
--- a/src/video_core/renderer_opengl/pica_to_gl.h
+++ b/src/video_core/renderer_opengl/pica_to_gl.h
@@ -26,7 +26,7 @@ namespace PicaToGL {
inline GLenum TextureFilterMode(Pica::Regs::TextureConfig::TextureFilter mode) {
static const GLenum filter_mode_table[] = {
GL_NEAREST, // TextureFilter::Nearest
- GL_LINEAR // TextureFilter::Linear
+ GL_LINEAR, // TextureFilter::Linear
};
// Range check table for input
@@ -55,7 +55,7 @@ inline GLenum WrapMode(Pica::Regs::TextureConfig::WrapMode mode) {
GL_CLAMP_TO_EDGE, // WrapMode::ClampToEdge
GL_CLAMP_TO_BORDER, // WrapMode::ClampToBorder
GL_REPEAT, // WrapMode::Repeat
- GL_MIRRORED_REPEAT // WrapMode::MirroredRepeat
+ GL_MIRRORED_REPEAT, // WrapMode::MirroredRepeat
};
// Range check table for input
@@ -192,7 +192,7 @@ inline GLenum StencilOp(Pica::Regs::StencilAction action) {
GL_DECR, // StencilAction::Decrement
GL_INVERT, // StencilAction::Invert
GL_INCR_WRAP, // StencilAction::IncrementWrap
- GL_DECR_WRAP // StencilAction::DecrementWrap
+ GL_DECR_WRAP, // StencilAction::DecrementWrap
};
// Range check table for input
@@ -207,12 +207,16 @@ inline GLenum StencilOp(Pica::Regs::StencilAction action) {
}
inline GLvec4 ColorRGBA8(const u32 color) {
- return {{(color >> 0 & 0xFF) / 255.0f, (color >> 8 & 0xFF) / 255.0f,
- (color >> 16 & 0xFF) / 255.0f, (color >> 24 & 0xFF) / 255.0f}};
+ return {{
+ (color >> 0 & 0xFF) / 255.0f, (color >> 8 & 0xFF) / 255.0f, (color >> 16 & 0xFF) / 255.0f,
+ (color >> 24 & 0xFF) / 255.0f,
+ }};
}
inline std::array<GLfloat, 3> LightColor(const Pica::Regs::LightColor& color) {
- return {{color.r / 255.0f, color.g / 255.0f, color.b / 255.0f}};
+ return {{
+ color.r / 255.0f, color.g / 255.0f, color.b / 255.0f,
+ }};
}
} // namespace
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
index 3cabda8f9..a1d08e04d 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
@@ -87,15 +87,13 @@ struct ScreenRectVertex {
* by a 3x2 matrix.
*/
static std::array<GLfloat, 3 * 2> MakeOrthographicMatrix(const float width, const float height) {
- std::array<GLfloat, 3 * 2> matrix;
-
- matrix[0] = 2.f / width;
- matrix[2] = 0.f;
- matrix[4] = -1.f;
- matrix[1] = 0.f;
- matrix[3] = -2.f / height;
- matrix[5] = 1.f;
+ std::array<GLfloat, 3 * 2> matrix; // Laid out in column-major order
+
+ // clang-format off
+ matrix[0] = 2.f / width; matrix[2] = 0.f; matrix[4] = -1.f;
+ matrix[1] = 0.f; matrix[3] = -2.f / height; matrix[5] = 1.f;
// Last matrix row is implicitly assumed to be [0, 0, 1].
+ // clang-format on
return matrix;
}
@@ -107,8 +105,7 @@ RendererOpenGL::RendererOpenGL() {
}
/// RendererOpenGL destructor
-RendererOpenGL::~RendererOpenGL() {
-}
+RendererOpenGL::~RendererOpenGL() {}
/// Swap buffers (render frame)
void RendererOpenGL::SwapBuffers() {
@@ -215,8 +212,7 @@ void RendererOpenGL::LoadFBToScreenInfo(const GPU::Regs::FramebufferConfig& fram
// Update existing texture
// TODO: Test what happens on hardware when you change the framebuffer dimensions so that
- // they
- // differ from the LCD resolution.
+ // they differ from the LCD resolution.
// TODO: Applications could theoretically crash Citra here by specifying too large
// framebuffer sizes. We should make sure that this cannot happen.
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, framebuffer.width, framebuffer.height,
@@ -231,10 +227,8 @@ void RendererOpenGL::LoadFBToScreenInfo(const GPU::Regs::FramebufferConfig& fram
}
/**
- * Fills active OpenGL texture with the given RGB color.
- * Since the color is solid, the texture can be 1x1 but will stretch across whatever it's rendered
- * on.
- * This has the added benefit of being *really fast*.
+ * Fills active OpenGL texture with the given RGB color. Since the color is solid, the texture can
+ * be 1x1 but will stretch across whatever it's rendered on.
*/
void RendererOpenGL::LoadColorToActiveGLTexture(u8 color_r, u8 color_g, u8 color_b,
const TextureInfo& texture) {
@@ -424,8 +418,7 @@ void RendererOpenGL::DrawScreens() {
}
/// Updates the framerate
-void RendererOpenGL::UpdateFramerate() {
-}
+void RendererOpenGL::UpdateFramerate() {}
/**
* Set the emulator window to use for renderer
@@ -513,5 +506,4 @@ bool RendererOpenGL::Init() {
}
/// Shutdown the renderer
-void RendererOpenGL::ShutDown() {
-}
+void RendererOpenGL::ShutDown() {}
diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h
index faeb519ec..762b790c1 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.h
+++ b/src/video_core/renderer_opengl/renderer_opengl.h
@@ -81,11 +81,14 @@ private:
OGLVertexArray vertex_array;
OGLBuffer vertex_buffer;
OGLShader shader;
- std::array<ScreenInfo, 2>
- screen_infos; ///< Display information for top and bottom screens respectively
+
+ /// Display information for top and bottom screens respectively
+ std::array<ScreenInfo, 2> screen_infos;
+
// Shader uniform location indices
GLuint uniform_modelview_matrix;
GLuint uniform_color_texture;
+
// Shader attribute input indices
GLuint attrib_position;
GLuint attrib_tex_coord;
diff --git a/src/video_core/shader/shader.cpp b/src/video_core/shader/shader.cpp
index 852c5a9a0..c38bdcc3c 100644
--- a/src/video_core/shader/shader.cpp
+++ b/src/video_core/shader/shader.cpp
@@ -96,8 +96,8 @@ void ShaderSetup::Setup() {
#ifdef ARCHITECTURE_x86_64
if (VideoCore::g_shader_jit_enabled) {
u64 cache_key =
- (Common::ComputeHash64(&g_state.vs.program_code, sizeof(g_state.vs.program_code)) ^
- Common::ComputeHash64(&g_state.vs.swizzle_data, sizeof(g_state.vs.swizzle_data)));
+ Common::ComputeHash64(&g_state.vs.program_code, sizeof(g_state.vs.program_code)) ^
+ Common::ComputeHash64(&g_state.vs.swizzle_data, sizeof(g_state.vs.swizzle_data));
auto iter = shader_map.find(cache_key);
if (iter != shader_map.end()) {
diff --git a/src/video_core/shader/shader.h b/src/video_core/shader/shader.h
index 830d933a8..79c716b6e 100644
--- a/src/video_core/shader/shader.h
+++ b/src/video_core/shader/shader.h
@@ -358,8 +358,7 @@ struct ShaderSetup {
/**
* Performs any shader unit setup that only needs to happen once per shader (as opposed to once
- * per
- * vertex, which would happen within the `Run` function).
+ * per vertex, which would happen within the `Run` function).
*/
void Setup();
diff --git a/src/video_core/shader/shader_interpreter.cpp b/src/video_core/shader/shader_interpreter.cpp
index 681ff9728..41df8a2fd 100644
--- a/src/video_core/shader/shader_interpreter.cpp
+++ b/src/video_core/shader/shader_interpreter.cpp
@@ -80,9 +80,8 @@ void RunInterpreter(const ShaderSetup& setup, UnitState<Debug>& state, unsigned
auto call = [&program_counter, &call_stack](UnitState<Debug>& state, u32 offset,
u32 num_instructions, u32 return_offset,
u8 repeat_count, u8 loop_increment) {
- program_counter =
- offset -
- 1; // -1 to make sure when incrementing the PC we end up at the correct offset
+ // -1 to make sure when incrementing the PC we end up at the correct offset
+ program_counter = offset - 1;
ASSERT(call_stack.size() < call_stack.capacity());
call_stack.push_back(
{offset + num_instructions, return_offset, repeat_count, loop_increment, offset});
diff --git a/src/video_core/shader/shader_jit_x64.cpp b/src/video_core/shader/shader_jit_x64.cpp
index 04e04ba1a..d1b2ce8d5 100644
--- a/src/video_core/shader/shader_jit_x64.cpp
+++ b/src/video_core/shader/shader_jit_x64.cpp
@@ -590,8 +590,7 @@ void JitShader::Compile_RSQ(Instruction instr) {
Compile_DestEnable(instr, SRC1);
}
-void JitShader::Compile_NOP(Instruction instr) {
-}
+void JitShader::Compile_NOP(Instruction instr) {}
void JitShader::Compile_END(Instruction instr) {
ABI_PopRegistersAndAdjustStack(ABI_ALL_CALLEE_SAVED, 8);
diff --git a/src/video_core/swrasterizer.h b/src/video_core/swrasterizer.h
index bca9780e5..12dc56bef 100644
--- a/src/video_core/swrasterizer.h
+++ b/src/video_core/swrasterizer.h
@@ -19,15 +19,10 @@ namespace VideoCore {
class SWRasterizer : public RasterizerInterface {
void AddTriangle(const Pica::Shader::OutputVertex& v0, const Pica::Shader::OutputVertex& v1,
const Pica::Shader::OutputVertex& v2) override;
- void DrawTriangles() override {
- }
- void NotifyPicaRegisterChanged(u32 id) override {
- }
- void FlushAll() override {
- }
- void FlushRegion(PAddr addr, u32 size) override {
- }
- void FlushAndInvalidateRegion(PAddr addr, u32 size) override {
- }
+ void DrawTriangles() override {}
+ void NotifyPicaRegisterChanged(u32 id) override {}
+ void FlushAll() override {}
+ void FlushRegion(PAddr addr, u32 size) override {}
+ void FlushAndInvalidateRegion(PAddr addr, u32 size) override {}
};
}