diff options
Diffstat (limited to 'src')
102 files changed, 206 insertions, 206 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c7283e82c..0eca8e90e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt | |||
| @@ -83,7 +83,7 @@ if (MSVC) | |||
| 83 | ) | 83 | ) |
| 84 | 84 | ||
| 85 | if (USE_CCACHE OR YUZU_USE_PRECOMPILED_HEADERS) | 85 | if (USE_CCACHE OR YUZU_USE_PRECOMPILED_HEADERS) |
| 86 | # when caching, we need to use /Z7 to downgrade debug info to use an older but more cachable format | 86 | # when caching, we need to use /Z7 to downgrade debug info to use an older but more cacheable format |
| 87 | # Precompiled headers are deleted if not using /Z7. See https://github.com/nanoant/CMakePCHCompiler/issues/21 | 87 | # Precompiled headers are deleted if not using /Z7. See https://github.com/nanoant/CMakePCHCompiler/issues/21 |
| 88 | add_compile_options(/Z7) | 88 | add_compile_options(/Z7) |
| 89 | else() | 89 | else() |
diff --git a/src/audio_core/audio_out_manager.h b/src/audio_core/audio_out_manager.h index 24981e08f..1e05ec5ed 100644 --- a/src/audio_core/audio_out_manager.h +++ b/src/audio_core/audio_out_manager.h | |||
| @@ -58,7 +58,7 @@ public: | |||
| 58 | /** | 58 | /** |
| 59 | * Get a list of audio out device names. | 59 | * Get a list of audio out device names. |
| 60 | * | 60 | * |
| 61 | * @oaram names - Output container to write names to. | 61 | * @param names - Output container to write names to. |
| 62 | * @return Number of names written. | 62 | * @return Number of names written. |
| 63 | */ | 63 | */ |
| 64 | u32 GetAudioOutDeviceNames( | 64 | u32 GetAudioOutDeviceNames( |
diff --git a/src/audio_core/device/audio_buffer.h b/src/audio_core/device/audio_buffer.h index 7128ef72a..4eb80c2ba 100644 --- a/src/audio_core/device/audio_buffer.h +++ b/src/audio_core/device/audio_buffer.h | |||
| @@ -16,7 +16,7 @@ struct AudioBuffer { | |||
| 16 | s64 played_timestamp; | 16 | s64 played_timestamp; |
| 17 | /// Game memory address for these samples. | 17 | /// Game memory address for these samples. |
| 18 | VAddr samples; | 18 | VAddr samples; |
| 19 | /// Unqiue identifier for this buffer. | 19 | /// Unique identifier for this buffer. |
| 20 | u64 tag; | 20 | u64 tag; |
| 21 | /// Size of the samples buffer. | 21 | /// Size of the samples buffer. |
| 22 | u64 size; | 22 | u64 size; |
diff --git a/src/audio_core/renderer/adsp/audio_renderer.cpp b/src/audio_core/renderer/adsp/audio_renderer.cpp index 0e437e779..42b4b167a 100644 --- a/src/audio_core/renderer/adsp/audio_renderer.cpp +++ b/src/audio_core/renderer/adsp/audio_renderer.cpp | |||
| @@ -165,7 +165,7 @@ void AudioRenderer::ThreadFunc() { | |||
| 165 | // Check this buffer is valid, as it may not be used. | 165 | // Check this buffer is valid, as it may not be used. |
| 166 | if (command_buffer.buffer != 0) { | 166 | if (command_buffer.buffer != 0) { |
| 167 | // If there are no remaining commands (from the previous list), | 167 | // If there are no remaining commands (from the previous list), |
| 168 | // this is a new command list, initalize it. | 168 | // this is a new command list, initialize it. |
| 169 | if (command_buffer.remaining_command_count == 0) { | 169 | if (command_buffer.remaining_command_count == 0) { |
| 170 | command_list_processor.Initialize(system, command_buffer.buffer, | 170 | command_list_processor.Initialize(system, command_buffer.buffer, |
| 171 | command_buffer.size, streams[index]); | 171 | command_buffer.size, streams[index]); |
diff --git a/src/audio_core/renderer/behavior/behavior_info.h b/src/audio_core/renderer/behavior/behavior_info.h index 15c948344..b52340229 100644 --- a/src/audio_core/renderer/behavior/behavior_info.h +++ b/src/audio_core/renderer/behavior/behavior_info.h | |||
| @@ -155,7 +155,7 @@ public: | |||
| 155 | /** | 155 | /** |
| 156 | * Check if a variadic command buffer is supported. | 156 | * Check if a variadic command buffer is supported. |
| 157 | * As of Rev 5 with the added optional performance metric logging, the command | 157 | * As of Rev 5 with the added optional performance metric logging, the command |
| 158 | * buffer can be a variable size, so take that into account for calcualting its size. | 158 | * buffer can be a variable size, so take that into account for calculating its size. |
| 159 | * | 159 | * |
| 160 | * @return True if supported, otherwise false. | 160 | * @return True if supported, otherwise false. |
| 161 | */ | 161 | */ |
diff --git a/src/audio_core/renderer/effect/effect_info_base.h b/src/audio_core/renderer/effect/effect_info_base.h index 8525fde05..dbdccf278 100644 --- a/src/audio_core/renderer/effect/effect_info_base.h +++ b/src/audio_core/renderer/effect/effect_info_base.h | |||
| @@ -192,7 +192,7 @@ public: | |||
| 192 | /** | 192 | /** |
| 193 | * Get this effect's parameter data. | 193 | * Get this effect's parameter data. |
| 194 | * | 194 | * |
| 195 | * @return Pointer to the parametter, must be cast to the correct type. | 195 | * @return Pointer to the parameter, must be cast to the correct type. |
| 196 | */ | 196 | */ |
| 197 | u8* GetParameter() { | 197 | u8* GetParameter() { |
| 198 | return parameter.data(); | 198 | return parameter.data(); |
| @@ -201,7 +201,7 @@ public: | |||
| 201 | /** | 201 | /** |
| 202 | * Get this effect's parameter data. | 202 | * Get this effect's parameter data. |
| 203 | * | 203 | * |
| 204 | * @return Pointer to the parametter, must be cast to the correct type. | 204 | * @return Pointer to the parameter, must be cast to the correct type. |
| 205 | */ | 205 | */ |
| 206 | u8* GetStateBuffer() { | 206 | u8* GetStateBuffer() { |
| 207 | return state.data(); | 207 | return state.data(); |
diff --git a/src/audio_core/renderer/memory/memory_pool_info.h b/src/audio_core/renderer/memory/memory_pool_info.h index 537a466ec..80c571bc1 100644 --- a/src/audio_core/renderer/memory/memory_pool_info.h +++ b/src/audio_core/renderer/memory/memory_pool_info.h | |||
| @@ -29,7 +29,7 @@ public: | |||
| 29 | */ | 29 | */ |
| 30 | enum class State { | 30 | enum class State { |
| 31 | Invalid, | 31 | Invalid, |
| 32 | Aquired, | 32 | Acquired, |
| 33 | RequestDetach, | 33 | RequestDetach, |
| 34 | Detached, | 34 | Detached, |
| 35 | RequestAttach, | 35 | RequestAttach, |
diff --git a/src/audio_core/renderer/mix/mix_context.h b/src/audio_core/renderer/mix/mix_context.h index da3aa2829..bcd9637da 100644 --- a/src/audio_core/renderer/mix/mix_context.h +++ b/src/audio_core/renderer/mix/mix_context.h | |||
| @@ -93,7 +93,7 @@ public: | |||
| 93 | * Splitter sort, traverse the splitter node graph and sort the sorted mixes from results. | 93 | * Splitter sort, traverse the splitter node graph and sort the sorted mixes from results. |
| 94 | * | 94 | * |
| 95 | * @param splitter_context - Splitter context for the sort. | 95 | * @param splitter_context - Splitter context for the sort. |
| 96 | * @return True if the sort was successful, othewise false. | 96 | * @return True if the sort was successful, otherwise false. |
| 97 | */ | 97 | */ |
| 98 | bool TSortInfo(const SplitterContext& splitter_context); | 98 | bool TSortInfo(const SplitterContext& splitter_context); |
| 99 | 99 | ||
diff --git a/src/audio_core/renderer/performance/performance_detail.h b/src/audio_core/renderer/performance/performance_detail.h index 3a4897e60..f603b9026 100644 --- a/src/audio_core/renderer/performance/performance_detail.h +++ b/src/audio_core/renderer/performance/performance_detail.h | |||
| @@ -33,7 +33,7 @@ struct PerformanceDetailVersion1 { | |||
| 33 | /* 0x0D */ PerformanceEntryType entry_type; | 33 | /* 0x0D */ PerformanceEntryType entry_type; |
| 34 | }; | 34 | }; |
| 35 | static_assert(sizeof(PerformanceDetailVersion1) == 0x10, | 35 | static_assert(sizeof(PerformanceDetailVersion1) == 0x10, |
| 36 | "PerformanceDetailVersion1 has the worng size!"); | 36 | "PerformanceDetailVersion1 has the wrong size!"); |
| 37 | 37 | ||
| 38 | struct PerformanceDetailVersion2 { | 38 | struct PerformanceDetailVersion2 { |
| 39 | /* 0x00 */ u32 node_id; | 39 | /* 0x00 */ u32 node_id; |
| @@ -45,6 +45,6 @@ struct PerformanceDetailVersion2 { | |||
| 45 | /* 0x14 */ char unk14[0x4]; | 45 | /* 0x14 */ char unk14[0x4]; |
| 46 | }; | 46 | }; |
| 47 | static_assert(sizeof(PerformanceDetailVersion2) == 0x18, | 47 | static_assert(sizeof(PerformanceDetailVersion2) == 0x18, |
| 48 | "PerformanceDetailVersion2 has the worng size!"); | 48 | "PerformanceDetailVersion2 has the wrong size!"); |
| 49 | 49 | ||
| 50 | } // namespace AudioCore::AudioRenderer | 50 | } // namespace AudioCore::AudioRenderer |
diff --git a/src/audio_core/renderer/performance/performance_entry.h b/src/audio_core/renderer/performance/performance_entry.h index d1b21406b..d6b1158db 100644 --- a/src/audio_core/renderer/performance/performance_entry.h +++ b/src/audio_core/renderer/performance/performance_entry.h | |||
| @@ -22,7 +22,7 @@ struct PerformanceEntryVersion1 { | |||
| 22 | /* 0x0C */ PerformanceEntryType entry_type; | 22 | /* 0x0C */ PerformanceEntryType entry_type; |
| 23 | }; | 23 | }; |
| 24 | static_assert(sizeof(PerformanceEntryVersion1) == 0x10, | 24 | static_assert(sizeof(PerformanceEntryVersion1) == 0x10, |
| 25 | "PerformanceEntryVersion1 has the worng size!"); | 25 | "PerformanceEntryVersion1 has the wrong size!"); |
| 26 | 26 | ||
| 27 | struct PerformanceEntryVersion2 { | 27 | struct PerformanceEntryVersion2 { |
| 28 | /* 0x00 */ u32 node_id; | 28 | /* 0x00 */ u32 node_id; |
| @@ -32,6 +32,6 @@ struct PerformanceEntryVersion2 { | |||
| 32 | /* 0x0D */ char unk0D[0xB]; | 32 | /* 0x0D */ char unk0D[0xB]; |
| 33 | }; | 33 | }; |
| 34 | static_assert(sizeof(PerformanceEntryVersion2) == 0x18, | 34 | static_assert(sizeof(PerformanceEntryVersion2) == 0x18, |
| 35 | "PerformanceEntryVersion2 has the worng size!"); | 35 | "PerformanceEntryVersion2 has the wrong size!"); |
| 36 | 36 | ||
| 37 | } // namespace AudioCore::AudioRenderer | 37 | } // namespace AudioCore::AudioRenderer |
diff --git a/src/audio_core/renderer/performance/performance_frame_header.h b/src/audio_core/renderer/performance/performance_frame_header.h index 707cc0afb..b1848284e 100644 --- a/src/audio_core/renderer/performance/performance_frame_header.h +++ b/src/audio_core/renderer/performance/performance_frame_header.h | |||
| @@ -16,7 +16,7 @@ struct PerformanceFrameHeaderVersion1 { | |||
| 16 | /* 0x14 */ u32 frame_index; | 16 | /* 0x14 */ u32 frame_index; |
| 17 | }; | 17 | }; |
| 18 | static_assert(sizeof(PerformanceFrameHeaderVersion1) == 0x18, | 18 | static_assert(sizeof(PerformanceFrameHeaderVersion1) == 0x18, |
| 19 | "PerformanceFrameHeaderVersion1 has the worng size!"); | 19 | "PerformanceFrameHeaderVersion1 has the wrong size!"); |
| 20 | 20 | ||
| 21 | struct PerformanceFrameHeaderVersion2 { | 21 | struct PerformanceFrameHeaderVersion2 { |
| 22 | /* 0x00 */ u32 magic; // "PERF" | 22 | /* 0x00 */ u32 magic; // "PERF" |
| @@ -31,6 +31,6 @@ struct PerformanceFrameHeaderVersion2 { | |||
| 31 | /* 0x25 */ char unk25[0xB]; | 31 | /* 0x25 */ char unk25[0xB]; |
| 32 | }; | 32 | }; |
| 33 | static_assert(sizeof(PerformanceFrameHeaderVersion2) == 0x30, | 33 | static_assert(sizeof(PerformanceFrameHeaderVersion2) == 0x30, |
| 34 | "PerformanceFrameHeaderVersion2 has the worng size!"); | 34 | "PerformanceFrameHeaderVersion2 has the wrong size!"); |
| 35 | 35 | ||
| 36 | } // namespace AudioCore::AudioRenderer | 36 | } // namespace AudioCore::AudioRenderer |
diff --git a/src/audio_core/renderer/splitter/splitter_context.h b/src/audio_core/renderer/splitter/splitter_context.h index cfd092b4f..1a63db1d3 100644 --- a/src/audio_core/renderer/splitter/splitter_context.h +++ b/src/audio_core/renderer/splitter/splitter_context.h | |||
| @@ -55,7 +55,7 @@ public: | |||
| 55 | /** | 55 | /** |
| 56 | * Get the total number of splitter destinations. | 56 | * Get the total number of splitter destinations. |
| 57 | * | 57 | * |
| 58 | * @return Number of destiantions. | 58 | * @return Number of destinations. |
| 59 | */ | 59 | */ |
| 60 | u32 GetDataCount() const; | 60 | u32 GetDataCount() const; |
| 61 | 61 | ||
diff --git a/src/audio_core/renderer/splitter/splitter_destinations_data.h b/src/audio_core/renderer/splitter/splitter_destinations_data.h index bd3d55748..d55ce0ad3 100644 --- a/src/audio_core/renderer/splitter/splitter_destinations_data.h +++ b/src/audio_core/renderer/splitter/splitter_destinations_data.h | |||
| @@ -87,7 +87,7 @@ public: | |||
| 87 | /** | 87 | /** |
| 88 | * Update this destination. | 88 | * Update this destination. |
| 89 | * | 89 | * |
| 90 | * @param params - Inpout parameters to update the destination. | 90 | * @param params - Input parameters to update the destination. |
| 91 | */ | 91 | */ |
| 92 | void Update(const InParameter& params); | 92 | void Update(const InParameter& params); |
| 93 | 93 | ||
| @@ -126,9 +126,9 @@ private: | |||
| 126 | std::array<f32, MaxMixBuffers> prev_mix_volumes{0.0f}; | 126 | std::array<f32, MaxMixBuffers> prev_mix_volumes{0.0f}; |
| 127 | /// Next destination in the mix chain | 127 | /// Next destination in the mix chain |
| 128 | SplitterDestinationData* next{}; | 128 | SplitterDestinationData* next{}; |
| 129 | /// Is this destiantion in use? | 129 | /// Is this destination in use? |
| 130 | bool in_use{}; | 130 | bool in_use{}; |
| 131 | /// Does this destiantion need its volumes updated? | 131 | /// Does this destination need its volumes updated? |
| 132 | bool need_update{}; | 132 | bool need_update{}; |
| 133 | }; | 133 | }; |
| 134 | 134 | ||
diff --git a/src/audio_core/renderer/splitter/splitter_info.h b/src/audio_core/renderer/splitter/splitter_info.h index d1d75064c..b0ad01fe0 100644 --- a/src/audio_core/renderer/splitter/splitter_info.h +++ b/src/audio_core/renderer/splitter/splitter_info.h | |||
| @@ -49,14 +49,14 @@ public: | |||
| 49 | /** | 49 | /** |
| 50 | * Get the number of destinations in this splitter. | 50 | * Get the number of destinations in this splitter. |
| 51 | * | 51 | * |
| 52 | * @return The number of destiantions. | 52 | * @return The number of destinations. |
| 53 | */ | 53 | */ |
| 54 | u32 GetDestinationCount() const; | 54 | u32 GetDestinationCount() const; |
| 55 | 55 | ||
| 56 | /** | 56 | /** |
| 57 | * Set the number of destinations in this splitter. | 57 | * Set the number of destinations in this splitter. |
| 58 | * | 58 | * |
| 59 | * @param count - The new number of destiantions. | 59 | * @param count - The new number of destinations. |
| 60 | */ | 60 | */ |
| 61 | void SetDestinationCount(u32 count); | 61 | void SetDestinationCount(u32 count); |
| 62 | 62 | ||
diff --git a/src/audio_core/renderer/system.h b/src/audio_core/renderer/system.h index 429196e41..e328783b6 100644 --- a/src/audio_core/renderer/system.h +++ b/src/audio_core/renderer/system.h | |||
| @@ -154,7 +154,7 @@ public: | |||
| 154 | ExecutionMode GetExecutionMode() const; | 154 | ExecutionMode GetExecutionMode() const; |
| 155 | 155 | ||
| 156 | /** | 156 | /** |
| 157 | * Get the rendering deivce for this system. | 157 | * Get the rendering device for this system. |
| 158 | * This is unused. | 158 | * This is unused. |
| 159 | * | 159 | * |
| 160 | * @return Rendering device for this system. | 160 | * @return Rendering device for this system. |
| @@ -241,7 +241,7 @@ private: | |||
| 241 | std::span<u8> command_workbuffer{}; | 241 | std::span<u8> command_workbuffer{}; |
| 242 | /// Size of command workbuffer | 242 | /// Size of command workbuffer |
| 243 | u64 command_workbuffer_size{}; | 243 | u64 command_workbuffer_size{}; |
| 244 | /// Numebr of commands in the workbuffer | 244 | /// Number of commands in the workbuffer |
| 245 | u64 command_buffer_size{}; | 245 | u64 command_buffer_size{}; |
| 246 | /// Manager for upsamplers | 246 | /// Manager for upsamplers |
| 247 | UpsamplerManager* upsampler_manager{}; | 247 | UpsamplerManager* upsampler_manager{}; |
diff --git a/src/audio_core/renderer/system_manager.h b/src/audio_core/renderer/system_manager.h index 81457a3a1..415ddb74f 100644 --- a/src/audio_core/renderer/system_manager.h +++ b/src/audio_core/renderer/system_manager.h | |||
| @@ -36,7 +36,7 @@ public: | |||
| 36 | /** | 36 | /** |
| 37 | * Initialize the system manager, called when any system is registered. | 37 | * Initialize the system manager, called when any system is registered. |
| 38 | * | 38 | * |
| 39 | * @return True if sucessfully initialized, otherwise false. | 39 | * @return True if successfully initialized, otherwise false. |
| 40 | */ | 40 | */ |
| 41 | bool InitializeUnsafe(); | 41 | bool InitializeUnsafe(); |
| 42 | 42 | ||
| @@ -50,7 +50,7 @@ public: | |||
| 50 | * The manager does not own the system, so do not free it without calling Remove. | 50 | * The manager does not own the system, so do not free it without calling Remove. |
| 51 | * | 51 | * |
| 52 | * @param system - The system to add. | 52 | * @param system - The system to add. |
| 53 | * @return True if succesfully added, otherwise false. | 53 | * @return True if successfully added, otherwise false. |
| 54 | */ | 54 | */ |
| 55 | bool Add(System& system); | 55 | bool Add(System& system); |
| 56 | 56 | ||
| @@ -58,7 +58,7 @@ public: | |||
| 58 | * Remove an audio render system from the manager. | 58 | * Remove an audio render system from the manager. |
| 59 | * | 59 | * |
| 60 | * @param system - The system to remove. | 60 | * @param system - The system to remove. |
| 61 | * @return True if succesfully removed, otherwise false. | 61 | * @return True if successfully removed, otherwise false. |
| 62 | */ | 62 | */ |
| 63 | bool Remove(System& system); | 63 | bool Remove(System& system); |
| 64 | 64 | ||
diff --git a/src/audio_core/renderer/voice/voice_info.h b/src/audio_core/renderer/voice/voice_info.h index 930180895..3c5d3e04f 100644 --- a/src/audio_core/renderer/voice/voice_info.h +++ b/src/audio_core/renderer/voice/voice_info.h | |||
| @@ -183,7 +183,7 @@ public: | |||
| 183 | void Initialize(); | 183 | void Initialize(); |
| 184 | 184 | ||
| 185 | /** | 185 | /** |
| 186 | * Does this voice ned an update? | 186 | * Does this voice need an update? |
| 187 | * | 187 | * |
| 188 | * @param params - Input parameters to check matching. | 188 | * @param params - Input parameters to check matching. |
| 189 | * | 189 | * |
| @@ -236,7 +236,7 @@ public: | |||
| 236 | * | 236 | * |
| 237 | * @param error_info - Output array of errors. | 237 | * @param error_info - Output array of errors. |
| 238 | * @param wave_buffer - The wavebuffer to be updated. | 238 | * @param wave_buffer - The wavebuffer to be updated. |
| 239 | * @param wave_buffer_internal - Input parametters to be used for the update. | 239 | * @param wave_buffer_internal - Input parameters to be used for the update. |
| 240 | * @param sample_format - Sample format of the wavebuffer. | 240 | * @param sample_format - Sample format of the wavebuffer. |
| 241 | * @param valid - Is this wavebuffer valid? | 241 | * @param valid - Is this wavebuffer valid? |
| 242 | * @param pool_mapper - Used to map the wavebuffers. | 242 | * @param pool_mapper - Used to map the wavebuffers. |
diff --git a/src/common/announce_multiplayer_room.h b/src/common/announce_multiplayer_room.h index 4a3100fa4..f32060196 100644 --- a/src/common/announce_multiplayer_room.h +++ b/src/common/announce_multiplayer_room.h | |||
| @@ -66,7 +66,7 @@ public: | |||
| 66 | * @param description The room description | 66 | * @param description The room description |
| 67 | * @param port The port of the room | 67 | * @param port The port of the room |
| 68 | * @param net_version The version of the libNetwork that gets used | 68 | * @param net_version The version of the libNetwork that gets used |
| 69 | * @param has_password True if the room is passowrd protected | 69 | * @param has_password True if the room is password protected |
| 70 | * @param preferred_game The preferred game of the room | 70 | * @param preferred_game The preferred game of the room |
| 71 | * @param preferred_game_id The title id of the preferred game | 71 | * @param preferred_game_id The title id of the preferred game |
| 72 | */ | 72 | */ |
diff --git a/src/common/fiber.cpp b/src/common/fiber.cpp index bc92b360b..c991b7cf1 100644 --- a/src/common/fiber.cpp +++ b/src/common/fiber.cpp | |||
| @@ -90,7 +90,7 @@ Fiber::~Fiber() { | |||
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | void Fiber::Exit() { | 92 | void Fiber::Exit() { |
| 93 | ASSERT_MSG(impl->is_thread_fiber, "Exitting non main thread fiber"); | 93 | ASSERT_MSG(impl->is_thread_fiber, "Exiting non main thread fiber"); |
| 94 | if (!impl->is_thread_fiber) { | 94 | if (!impl->is_thread_fiber) { |
| 95 | return; | 95 | return; |
| 96 | } | 96 | } |
diff --git a/src/common/fixed_point.h b/src/common/fixed_point.h index f899b0d54..b0f3ae2cc 100644 --- a/src/common/fixed_point.h +++ b/src/common/fixed_point.h | |||
| @@ -22,7 +22,7 @@ class FixedPoint; | |||
| 22 | namespace detail { | 22 | namespace detail { |
| 23 | 23 | ||
| 24 | // helper templates to make magic with types :) | 24 | // helper templates to make magic with types :) |
| 25 | // these allow us to determine resonable types from | 25 | // these allow us to determine reasonable types from |
| 26 | // a desired size, they also let us infer the next largest type | 26 | // a desired size, they also let us infer the next largest type |
| 27 | // from a type which is nice for the division op | 27 | // from a type which is nice for the division op |
| 28 | template <size_t T> | 28 | template <size_t T> |
diff --git a/src/common/host_memory.cpp b/src/common/host_memory.cpp index 611c7d1a3..8e4f1f97a 100644 --- a/src/common/host_memory.cpp +++ b/src/common/host_memory.cpp | |||
| @@ -322,7 +322,7 @@ private: | |||
| 322 | } | 322 | } |
| 323 | 323 | ||
| 324 | /// Return true when a given memory region is a "nieche" and the placeholders don't have to be | 324 | /// Return true when a given memory region is a "nieche" and the placeholders don't have to be |
| 325 | /// splitted. | 325 | /// split. |
| 326 | bool IsNiechePlaceholder(size_t virtual_offset, size_t length) const { | 326 | bool IsNiechePlaceholder(size_t virtual_offset, size_t length) const { |
| 327 | const auto it = placeholders.upper_bound({virtual_offset, virtual_offset + length}); | 327 | const auto it = placeholders.upper_bound({virtual_offset, virtual_offset + length}); |
| 328 | if (it != placeholders.end() && it->lower() == virtual_offset + length) { | 328 | if (it != placeholders.end() && it->lower() == virtual_offset + length) { |
| @@ -484,7 +484,7 @@ class HostMemory::Impl { | |||
| 484 | public: | 484 | public: |
| 485 | explicit Impl(size_t /*backing_size */, size_t /* virtual_size */) { | 485 | explicit Impl(size_t /*backing_size */, size_t /* virtual_size */) { |
| 486 | // This is just a place holder. | 486 | // This is just a place holder. |
| 487 | // Please implement fastmem in a propper way on your platform. | 487 | // Please implement fastmem in a proper way on your platform. |
| 488 | throw std::bad_alloc{}; | 488 | throw std::bad_alloc{}; |
| 489 | } | 489 | } |
| 490 | 490 | ||
diff --git a/src/common/input.h b/src/common/input.h index 98e934685..51b277c1f 100644 --- a/src/common/input.h +++ b/src/common/input.h | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | 15 | ||
| 16 | namespace Common::Input { | 16 | namespace Common::Input { |
| 17 | 17 | ||
| 18 | // Type of data that is expected to recieve or send | 18 | // Type of data that is expected to receive or send |
| 19 | enum class InputType { | 19 | enum class InputType { |
| 20 | None, | 20 | None, |
| 21 | Battery, | 21 | Battery, |
| @@ -103,7 +103,7 @@ enum class VibrationAmplificationType { | |||
| 103 | struct AnalogProperties { | 103 | struct AnalogProperties { |
| 104 | // Anything below this value will be detected as zero | 104 | // Anything below this value will be detected as zero |
| 105 | float deadzone{}; | 105 | float deadzone{}; |
| 106 | // Anyting above this values will be detected as one | 106 | // Anything above this values will be detected as one |
| 107 | float range{1.0f}; | 107 | float range{1.0f}; |
| 108 | // Minimum value to be detected as active | 108 | // Minimum value to be detected as active |
| 109 | float threshold{0.5f}; | 109 | float threshold{0.5f}; |
| @@ -209,7 +209,7 @@ struct LedStatus { | |||
| 209 | bool led_4{}; | 209 | bool led_4{}; |
| 210 | }; | 210 | }; |
| 211 | 211 | ||
| 212 | // Raw data fom camera | 212 | // Raw data from camera |
| 213 | struct CameraStatus { | 213 | struct CameraStatus { |
| 214 | CameraFormat format{CameraFormat::None}; | 214 | CameraFormat format{CameraFormat::None}; |
| 215 | std::vector<u8> data{}; | 215 | std::vector<u8> data{}; |
| @@ -428,7 +428,7 @@ inline void UnregisterOutputFactory(const std::string& name) { | |||
| 428 | } | 428 | } |
| 429 | 429 | ||
| 430 | /** | 430 | /** |
| 431 | * Create an input device from given paramters. | 431 | * Create an input device from given parameters. |
| 432 | * @tparam InputDeviceType the type of input devices to create | 432 | * @tparam InputDeviceType the type of input devices to create |
| 433 | * @param params a serialized ParamPackage string that contains all parameters for creating the | 433 | * @param params a serialized ParamPackage string that contains all parameters for creating the |
| 434 | * device | 434 | * device |
diff --git a/src/common/swap.h b/src/common/swap.h index 037b82781..085baaf9a 100644 --- a/src/common/swap.h +++ b/src/common/swap.h | |||
| @@ -229,7 +229,7 @@ public: | |||
| 229 | value = swap(swap() - 1); | 229 | value = swap(swap() - 1); |
| 230 | return old; | 230 | return old; |
| 231 | } | 231 | } |
| 232 | // Comparaison | 232 | // Comparison |
| 233 | // v == i | 233 | // v == i |
| 234 | bool operator==(const swapped_t& i) const { | 234 | bool operator==(const swapped_t& i) const { |
| 235 | return swap() == i.swap(); | 235 | return swap() == i.swap(); |
| @@ -368,7 +368,7 @@ public: | |||
| 368 | // Member | 368 | // Member |
| 369 | /** todo **/ | 369 | /** todo **/ |
| 370 | 370 | ||
| 371 | // Arithmetics | 371 | // Arithmetic |
| 372 | template <typename S, typename T2, typename F2> | 372 | template <typename S, typename T2, typename F2> |
| 373 | friend S operator+(const S& p, const swapped_t v); | 373 | friend S operator+(const S& p, const swapped_t v); |
| 374 | 374 | ||
| @@ -384,7 +384,7 @@ public: | |||
| 384 | template <typename S, typename T2, typename F2> | 384 | template <typename S, typename T2, typename F2> |
| 385 | friend S operator%(const S& p, const swapped_t v); | 385 | friend S operator%(const S& p, const swapped_t v); |
| 386 | 386 | ||
| 387 | // Arithmetics + assignments | 387 | // Arithmetic + assignments |
| 388 | template <typename S, typename T2, typename F2> | 388 | template <typename S, typename T2, typename F2> |
| 389 | friend S operator+=(const S& p, const swapped_t v); | 389 | friend S operator+=(const S& p, const swapped_t v); |
| 390 | 390 | ||
| @@ -415,7 +415,7 @@ public: | |||
| 415 | friend bool operator==(const S& p, const swapped_t v); | 415 | friend bool operator==(const S& p, const swapped_t v); |
| 416 | }; | 416 | }; |
| 417 | 417 | ||
| 418 | // Arithmetics | 418 | // Arithmetic |
| 419 | template <typename S, typename T, typename F> | 419 | template <typename S, typename T, typename F> |
| 420 | S operator+(const S& i, const swap_struct_t<T, F> v) { | 420 | S operator+(const S& i, const swap_struct_t<T, F> v) { |
| 421 | return i + v.swap(); | 421 | return i + v.swap(); |
| @@ -441,7 +441,7 @@ S operator%(const S& i, const swap_struct_t<T, F> v) { | |||
| 441 | return i % v.swap(); | 441 | return i % v.swap(); |
| 442 | } | 442 | } |
| 443 | 443 | ||
| 444 | // Arithmetics + assignments | 444 | // Arithmetic + assignments |
| 445 | template <typename S, typename T, typename F> | 445 | template <typename S, typename T, typename F> |
| 446 | S& operator+=(S& i, const swap_struct_t<T, F> v) { | 446 | S& operator+=(S& i, const swap_struct_t<T, F> v) { |
| 447 | i += v.swap(); | 447 | i += v.swap(); |
| @@ -465,7 +465,7 @@ S operator&(const swap_struct_t<T, F> v, const S& i) { | |||
| 465 | return static_cast<S>(v.swap() & i); | 465 | return static_cast<S>(v.swap() & i); |
| 466 | } | 466 | } |
| 467 | 467 | ||
| 468 | // Comparaison | 468 | // Comparison |
| 469 | template <typename S, typename T, typename F> | 469 | template <typename S, typename T, typename F> |
| 470 | bool operator<(const S& p, const swap_struct_t<T, F> v) { | 470 | bool operator<(const S& p, const swap_struct_t<T, F> v) { |
| 471 | return p < v.swap(); | 471 | return p < v.swap(); |
diff --git a/src/core/core.cpp b/src/core/core.cpp index 4a1372d15..bd2082fd6 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -358,7 +358,7 @@ struct System::Impl { | |||
| 358 | void ShutdownMainProcess() { | 358 | void ShutdownMainProcess() { |
| 359 | SetShuttingDown(true); | 359 | SetShuttingDown(true); |
| 360 | 360 | ||
| 361 | // Log last frame performance stats if game was loded | 361 | // Log last frame performance stats if game was loaded |
| 362 | if (perf_stats) { | 362 | if (perf_stats) { |
| 363 | const auto perf_results = GetAndResetPerfStats(); | 363 | const auto perf_results = GetAndResetPerfStats(); |
| 364 | constexpr auto performance = Common::Telemetry::FieldType::Performance; | 364 | constexpr auto performance = Common::Telemetry::FieldType::Performance; |
diff --git a/src/core/core.h b/src/core/core.h index 91e78672e..5843696d4 100644 --- a/src/core/core.h +++ b/src/core/core.h | |||
| @@ -146,7 +146,7 @@ public: | |||
| 146 | 146 | ||
| 147 | /** | 147 | /** |
| 148 | * Initializes the system | 148 | * Initializes the system |
| 149 | * This function will initialize core functionaility used for system emulation | 149 | * This function will initialize core functionality used for system emulation |
| 150 | */ | 150 | */ |
| 151 | void Initialize(); | 151 | void Initialize(); |
| 152 | 152 | ||
diff --git a/src/core/core_timing.h b/src/core/core_timing.h index 4b89c0c39..e7c4a949f 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h | |||
| @@ -150,7 +150,7 @@ private: | |||
| 150 | // The queue is a min-heap using std::make_heap/push_heap/pop_heap. | 150 | // The queue is a min-heap using std::make_heap/push_heap/pop_heap. |
| 151 | // We don't use std::priority_queue because we need to be able to serialize, unserialize and | 151 | // We don't use std::priority_queue because we need to be able to serialize, unserialize and |
| 152 | // erase arbitrary events (RemoveEvent()) regardless of the queue order. These aren't | 152 | // erase arbitrary events (RemoveEvent()) regardless of the queue order. These aren't |
| 153 | // accomodated by the standard adaptor class. | 153 | // accommodated by the standard adaptor class. |
| 154 | std::vector<Event> event_queue; | 154 | std::vector<Event> event_queue; |
| 155 | u64 event_fifo_id = 0; | 155 | u64 event_fifo_id = 0; |
| 156 | 156 | ||
diff --git a/src/core/crypto/ctr_encryption_layer.h b/src/core/crypto/ctr_encryption_layer.h index 77f08d776..d85ad8f78 100644 --- a/src/core/crypto/ctr_encryption_layer.h +++ b/src/core/crypto/ctr_encryption_layer.h | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | namespace Core::Crypto { | 12 | namespace Core::Crypto { |
| 13 | 13 | ||
| 14 | // Sits on top of a VirtualFile and provides CTR-mode AES decription. | 14 | // Sits on top of a VirtualFile and provides CTR-mode AES description. |
| 15 | class CTREncryptionLayer : public EncryptionLayer { | 15 | class CTREncryptionLayer : public EncryptionLayer { |
| 16 | public: | 16 | public: |
| 17 | using IVData = std::array<u8, 16>; | 17 | using IVData = std::array<u8, 16>; |
diff --git a/src/core/crypto/key_manager.h b/src/core/crypto/key_manager.h index dbf9ebfe4..673cec463 100644 --- a/src/core/crypto/key_manager.h +++ b/src/core/crypto/key_manager.h | |||
| @@ -249,7 +249,7 @@ public: | |||
| 249 | 249 | ||
| 250 | static bool KeyFileExists(bool title); | 250 | static bool KeyFileExists(bool title); |
| 251 | 251 | ||
| 252 | // Call before using the sd seed to attempt to derive it if it dosen't exist. Needs system | 252 | // Call before using the sd seed to attempt to derive it if it doesn't exist. Needs system |
| 253 | // save 8*43 and the private file to exist. | 253 | // save 8*43 and the private file to exist. |
| 254 | void DeriveSDSeedLazy(); | 254 | void DeriveSDSeedLazy(); |
| 255 | 255 | ||
diff --git a/src/core/crypto/xts_encryption_layer.h b/src/core/crypto/xts_encryption_layer.h index 735e660cb..68b5643b1 100644 --- a/src/core/crypto/xts_encryption_layer.h +++ b/src/core/crypto/xts_encryption_layer.h | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | namespace Core::Crypto { | 10 | namespace Core::Crypto { |
| 11 | 11 | ||
| 12 | // Sits on top of a VirtualFile and provides XTS-mode AES decription. | 12 | // Sits on top of a VirtualFile and provides XTS-mode AES description. |
| 13 | class XTSEncryptionLayer : public EncryptionLayer { | 13 | class XTSEncryptionLayer : public EncryptionLayer { |
| 14 | public: | 14 | public: |
| 15 | XTSEncryptionLayer(FileSys::VirtualFile base, Key256 key); | 15 | XTSEncryptionLayer(FileSys::VirtualFile base, Key256 key); |
diff --git a/src/core/file_sys/content_archive.h b/src/core/file_sys/content_archive.h index 7fdc45ea7..20f524f80 100644 --- a/src/core/file_sys/content_archive.h +++ b/src/core/file_sys/content_archive.h | |||
| @@ -93,7 +93,7 @@ inline bool IsDirectoryLogoPartition(const VirtualDir& pfs) { | |||
| 93 | pfs->GetFile("StartupMovie.gif") != nullptr; | 93 | pfs->GetFile("StartupMovie.gif") != nullptr; |
| 94 | } | 94 | } |
| 95 | 95 | ||
| 96 | // An implementation of VfsDirectory that represents a Nintendo Content Archive (NCA) conatiner. | 96 | // An implementation of VfsDirectory that represents a Nintendo Content Archive (NCA) container. |
| 97 | // After construction, use GetStatus to determine if the file is valid and ready to be used. | 97 | // After construction, use GetStatus to determine if the file is valid and ready to be used. |
| 98 | class NCA : public ReadOnlyVfsDirectory { | 98 | class NCA : public ReadOnlyVfsDirectory { |
| 99 | public: | 99 | public: |
diff --git a/src/core/file_sys/registered_cache.h b/src/core/file_sys/registered_cache.h index 587f8cae8..bd7f53eaf 100644 --- a/src/core/file_sys/registered_cache.h +++ b/src/core/file_sys/registered_cache.h | |||
| @@ -162,7 +162,7 @@ public: | |||
| 162 | InstallResult InstallEntry(const NSP& nsp, bool overwrite_if_exists = false, | 162 | InstallResult InstallEntry(const NSP& nsp, bool overwrite_if_exists = false, |
| 163 | const VfsCopyFunction& copy = &VfsRawCopy); | 163 | const VfsCopyFunction& copy = &VfsRawCopy); |
| 164 | 164 | ||
| 165 | // Due to the fact that we must use Meta-type NCAs to determine the existance of files, this | 165 | // Due to the fact that we must use Meta-type NCAs to determine the existence of files, this |
| 166 | // poses quite a challenge. Instead of creating a new meta NCA for this file, yuzu will create a | 166 | // poses quite a challenge. Instead of creating a new meta NCA for this file, yuzu will create a |
| 167 | // dir inside the NAND called 'yuzu_meta' and store the raw CNMT there. | 167 | // dir inside the NAND called 'yuzu_meta' and store the raw CNMT there. |
| 168 | // TODO(DarkLordZach): Author real meta-type NCAs and install those. | 168 | // TODO(DarkLordZach): Author real meta-type NCAs and install those. |
diff --git a/src/core/file_sys/vfs.h b/src/core/file_sys/vfs.h index 8fc1738a4..a93e21f67 100644 --- a/src/core/file_sys/vfs.h +++ b/src/core/file_sys/vfs.h | |||
| @@ -45,7 +45,7 @@ public: | |||
| 45 | // Return whether or not the user has write permission on this filesystem. | 45 | // Return whether or not the user has write permission on this filesystem. |
| 46 | virtual bool IsWritable() const; | 46 | virtual bool IsWritable() const; |
| 47 | 47 | ||
| 48 | // Determine if the entry at path is non-existant, a file, or a directory. | 48 | // Determine if the entry at path is non-existent, a file, or a directory. |
| 49 | virtual VfsEntryType GetEntryType(std::string_view path) const; | 49 | virtual VfsEntryType GetEntryType(std::string_view path) const; |
| 50 | 50 | ||
| 51 | // Opens the file with path relative to root. If it doesn't exist, returns nullptr. | 51 | // Opens the file with path relative to root. If it doesn't exist, returns nullptr. |
| @@ -58,7 +58,7 @@ public: | |||
| 58 | // Moves the file from old_path to new_path, returning the moved file on success and nullptr on | 58 | // Moves the file from old_path to new_path, returning the moved file on success and nullptr on |
| 59 | // failure. | 59 | // failure. |
| 60 | virtual VirtualFile MoveFile(std::string_view old_path, std::string_view new_path); | 60 | virtual VirtualFile MoveFile(std::string_view old_path, std::string_view new_path); |
| 61 | // Deletes the file with path relative to root, returing true on success. | 61 | // Deletes the file with path relative to root, returning true on success. |
| 62 | virtual bool DeleteFile(std::string_view path); | 62 | virtual bool DeleteFile(std::string_view path); |
| 63 | 63 | ||
| 64 | // Opens the directory with path relative to root. If it doesn't exist, returns nullptr. | 64 | // Opens the directory with path relative to root. If it doesn't exist, returns nullptr. |
| @@ -71,7 +71,7 @@ public: | |||
| 71 | // Moves the directory from old_path to new_path, returning the moved directory on success and | 71 | // Moves the directory from old_path to new_path, returning the moved directory on success and |
| 72 | // nullptr on failure. | 72 | // nullptr on failure. |
| 73 | virtual VirtualDir MoveDirectory(std::string_view old_path, std::string_view new_path); | 73 | virtual VirtualDir MoveDirectory(std::string_view old_path, std::string_view new_path); |
| 74 | // Deletes the directory with path relative to root, returing true on success. | 74 | // Deletes the directory with path relative to root, returning true on success. |
| 75 | virtual bool DeleteDirectory(std::string_view path); | 75 | virtual bool DeleteDirectory(std::string_view path); |
| 76 | 76 | ||
| 77 | protected: | 77 | protected: |
| @@ -144,7 +144,7 @@ public: | |||
| 144 | return Read(reinterpret_cast<u8*>(data), sizeof(T), offset); | 144 | return Read(reinterpret_cast<u8*>(data), sizeof(T), offset); |
| 145 | } | 145 | } |
| 146 | 146 | ||
| 147 | // Writes exactly one byte to offset in file and retuns whether or not the byte was written | 147 | // Writes exactly one byte to offset in file and returns whether or not the byte was written |
| 148 | // successfully. | 148 | // successfully. |
| 149 | virtual bool WriteByte(u8 data, std::size_t offset = 0); | 149 | virtual bool WriteByte(u8 data, std::size_t offset = 0); |
| 150 | // Writes a vector of bytes to offset in file and returns the number of bytes successfully | 150 | // Writes a vector of bytes to offset in file and returns the number of bytes successfully |
| @@ -191,13 +191,13 @@ public: | |||
| 191 | VfsDirectory() = default; | 191 | VfsDirectory() = default; |
| 192 | virtual ~VfsDirectory(); | 192 | virtual ~VfsDirectory(); |
| 193 | 193 | ||
| 194 | // Retrives the file located at path as if the current directory was root. Returns nullptr if | 194 | // Retrieves the file located at path as if the current directory was root. Returns nullptr if |
| 195 | // not found. | 195 | // not found. |
| 196 | virtual VirtualFile GetFileRelative(std::string_view path) const; | 196 | virtual VirtualFile GetFileRelative(std::string_view path) const; |
| 197 | // Calls GetFileRelative(path) on the root of the current directory. | 197 | // Calls GetFileRelative(path) on the root of the current directory. |
| 198 | virtual VirtualFile GetFileAbsolute(std::string_view path) const; | 198 | virtual VirtualFile GetFileAbsolute(std::string_view path) const; |
| 199 | 199 | ||
| 200 | // Retrives the directory located at path as if the current directory was root. Returns nullptr | 200 | // Retrieves the directory located at path as if the current directory was root. Returns nullptr |
| 201 | // if not found. | 201 | // if not found. |
| 202 | virtual VirtualDir GetDirectoryRelative(std::string_view path) const; | 202 | virtual VirtualDir GetDirectoryRelative(std::string_view path) const; |
| 203 | // Calls GetDirectoryRelative(path) on the root of the current directory. | 203 | // Calls GetDirectoryRelative(path) on the root of the current directory. |
| @@ -205,7 +205,7 @@ public: | |||
| 205 | 205 | ||
| 206 | // Returns a vector containing all of the files in this directory. | 206 | // Returns a vector containing all of the files in this directory. |
| 207 | virtual std::vector<VirtualFile> GetFiles() const = 0; | 207 | virtual std::vector<VirtualFile> GetFiles() const = 0; |
| 208 | // Returns the file with filename matching name. Returns nullptr if directory dosen't have a | 208 | // Returns the file with filename matching name. Returns nullptr if directory doesn't have a |
| 209 | // file with name. | 209 | // file with name. |
| 210 | virtual VirtualFile GetFile(std::string_view name) const; | 210 | virtual VirtualFile GetFile(std::string_view name) const; |
| 211 | 211 | ||
| @@ -214,7 +214,7 @@ public: | |||
| 214 | 214 | ||
| 215 | // Returns a vector containing all of the subdirectories in this directory. | 215 | // Returns a vector containing all of the subdirectories in this directory. |
| 216 | virtual std::vector<VirtualDir> GetSubdirectories() const = 0; | 216 | virtual std::vector<VirtualDir> GetSubdirectories() const = 0; |
| 217 | // Returns the directory with name matching name. Returns nullptr if directory dosen't have a | 217 | // Returns the directory with name matching name. Returns nullptr if directory doesn't have a |
| 218 | // directory with name. | 218 | // directory with name. |
| 219 | virtual VirtualDir GetSubdirectory(std::string_view name) const; | 219 | virtual VirtualDir GetSubdirectory(std::string_view name) const; |
| 220 | 220 | ||
diff --git a/src/core/file_sys/vfs_real.h b/src/core/file_sys/vfs_real.h index acde1ac89..b92c84316 100644 --- a/src/core/file_sys/vfs_real.h +++ b/src/core/file_sys/vfs_real.h | |||
| @@ -38,7 +38,7 @@ private: | |||
| 38 | boost::container::flat_map<std::string, std::weak_ptr<Common::FS::IOFile>> cache; | 38 | boost::container::flat_map<std::string, std::weak_ptr<Common::FS::IOFile>> cache; |
| 39 | }; | 39 | }; |
| 40 | 40 | ||
| 41 | // An implmentation of VfsFile that represents a file on the user's computer. | 41 | // An implementation of VfsFile that represents a file on the user's computer. |
| 42 | class RealVfsFile : public VfsFile { | 42 | class RealVfsFile : public VfsFile { |
| 43 | friend class RealVfsDirectory; | 43 | friend class RealVfsDirectory; |
| 44 | friend class RealVfsFilesystem; | 44 | friend class RealVfsFilesystem; |
diff --git a/src/core/frontend/emu_window.h b/src/core/frontend/emu_window.h index cf85ba29e..1093800f6 100644 --- a/src/core/frontend/emu_window.h +++ b/src/core/frontend/emu_window.h | |||
| @@ -205,7 +205,7 @@ protected: | |||
| 205 | } | 205 | } |
| 206 | 206 | ||
| 207 | /** | 207 | /** |
| 208 | * Converts a screen postion into the equivalent touchscreen position. | 208 | * Converts a screen position into the equivalent touchscreen position. |
| 209 | */ | 209 | */ |
| 210 | std::pair<f32, f32> MapToTouchScreen(u32 framebuffer_x, u32 framebuffer_y) const; | 210 | std::pair<f32, f32> MapToTouchScreen(u32 framebuffer_x, u32 framebuffer_y) const; |
| 211 | 211 | ||
diff --git a/src/core/hid/emulated_controller.h b/src/core/hid/emulated_controller.h index a9da465a2..429655355 100644 --- a/src/core/hid/emulated_controller.h +++ b/src/core/hid/emulated_controller.h | |||
| @@ -132,7 +132,7 @@ struct ControllerStatus { | |||
| 132 | RingAnalogValue ring_analog_value{}; | 132 | RingAnalogValue ring_analog_value{}; |
| 133 | NfcValues nfc_values{}; | 133 | NfcValues nfc_values{}; |
| 134 | 134 | ||
| 135 | // Data for HID serices | 135 | // Data for HID services |
| 136 | HomeButtonState home_button_state{}; | 136 | HomeButtonState home_button_state{}; |
| 137 | CaptureButtonState capture_button_state{}; | 137 | CaptureButtonState capture_button_state{}; |
| 138 | NpadButtonState npad_button_state{}; | 138 | NpadButtonState npad_button_state{}; |
| @@ -357,7 +357,7 @@ public: | |||
| 357 | 357 | ||
| 358 | /** | 358 | /** |
| 359 | * Sends a small vibration to the output device | 359 | * Sends a small vibration to the output device |
| 360 | * @return true if SetVibration was successfull | 360 | * @return true if SetVibration was successful |
| 361 | */ | 361 | */ |
| 362 | bool IsVibrationEnabled(std::size_t device_index); | 362 | bool IsVibrationEnabled(std::size_t device_index); |
| 363 | 363 | ||
| @@ -373,7 +373,7 @@ public: | |||
| 373 | /** | 373 | /** |
| 374 | * Sets the desired camera format to be polled from a controller | 374 | * Sets the desired camera format to be polled from a controller |
| 375 | * @param camera_format size of each frame | 375 | * @param camera_format size of each frame |
| 376 | * @return true if SetCameraFormat was successfull | 376 | * @return true if SetCameraFormat was successful |
| 377 | */ | 377 | */ |
| 378 | bool SetCameraFormat(Core::IrSensor::ImageTransferProcessorFormat camera_format); | 378 | bool SetCameraFormat(Core::IrSensor::ImageTransferProcessorFormat camera_format); |
| 379 | 379 | ||
diff --git a/src/core/hid/emulated_devices.h b/src/core/hid/emulated_devices.h index caf2ca659..5eab693e4 100644 --- a/src/core/hid/emulated_devices.h +++ b/src/core/hid/emulated_devices.h | |||
| @@ -53,7 +53,7 @@ struct DeviceStatus { | |||
| 53 | MouseWheelValues mouse_wheel_values{}; | 53 | MouseWheelValues mouse_wheel_values{}; |
| 54 | MouseStickValue mouse_stick_value{}; | 54 | MouseStickValue mouse_stick_value{}; |
| 55 | 55 | ||
| 56 | // Data for HID serices | 56 | // Data for HID services |
| 57 | KeyboardKey keyboard_state{}; | 57 | KeyboardKey keyboard_state{}; |
| 58 | KeyboardModifier keyboard_moddifier_state{}; | 58 | KeyboardModifier keyboard_moddifier_state{}; |
| 59 | MouseButton mouse_button_state{}; | 59 | MouseButton mouse_button_state{}; |
| @@ -75,7 +75,7 @@ struct InterfaceUpdateCallback { | |||
| 75 | class EmulatedDevices { | 75 | class EmulatedDevices { |
| 76 | public: | 76 | public: |
| 77 | /** | 77 | /** |
| 78 | * Contains all input data related to external devices that aren't necesarily a controller | 78 | * Contains all input data related to external devices that aren't necessarily a controller |
| 79 | * This includes devices such as the keyboard or mouse | 79 | * This includes devices such as the keyboard or mouse |
| 80 | */ | 80 | */ |
| 81 | explicit EmulatedDevices(); | 81 | explicit EmulatedDevices(); |
diff --git a/src/core/hid/input_converter.cpp b/src/core/hid/input_converter.cpp index 3f7b8c090..7cee39a53 100644 --- a/src/core/hid/input_converter.cpp +++ b/src/core/hid/input_converter.cpp | |||
| @@ -328,7 +328,7 @@ void SanitizeAnalog(Common::Input::AnalogStatus& analog, bool clamp_value) { | |||
| 328 | // Apply center offset | 328 | // Apply center offset |
| 329 | raw_value -= properties.offset; | 329 | raw_value -= properties.offset; |
| 330 | 330 | ||
| 331 | // Set initial values to be formated | 331 | // Set initial values to be formatted |
| 332 | value = raw_value; | 332 | value = raw_value; |
| 333 | 333 | ||
| 334 | // Calculate vector size | 334 | // Calculate vector size |
| @@ -398,7 +398,7 @@ void SanitizeStick(Common::Input::AnalogStatus& analog_x, Common::Input::AnalogS | |||
| 398 | raw_x = properties_x.inverted ? -raw_x : raw_x; | 398 | raw_x = properties_x.inverted ? -raw_x : raw_x; |
| 399 | raw_y = properties_y.inverted ? -raw_y : raw_y; | 399 | raw_y = properties_y.inverted ? -raw_y : raw_y; |
| 400 | 400 | ||
| 401 | // Set initial values to be formated | 401 | // Set initial values to be formatted |
| 402 | x = raw_x; | 402 | x = raw_x; |
| 403 | y = raw_y; | 403 | y = raw_y; |
| 404 | 404 | ||
diff --git a/src/core/hid/motion_input.h b/src/core/hid/motion_input.h index e2c1bbf95..9f3fc1cf7 100644 --- a/src/core/hid/motion_input.h +++ b/src/core/hid/motion_input.h | |||
| @@ -84,7 +84,7 @@ private: | |||
| 84 | // Gyroscope vector measurement in radians/s. | 84 | // Gyroscope vector measurement in radians/s. |
| 85 | Common::Vec3f gyro; | 85 | Common::Vec3f gyro; |
| 86 | 86 | ||
| 87 | // Vector to be substracted from gyro measurements | 87 | // Vector to be subtracted from gyro measurements |
| 88 | Common::Vec3f gyro_bias; | 88 | Common::Vec3f gyro_bias; |
| 89 | 89 | ||
| 90 | // Minimum gyro amplitude to detect if the device is moving | 90 | // Minimum gyro amplitude to detect if the device is moving |
diff --git a/src/core/hle/kernel/k_process.cpp b/src/core/hle/kernel/k_process.cpp index d44f6e921..74a04aa66 100644 --- a/src/core/hle/kernel/k_process.cpp +++ b/src/core/hle/kernel/k_process.cpp | |||
| @@ -363,7 +363,7 @@ Result KProcess::LoadFromMetadata(const FileSys::ProgramMetadata& metadata, std: | |||
| 363 | code_size + system_resource_size); | 363 | code_size + system_resource_size); |
| 364 | R_RETURN(ResultLimitReached); | 364 | R_RETURN(ResultLimitReached); |
| 365 | } | 365 | } |
| 366 | // Initialize proces address space | 366 | // Initialize process address space |
| 367 | if (const Result result{page_table.InitializeForProcess( | 367 | if (const Result result{page_table.InitializeForProcess( |
| 368 | metadata.GetAddressSpaceType(), false, false, false, KMemoryManager::Pool::Application, | 368 | metadata.GetAddressSpaceType(), false, false, false, KMemoryManager::Pool::Application, |
| 369 | 0x8000000, code_size, &kernel.GetAppSystemResource(), resource_limit)}; | 369 | 0x8000000, code_size, &kernel.GetAppSystemResource(), resource_limit)}; |
diff --git a/src/core/hle/kernel/k_process.h b/src/core/hle/kernel/k_process.h index 549809000..bd9b9f876 100644 --- a/src/core/hle/kernel/k_process.h +++ b/src/core/hle/kernel/k_process.h | |||
| @@ -235,7 +235,7 @@ public: | |||
| 235 | total_process_running_time_ticks += ticks; | 235 | total_process_running_time_ticks += ticks; |
| 236 | } | 236 | } |
| 237 | 237 | ||
| 238 | /// Gets the process schedule count, used for thread yelding | 238 | /// Gets the process schedule count, used for thread yielding |
| 239 | s64 GetScheduledCount() const { | 239 | s64 GetScheduledCount() const { |
| 240 | return schedule_count; | 240 | return schedule_count; |
| 241 | } | 241 | } |
diff --git a/src/core/hle/kernel/svc/svc_event.cpp b/src/core/hle/kernel/svc/svc_event.cpp index a948493e8..8692b00f2 100644 --- a/src/core/hle/kernel/svc/svc_event.cpp +++ b/src/core/hle/kernel/svc/svc_event.cpp | |||
| @@ -85,7 +85,7 @@ Result CreateEvent(Core::System& system, Handle* out_write, Handle* out_read) { | |||
| 85 | // Add the event to the handle table. | 85 | // Add the event to the handle table. |
| 86 | R_TRY(handle_table.Add(out_write, event)); | 86 | R_TRY(handle_table.Add(out_write, event)); |
| 87 | 87 | ||
| 88 | // Ensure that we maintaing a clean handle state on exit. | 88 | // Ensure that we maintain a clean handle state on exit. |
| 89 | auto handle_guard = SCOPE_GUARD({ handle_table.Remove(*out_write); }); | 89 | auto handle_guard = SCOPE_GUARD({ handle_table.Remove(*out_write); }); |
| 90 | 90 | ||
| 91 | // Add the readable event to the handle table. | 91 | // Add the readable event to the handle table. |
diff --git a/src/core/hle/kernel/svc/svc_session.cpp b/src/core/hle/kernel/svc/svc_session.cpp index 00fd1605e..6dd242dcf 100644 --- a/src/core/hle/kernel/svc/svc_session.cpp +++ b/src/core/hle/kernel/svc/svc_session.cpp | |||
| @@ -81,7 +81,7 @@ Result CreateSession(Core::System& system, Handle* out_server, Handle* out_clien | |||
| 81 | const auto result = handle_table.Add(out_client, &session->GetClientSession()); | 81 | const auto result = handle_table.Add(out_client, &session->GetClientSession()); |
| 82 | 82 | ||
| 83 | if (!R_SUCCEEDED(result)) { | 83 | if (!R_SUCCEEDED(result)) { |
| 84 | // Ensure that we maintaing a clean handle state on exit. | 84 | // Ensure that we maintain a clean handle state on exit. |
| 85 | handle_table.Remove(*out_server); | 85 | handle_table.Remove(*out_server); |
| 86 | } | 86 | } |
| 87 | 87 | ||
diff --git a/src/core/hle/service/acc/acc.cpp b/src/core/hle/service/acc/acc.cpp index 120282aa4..6c29cb613 100644 --- a/src/core/hle/service/acc/acc.cpp +++ b/src/core/hle/service/acc/acc.cpp | |||
| @@ -789,7 +789,7 @@ Result Module::Interface::InitializeApplicationInfoBase() { | |||
| 789 | } | 789 | } |
| 790 | 790 | ||
| 791 | LOG_WARNING(Service_ACC, "ApplicationInfo init required"); | 791 | LOG_WARNING(Service_ACC, "ApplicationInfo init required"); |
| 792 | // TODO(ogniK): Actual initalization here | 792 | // TODO(ogniK): Actual initialization here |
| 793 | 793 | ||
| 794 | return ResultSuccess; | 794 | return ResultSuccess; |
| 795 | } | 795 | } |
diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp index 97f7c6688..63fd5bfd6 100644 --- a/src/core/hle/service/acc/profile_manager.cpp +++ b/src/core/hle/service/acc/profile_manager.cpp | |||
| @@ -287,7 +287,7 @@ void ProfileManager::StoreOpenedUsers() { | |||
| 287 | }); | 287 | }); |
| 288 | } | 288 | } |
| 289 | 289 | ||
| 290 | /// Return the users profile base and the unknown arbitary data. | 290 | /// Return the users profile base and the unknown arbitrary data. |
| 291 | bool ProfileManager::GetProfileBaseAndData(std::optional<std::size_t> index, ProfileBase& profile, | 291 | bool ProfileManager::GetProfileBaseAndData(std::optional<std::size_t> index, ProfileBase& profile, |
| 292 | UserData& data) const { | 292 | UserData& data) const { |
| 293 | if (GetProfileBase(index, profile)) { | 293 | if (GetProfileBase(index, profile)) { |
| @@ -297,13 +297,13 @@ bool ProfileManager::GetProfileBaseAndData(std::optional<std::size_t> index, Pro | |||
| 297 | return false; | 297 | return false; |
| 298 | } | 298 | } |
| 299 | 299 | ||
| 300 | /// Return the users profile base and the unknown arbitary data. | 300 | /// Return the users profile base and the unknown arbitrary data. |
| 301 | bool ProfileManager::GetProfileBaseAndData(UUID uuid, ProfileBase& profile, UserData& data) const { | 301 | bool ProfileManager::GetProfileBaseAndData(UUID uuid, ProfileBase& profile, UserData& data) const { |
| 302 | const auto idx = GetUserIndex(uuid); | 302 | const auto idx = GetUserIndex(uuid); |
| 303 | return GetProfileBaseAndData(idx, profile, data); | 303 | return GetProfileBaseAndData(idx, profile, data); |
| 304 | } | 304 | } |
| 305 | 305 | ||
| 306 | /// Return the users profile base and the unknown arbitary data. | 306 | /// Return the users profile base and the unknown arbitrary data. |
| 307 | bool ProfileManager::GetProfileBaseAndData(const ProfileInfo& user, ProfileBase& profile, | 307 | bool ProfileManager::GetProfileBaseAndData(const ProfileInfo& user, ProfileBase& profile, |
| 308 | UserData& data) const { | 308 | UserData& data) const { |
| 309 | return GetProfileBaseAndData(user.user_uuid, profile, data); | 309 | return GetProfileBaseAndData(user.user_uuid, profile, data); |
diff --git a/src/core/hle/service/hid/controllers/gesture.cpp b/src/core/hle/service/hid/controllers/gesture.cpp index de0090cc5..03432f7cb 100644 --- a/src/core/hle/service/hid/controllers/gesture.cpp +++ b/src/core/hle/service/hid/controllers/gesture.cpp | |||
| @@ -55,7 +55,7 @@ void Controller_Gesture::OnUpdate(const Core::Timing::CoreTiming& core_timing) { | |||
| 55 | static_cast<f32>(shared_memory->gesture_lifo.timestamp - last_update_timestamp) / | 55 | static_cast<f32>(shared_memory->gesture_lifo.timestamp - last_update_timestamp) / |
| 56 | (1000 * 1000 * 1000); | 56 | (1000 * 1000 * 1000); |
| 57 | 57 | ||
| 58 | // Only update if necesary | 58 | // Only update if necessary |
| 59 | if (!ShouldUpdateGesture(gesture, time_difference)) { | 59 | if (!ShouldUpdateGesture(gesture, time_difference)) { |
| 60 | return; | 60 | return; |
| 61 | } | 61 | } |
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 56c7275df..4529ad643 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp | |||
| @@ -690,7 +690,7 @@ void Hid::ResetSixAxisSensorFusionParameters(HLERequestContext& ctx) { | |||
| 690 | 690 | ||
| 691 | const auto parameters{rp.PopRaw<Parameters>()}; | 691 | const auto parameters{rp.PopRaw<Parameters>()}; |
| 692 | 692 | ||
| 693 | // Since these parameters are unknow just use what HW outputs | 693 | // Since these parameters are unknown just use what HW outputs |
| 694 | const Core::HID::SixAxisSensorFusionParameters fusion_parameters{ | 694 | const Core::HID::SixAxisSensorFusionParameters fusion_parameters{ |
| 695 | .parameter1 = 0.03f, | 695 | .parameter1 = 0.03f, |
| 696 | .parameter2 = 0.4f, | 696 | .parameter2 = 0.4f, |
diff --git a/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp b/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp index bc896a1e3..a268750cd 100644 --- a/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp +++ b/src/core/hle/service/hid/irsensor/image_transfer_processor.cpp | |||
| @@ -51,7 +51,7 @@ void ImageTransferProcessor::OnControllerUpdate(Core::HID::ControllerTriggerType | |||
| 51 | 51 | ||
| 52 | const auto camera_data = npad_device->GetCamera(); | 52 | const auto camera_data = npad_device->GetCamera(); |
| 53 | 53 | ||
| 54 | // This indicates how much ambient light is precent | 54 | // This indicates how much ambient light is present |
| 55 | processor_state.ambient_noise_level = Core::IrSensor::CameraAmbientNoiseLevel::Low; | 55 | processor_state.ambient_noise_level = Core::IrSensor::CameraAmbientNoiseLevel::Low; |
| 56 | processor_state.sampling_number = camera_data.sample; | 56 | processor_state.sampling_number = camera_data.sample; |
| 57 | 57 | ||
diff --git a/src/core/hle/service/nfp/amiibo_crypto.cpp b/src/core/hle/service/nfp/amiibo_crypto.cpp index ddf04b1d7..ad73edbda 100644 --- a/src/core/hle/service/nfp/amiibo_crypto.cpp +++ b/src/core/hle/service/nfp/amiibo_crypto.cpp | |||
| @@ -137,7 +137,7 @@ EncryptedNTAG215File EncodedDataToNfcData(const NTAG215File& encoded_data) { | |||
| 137 | } | 137 | } |
| 138 | 138 | ||
| 139 | u32 GetTagPassword(const TagUuid& uuid) { | 139 | u32 GetTagPassword(const TagUuid& uuid) { |
| 140 | // Verifiy that the generated password is correct | 140 | // Verify that the generated password is correct |
| 141 | u32 password = 0xAA ^ (uuid.uid[1] ^ uuid.uid[3]); | 141 | u32 password = 0xAA ^ (uuid.uid[1] ^ uuid.uid[3]); |
| 142 | password &= (0x55 ^ (uuid.uid[2] ^ uuid.uid[4])) << 8; | 142 | password &= (0x55 ^ (uuid.uid[2] ^ uuid.uid[4])) << 8; |
| 143 | password &= (0xAA ^ (uuid.uid[3] ^ uuid.uid[5])) << 16; | 143 | password &= (0xAA ^ (uuid.uid[3] ^ uuid.uid[5])) << 16; |
diff --git a/src/core/hle/service/nfp/amiibo_crypto.h b/src/core/hle/service/nfp/amiibo_crypto.h index 1fa61174e..c9fd67a39 100644 --- a/src/core/hle/service/nfp/amiibo_crypto.h +++ b/src/core/hle/service/nfp/amiibo_crypto.h | |||
| @@ -94,7 +94,7 @@ bool LoadKeys(InternalKey& locked_secret, InternalKey& unfixed_info); | |||
| 94 | /// Returns true if key_retail.bin exist | 94 | /// Returns true if key_retail.bin exist |
| 95 | bool IsKeyAvailable(); | 95 | bool IsKeyAvailable(); |
| 96 | 96 | ||
| 97 | /// Decodes encripted amiibo data returns true if output is valid | 97 | /// Decodes encrypted amiibo data returns true if output is valid |
| 98 | bool DecodeAmiibo(const EncryptedNTAG215File& encrypted_tag_data, NTAG215File& tag_data); | 98 | bool DecodeAmiibo(const EncryptedNTAG215File& encrypted_tag_data, NTAG215File& tag_data); |
| 99 | 99 | ||
| 100 | /// Encodes plain amiibo data returns true if output is valid | 100 | /// Encodes plain amiibo data returns true if output is valid |
diff --git a/src/core/hle/service/ns/iplatform_service_manager.cpp b/src/core/hle/service/ns/iplatform_service_manager.cpp index cd2705881..6c2f5e70b 100644 --- a/src/core/hle/service/ns/iplatform_service_manager.cpp +++ b/src/core/hle/service/ns/iplatform_service_manager.cpp | |||
| @@ -119,7 +119,7 @@ struct IPlatformServiceManager::Impl { | |||
| 119 | break; | 119 | break; |
| 120 | } | 120 | } |
| 121 | 121 | ||
| 122 | // Derive key withing inverse xor | 122 | // Derive key within inverse xor |
| 123 | const u32 KEY = GetU32Swapped(input.data() + cur_offset) ^ EXPECTED_MAGIC; | 123 | const u32 KEY = GetU32Swapped(input.data() + cur_offset) ^ EXPECTED_MAGIC; |
| 124 | const u32 SIZE = GetU32Swapped(input.data() + cur_offset + 4) ^ KEY; | 124 | const u32 SIZE = GetU32Swapped(input.data() + cur_offset + 4) ^ KEY; |
| 125 | shared_font_regions.push_back(FontRegion{cur_offset + 8, SIZE}); | 125 | shared_font_regions.push_back(FontRegion{cur_offset + 8, SIZE}); |
diff --git a/src/core/hle/service/nvdrv/devices/nvdevice.h b/src/core/hle/service/nvdrv/devices/nvdevice.h index c562e04d2..ab1f30f9e 100644 --- a/src/core/hle/service/nvdrv/devices/nvdevice.h +++ b/src/core/hle/service/nvdrv/devices/nvdevice.h | |||
| @@ -59,7 +59,7 @@ public: | |||
| 59 | std::vector<u8>& output, std::vector<u8>& inline_output) = 0; | 59 | std::vector<u8>& output, std::vector<u8>& inline_output) = 0; |
| 60 | 60 | ||
| 61 | /** | 61 | /** |
| 62 | * Called once a device is openned | 62 | * Called once a device is opened |
| 63 | * @param fd The device fd | 63 | * @param fd The device fd |
| 64 | */ | 64 | */ |
| 65 | virtual void OnOpen(DeviceFD fd) = 0; | 65 | virtual void OnOpen(DeviceFD fd) = 0; |
diff --git a/src/core/hle/service/nvdrv/devices/nvmap.cpp b/src/core/hle/service/nvdrv/devices/nvmap.cpp index 277afe0b4..07417f045 100644 --- a/src/core/hle/service/nvdrv/devices/nvmap.cpp +++ b/src/core/hle/service/nvdrv/devices/nvmap.cpp | |||
| @@ -264,7 +264,7 @@ NvResult nvmap::IocFree(std::span<const u8> input, std::vector<u8>& output) { | |||
| 264 | params.flags.raw = 0; | 264 | params.flags.raw = 0; |
| 265 | params.flags.map_uncached.Assign(freeInfo->was_uncached); | 265 | params.flags.map_uncached.Assign(freeInfo->was_uncached); |
| 266 | } else { | 266 | } else { |
| 267 | // This is possible when there's internel dups or other duplicates. | 267 | // This is possible when there's internal dups or other duplicates. |
| 268 | } | 268 | } |
| 269 | 269 | ||
| 270 | std::memcpy(output.data(), ¶ms, sizeof(params)); | 270 | std::memcpy(output.data(), ¶ms, sizeof(params)); |
diff --git a/src/core/internal_network/network.cpp b/src/core/internal_network/network.cpp index f85c73ca6..bf97b0ebc 100644 --- a/src/core/internal_network/network.cpp +++ b/src/core/internal_network/network.cpp | |||
| @@ -572,7 +572,7 @@ std::pair<s32, Errno> Socket::SendTo(u32 flags, std::span<const u8> message, | |||
| 572 | ASSERT(flags == 0); | 572 | ASSERT(flags == 0); |
| 573 | 573 | ||
| 574 | const sockaddr* to = nullptr; | 574 | const sockaddr* to = nullptr; |
| 575 | const int tolen = addr ? sizeof(sockaddr) : 0; | 575 | const int to_len = addr ? sizeof(sockaddr) : 0; |
| 576 | sockaddr host_addr_in; | 576 | sockaddr host_addr_in; |
| 577 | 577 | ||
| 578 | if (addr) { | 578 | if (addr) { |
| @@ -581,7 +581,7 @@ std::pair<s32, Errno> Socket::SendTo(u32 flags, std::span<const u8> message, | |||
| 581 | } | 581 | } |
| 582 | 582 | ||
| 583 | const auto result = sendto(fd, reinterpret_cast<const char*>(message.data()), | 583 | const auto result = sendto(fd, reinterpret_cast<const char*>(message.data()), |
| 584 | static_cast<int>(message.size()), 0, to, tolen); | 584 | static_cast<int>(message.size()), 0, to, to_len); |
| 585 | if (result != SOCKET_ERROR) { | 585 | if (result != SOCKET_ERROR) { |
| 586 | return {static_cast<s32>(result), Errno::SUCCESS}; | 586 | return {static_cast<s32>(result), Errno::SUCCESS}; |
| 587 | } | 587 | } |
diff --git a/src/input_common/drivers/gc_adapter.cpp b/src/input_common/drivers/gc_adapter.cpp index d09ff178b..3ad34884d 100644 --- a/src/input_common/drivers/gc_adapter.cpp +++ b/src/input_common/drivers/gc_adapter.cpp | |||
| @@ -344,7 +344,7 @@ bool GCAdapter::IsVibrationEnabled([[maybe_unused]] const PadIdentifier& identif | |||
| 344 | 344 | ||
| 345 | void GCAdapter::UpdateVibrations() { | 345 | void GCAdapter::UpdateVibrations() { |
| 346 | // Use 8 states to keep the switching between on/off fast enough for | 346 | // Use 8 states to keep the switching between on/off fast enough for |
| 347 | // a human to feel different vibration strenght | 347 | // a human to feel different vibration strength |
| 348 | // More states == more rumble strengths == slower update time | 348 | // More states == more rumble strengths == slower update time |
| 349 | constexpr u8 vibration_states = 8; | 349 | constexpr u8 vibration_states = 8; |
| 350 | 350 | ||
diff --git a/src/input_common/drivers/joycon.h b/src/input_common/drivers/joycon.h index 473ba1b9e..5b40817e2 100644 --- a/src/input_common/drivers/joycon.h +++ b/src/input_common/drivers/joycon.h | |||
| @@ -62,7 +62,7 @@ private: | |||
| 62 | /// Registers controllers, clears all data and starts the scan thread | 62 | /// Registers controllers, clears all data and starts the scan thread |
| 63 | void Setup(); | 63 | void Setup(); |
| 64 | 64 | ||
| 65 | /// Actively searchs for new devices | 65 | /// Actively searches for new devices |
| 66 | void ScanThread(std::stop_token stop_token); | 66 | void ScanThread(std::stop_token stop_token); |
| 67 | 67 | ||
| 68 | /// Returns true if device is valid and not registered | 68 | /// Returns true if device is valid and not registered |
diff --git a/src/input_common/drivers/keyboard.cpp b/src/input_common/drivers/keyboard.cpp index 71e612fbf..2567df9af 100644 --- a/src/input_common/drivers/keyboard.cpp +++ b/src/input_common/drivers/keyboard.cpp | |||
| @@ -24,7 +24,7 @@ constexpr PadIdentifier keyboard_modifier_identifier = { | |||
| 24 | }; | 24 | }; |
| 25 | 25 | ||
| 26 | Keyboard::Keyboard(std::string input_engine_) : InputEngine(std::move(input_engine_)) { | 26 | Keyboard::Keyboard(std::string input_engine_) : InputEngine(std::move(input_engine_)) { |
| 27 | // Keyboard is broken into 3 diferent sets: | 27 | // Keyboard is broken into 3 different sets: |
| 28 | // key: Unfiltered intended for controllers. | 28 | // key: Unfiltered intended for controllers. |
| 29 | // keyboard_key: Allows only Settings::NativeKeyboard::Keys intended for keyboard emulation. | 29 | // keyboard_key: Allows only Settings::NativeKeyboard::Keys intended for keyboard emulation. |
| 30 | // keyboard_modifier: Allows only Settings::NativeKeyboard::Modifiers intended for keyboard | 30 | // keyboard_modifier: Allows only Settings::NativeKeyboard::Modifiers intended for keyboard |
diff --git a/src/input_common/drivers/mouse.cpp b/src/input_common/drivers/mouse.cpp index 94e92c37d..4fb2a6cfa 100644 --- a/src/input_common/drivers/mouse.cpp +++ b/src/input_common/drivers/mouse.cpp | |||
| @@ -142,7 +142,7 @@ void Mouse::Move(int x, int y, int center_x, int center_y) { | |||
| 142 | return; | 142 | return; |
| 143 | } | 143 | } |
| 144 | 144 | ||
| 145 | // Make slow movements at least 3 units on lenght | 145 | // Make slow movements at least 3 units on length |
| 146 | if (move_distance < 3.0f) { | 146 | if (move_distance < 3.0f) { |
| 147 | // Normalize value | 147 | // Normalize value |
| 148 | mouse_change /= move_distance; | 148 | mouse_change /= move_distance; |
| @@ -154,7 +154,7 @@ void Mouse::Move(int x, int y, int center_x, int center_y) { | |||
| 154 | 154 | ||
| 155 | const auto last_move_distance = last_mouse_change.Length(); | 155 | const auto last_move_distance = last_mouse_change.Length(); |
| 156 | 156 | ||
| 157 | // Make fast movements clamp to 8 units on lenght | 157 | // Make fast movements clamp to 8 units on length |
| 158 | if (last_move_distance > 8.0f) { | 158 | if (last_move_distance > 8.0f) { |
| 159 | // Normalize value | 159 | // Normalize value |
| 160 | last_mouse_change /= last_move_distance; | 160 | last_mouse_change /= last_move_distance; |
diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp index 5c20b3426..f7f0c7eaa 100644 --- a/src/input_common/drivers/sdl_driver.cpp +++ b/src/input_common/drivers/sdl_driver.cpp | |||
| @@ -748,7 +748,7 @@ ButtonMapping SDLDriver::GetButtonMappingForDevice(const Common::ParamPackage& p | |||
| 748 | 748 | ||
| 749 | // This list is missing ZL/ZR since those are not considered buttons in SDL GameController. | 749 | // This list is missing ZL/ZR since those are not considered buttons in SDL GameController. |
| 750 | // We will add those afterwards | 750 | // We will add those afterwards |
| 751 | // This list also excludes Screenshot since theres not really a mapping for that | 751 | // This list also excludes Screenshot since there's not really a mapping for that |
| 752 | ButtonBindings switch_to_sdl_button; | 752 | ButtonBindings switch_to_sdl_button; |
| 753 | 753 | ||
| 754 | if (SDL_GameControllerGetType(controller) == SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO) { | 754 | if (SDL_GameControllerGetType(controller) == SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO) { |
| @@ -1007,7 +1007,7 @@ MotionMapping SDLDriver::GetMotionMappingForDevice(const Common::ParamPackage& p | |||
| 1007 | 1007 | ||
| 1008 | Common::Input::ButtonNames SDLDriver::GetUIName(const Common::ParamPackage& params) const { | 1008 | Common::Input::ButtonNames SDLDriver::GetUIName(const Common::ParamPackage& params) const { |
| 1009 | if (params.Has("button")) { | 1009 | if (params.Has("button")) { |
| 1010 | // TODO(German77): Find how to substitue the values for real button names | 1010 | // TODO(German77): Find how to substitute the values for real button names |
| 1011 | return Common::Input::ButtonNames::Value; | 1011 | return Common::Input::ButtonNames::Value; |
| 1012 | } | 1012 | } |
| 1013 | if (params.Has("hat")) { | 1013 | if (params.Has("hat")) { |
diff --git a/src/input_common/drivers/virtual_amiibo.cpp b/src/input_common/drivers/virtual_amiibo.cpp index 4a0268a4d..304f4c70b 100644 --- a/src/input_common/drivers/virtual_amiibo.cpp +++ b/src/input_common/drivers/virtual_amiibo.cpp | |||
| @@ -57,7 +57,7 @@ Common::Input::NfcState VirtualAmiibo::WriteNfcData( | |||
| 57 | } | 57 | } |
| 58 | 58 | ||
| 59 | if (!nfc_file.Write(data)) { | 59 | if (!nfc_file.Write(data)) { |
| 60 | LOG_ERROR(Service_NFP, "Error writting to file"); | 60 | LOG_ERROR(Service_NFP, "Error writing to file"); |
| 61 | return Common::Input::NfcState::WriteFailed; | 61 | return Common::Input::NfcState::WriteFailed; |
| 62 | } | 62 | } |
| 63 | 63 | ||
diff --git a/src/input_common/helpers/joycon_driver.cpp b/src/input_common/helpers/joycon_driver.cpp index 78cc5893c..83429a336 100644 --- a/src/input_common/helpers/joycon_driver.cpp +++ b/src/input_common/helpers/joycon_driver.cpp | |||
| @@ -164,8 +164,8 @@ void JoyconDriver::InputThread(std::stop_token stop_token) { | |||
| 164 | void JoyconDriver::OnNewData(std::span<u8> buffer) { | 164 | void JoyconDriver::OnNewData(std::span<u8> buffer) { |
| 165 | const auto report_mode = static_cast<ReportMode>(buffer[0]); | 165 | const auto report_mode = static_cast<ReportMode>(buffer[0]); |
| 166 | 166 | ||
| 167 | // Packages can be a litte bit inconsistent. Average the delta time to provide a smoother motion | 167 | // Packages can be a little bit inconsistent. Average the delta time to provide a smoother |
| 168 | // experience | 168 | // motion experience |
| 169 | switch (report_mode) { | 169 | switch (report_mode) { |
| 170 | case ReportMode::STANDARD_FULL_60HZ: | 170 | case ReportMode::STANDARD_FULL_60HZ: |
| 171 | case ReportMode::NFC_IR_MODE_60HZ: | 171 | case ReportMode::NFC_IR_MODE_60HZ: |
diff --git a/src/input_common/helpers/joycon_driver.h b/src/input_common/helpers/joycon_driver.h index b52a13ecf..72a9e71dc 100644 --- a/src/input_common/helpers/joycon_driver.h +++ b/src/input_common/helpers/joycon_driver.h | |||
| @@ -73,7 +73,7 @@ private: | |||
| 73 | /// Main thread, actively request new data from the handle | 73 | /// Main thread, actively request new data from the handle |
| 74 | void InputThread(std::stop_token stop_token); | 74 | void InputThread(std::stop_token stop_token); |
| 75 | 75 | ||
| 76 | /// Called everytime a valid package arrives | 76 | /// Called every time a valid package arrives |
| 77 | void OnNewData(std::span<u8> buffer); | 77 | void OnNewData(std::span<u8> buffer); |
| 78 | 78 | ||
| 79 | /// Updates device configuration to enable or disable features | 79 | /// Updates device configuration to enable or disable features |
| @@ -110,7 +110,7 @@ private: | |||
| 110 | bool amiibo_detected{}; | 110 | bool amiibo_detected{}; |
| 111 | bool is_ring_disabled_by_irs{}; | 111 | bool is_ring_disabled_by_irs{}; |
| 112 | 112 | ||
| 113 | // Harware configuration | 113 | // Hardware configuration |
| 114 | u8 leds{}; | 114 | u8 leds{}; |
| 115 | ReportMode mode{}; | 115 | ReportMode mode{}; |
| 116 | bool passive_enabled{}; // Low power mode, Ideal for multiple controllers at the same time | 116 | bool passive_enabled{}; // Low power mode, Ideal for multiple controllers at the same time |
diff --git a/src/input_common/helpers/joycon_protocol/common_protocol.h b/src/input_common/helpers/joycon_protocol/common_protocol.h index f44f73ba4..62cae739a 100644 --- a/src/input_common/helpers/joycon_protocol/common_protocol.h +++ b/src/input_common/helpers/joycon_protocol/common_protocol.h | |||
| @@ -68,7 +68,7 @@ public: | |||
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | /** | 70 | /** |
| 71 | * Waits for incoming data of the joycon device that matchs the subcommand | 71 | * Waits for incoming data of the joycon device that matches the subcommand |
| 72 | * @param sub_command type of data to be returned | 72 | * @param sub_command type of data to be returned |
| 73 | * @returns a buffer containing the response | 73 | * @returns a buffer containing the response |
| 74 | */ | 74 | */ |
| @@ -137,7 +137,7 @@ public: | |||
| 137 | DriverResult EnableMCU(bool enable); | 137 | DriverResult EnableMCU(bool enable); |
| 138 | 138 | ||
| 139 | /** | 139 | /** |
| 140 | * Configures the MCU to the correspoinding mode | 140 | * Configures the MCU to the corresponding mode |
| 141 | * @param MCUConfig configuration | 141 | * @param MCUConfig configuration |
| 142 | */ | 142 | */ |
| 143 | DriverResult ConfigureMCU(const MCUConfig& config); | 143 | DriverResult ConfigureMCU(const MCUConfig& config); |
diff --git a/src/input_common/helpers/udp_protocol.cpp b/src/input_common/helpers/udp_protocol.cpp index 994380d21..e54a8fce1 100644 --- a/src/input_common/helpers/udp_protocol.cpp +++ b/src/input_common/helpers/udp_protocol.cpp | |||
| @@ -25,7 +25,7 @@ namespace Response { | |||
| 25 | /** | 25 | /** |
| 26 | * Returns Type if the packet is valid, else none | 26 | * Returns Type if the packet is valid, else none |
| 27 | * | 27 | * |
| 28 | * Note: Modifies the buffer to zero out the crc (since thats the easiest way to check without | 28 | * Note: Modifies the buffer to zero out the crc (since that's the easiest way to check without |
| 29 | * copying the buffer) | 29 | * copying the buffer) |
| 30 | */ | 30 | */ |
| 31 | std::optional<Type> Validate(u8* data, std::size_t size) { | 31 | std::optional<Type> Validate(u8* data, std::size_t size) { |
diff --git a/src/input_common/main.h b/src/input_common/main.h index 1207d786c..d64a6cb4c 100644 --- a/src/input_common/main.h +++ b/src/input_common/main.h | |||
| @@ -132,7 +132,7 @@ public: | |||
| 132 | /// Retrieves the motion mappings for the given device. | 132 | /// Retrieves the motion mappings for the given device. |
| 133 | [[nodiscard]] MotionMapping GetMotionMappingForDevice(const Common::ParamPackage& device) const; | 133 | [[nodiscard]] MotionMapping GetMotionMappingForDevice(const Common::ParamPackage& device) const; |
| 134 | 134 | ||
| 135 | /// Returns an enum contaning the name to be displayed from the input engine. | 135 | /// Returns an enum containing the name to be displayed from the input engine. |
| 136 | [[nodiscard]] Common::Input::ButtonNames GetButtonName( | 136 | [[nodiscard]] Common::Input::ButtonNames GetButtonName( |
| 137 | const Common::ParamPackage& params) const; | 137 | const Common::ParamPackage& params) const; |
| 138 | 138 | ||
diff --git a/src/network/packet.h b/src/network/packet.h index e69217488..9aa2a2c9c 100644 --- a/src/network/packet.h +++ b/src/network/packet.h | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | namespace Network { | 10 | namespace Network { |
| 11 | 11 | ||
| 12 | /// A class that serializes data for network transfer. It also handles endianess | 12 | /// A class that serializes data for network transfer. It also handles endianness |
| 13 | class Packet { | 13 | class Packet { |
| 14 | public: | 14 | public: |
| 15 | Packet() = default; | 15 | Packet() = default; |
diff --git a/src/network/room.cpp b/src/network/room.cpp index dc5dbce7f..e456ea09c 100644 --- a/src/network/room.cpp +++ b/src/network/room.cpp | |||
| @@ -27,7 +27,7 @@ public: | |||
| 27 | std::atomic<State> state{State::Closed}; ///< Current state of the room. | 27 | std::atomic<State> state{State::Closed}; ///< Current state of the room. |
| 28 | RoomInformation room_information; ///< Information about this room. | 28 | RoomInformation room_information; ///< Information about this room. |
| 29 | 29 | ||
| 30 | std::string verify_uid; ///< A GUID which may be used for verfication. | 30 | std::string verify_uid; ///< A GUID which may be used for verification. |
| 31 | mutable std::mutex verify_uid_mutex; ///< Mutex for verify_uid | 31 | mutable std::mutex verify_uid_mutex; ///< Mutex for verify_uid |
| 32 | 32 | ||
| 33 | std::string password; ///< The password required to connect to this room. | 33 | std::string password; ///< The password required to connect to this room. |
diff --git a/src/network/room_member.h b/src/network/room_member.h index 0d6417294..33ac18e72 100644 --- a/src/network/room_member.h +++ b/src/network/room_member.h | |||
| @@ -71,7 +71,7 @@ public: | |||
| 71 | Idle, ///< Default state (i.e. not connected) | 71 | Idle, ///< Default state (i.e. not connected) |
| 72 | Joining, ///< The client is attempting to join a room. | 72 | Joining, ///< The client is attempting to join a room. |
| 73 | Joined, ///< The client is connected to the room and is ready to send/receive packets. | 73 | Joined, ///< The client is connected to the room and is ready to send/receive packets. |
| 74 | Moderator, ///< The client is connnected to the room and is granted mod permissions. | 74 | Moderator, ///< The client is connected to the room and is granted mod permissions. |
| 75 | }; | 75 | }; |
| 76 | 76 | ||
| 77 | enum class Error : u8 { | 77 | enum class Error : u8 { |
| @@ -201,7 +201,7 @@ public: | |||
| 201 | 201 | ||
| 202 | /** | 202 | /** |
| 203 | * Binds a function to an event that will be triggered every time the State of the member | 203 | * Binds a function to an event that will be triggered every time the State of the member |
| 204 | * changed. The function wil be called every time the event is triggered. The callback function | 204 | * changed. The function will be called every time the event is triggered. The callback function |
| 205 | * must not bind or unbind a function. Doing so will cause a deadlock | 205 | * must not bind or unbind a function. Doing so will cause a deadlock |
| 206 | * @param callback The function to call | 206 | * @param callback The function to call |
| 207 | * @return A handle used for removing the function from the registered list | 207 | * @return A handle used for removing the function from the registered list |
| @@ -210,8 +210,8 @@ public: | |||
| 210 | 210 | ||
| 211 | /** | 211 | /** |
| 212 | * Binds a function to an event that will be triggered every time an error happened. The | 212 | * Binds a function to an event that will be triggered every time an error happened. The |
| 213 | * function wil be called every time the event is triggered. The callback function must not bind | 213 | * function will be called every time the event is triggered. The callback function must not |
| 214 | * or unbind a function. Doing so will cause a deadlock | 214 | * bind or unbind a function. Doing so will cause a deadlock |
| 215 | * @param callback The function to call | 215 | * @param callback The function to call |
| 216 | * @return A handle used for removing the function from the registered list | 216 | * @return A handle used for removing the function from the registered list |
| 217 | */ | 217 | */ |
| @@ -219,7 +219,7 @@ public: | |||
| 219 | 219 | ||
| 220 | /** | 220 | /** |
| 221 | * Binds a function to an event that will be triggered every time a ProxyPacket is received. | 221 | * Binds a function to an event that will be triggered every time a ProxyPacket is received. |
| 222 | * The function wil be called everytime the event is triggered. | 222 | * The function will be called every time the event is triggered. |
| 223 | * The callback function must not bind or unbind a function. Doing so will cause a deadlock | 223 | * The callback function must not bind or unbind a function. Doing so will cause a deadlock |
| 224 | * @param callback The function to call | 224 | * @param callback The function to call |
| 225 | * @return A handle used for removing the function from the registered list | 225 | * @return A handle used for removing the function from the registered list |
| @@ -229,7 +229,7 @@ public: | |||
| 229 | 229 | ||
| 230 | /** | 230 | /** |
| 231 | * Binds a function to an event that will be triggered every time an LDNPacket is received. | 231 | * Binds a function to an event that will be triggered every time an LDNPacket is received. |
| 232 | * The function wil be called everytime the event is triggered. | 232 | * The function will be called every time the event is triggered. |
| 233 | * The callback function must not bind or unbind a function. Doing so will cause a deadlock | 233 | * The callback function must not bind or unbind a function. Doing so will cause a deadlock |
| 234 | * @param callback The function to call | 234 | * @param callback The function to call |
| 235 | * @return A handle used for removing the function from the registered list | 235 | * @return A handle used for removing the function from the registered list |
| @@ -239,7 +239,7 @@ public: | |||
| 239 | 239 | ||
| 240 | /** | 240 | /** |
| 241 | * Binds a function to an event that will be triggered every time the RoomInformation changes. | 241 | * Binds a function to an event that will be triggered every time the RoomInformation changes. |
| 242 | * The function wil be called every time the event is triggered. | 242 | * The function will be called every time the event is triggered. |
| 243 | * The callback function must not bind or unbind a function. Doing so will cause a deadlock | 243 | * The callback function must not bind or unbind a function. Doing so will cause a deadlock |
| 244 | * @param callback The function to call | 244 | * @param callback The function to call |
| 245 | * @return A handle used for removing the function from the registered list | 245 | * @return A handle used for removing the function from the registered list |
| @@ -249,7 +249,7 @@ public: | |||
| 249 | 249 | ||
| 250 | /** | 250 | /** |
| 251 | * Binds a function to an event that will be triggered every time a ChatMessage is received. | 251 | * Binds a function to an event that will be triggered every time a ChatMessage is received. |
| 252 | * The function wil be called every time the event is triggered. | 252 | * The function will be called every time the event is triggered. |
| 253 | * The callback function must not bind or unbind a function. Doing so will cause a deadlock | 253 | * The callback function must not bind or unbind a function. Doing so will cause a deadlock |
| 254 | * @param callback The function to call | 254 | * @param callback The function to call |
| 255 | * @return A handle used for removing the function from the registered list | 255 | * @return A handle used for removing the function from the registered list |
diff --git a/src/shader_recompiler/backend/glsl/emit_glsl_atomic.cpp b/src/shader_recompiler/backend/glsl/emit_glsl_atomic.cpp index 911181c43..376a05827 100644 --- a/src/shader_recompiler/backend/glsl/emit_glsl_atomic.cpp +++ b/src/shader_recompiler/backend/glsl/emit_glsl_atomic.cpp | |||
| @@ -398,162 +398,162 @@ void EmitStorageAtomicMaxF32x2(EmitContext& ctx, IR::Inst& inst, const IR::Value | |||
| 398 | } | 398 | } |
| 399 | 399 | ||
| 400 | void EmitGlobalAtomicIAdd32(EmitContext&) { | 400 | void EmitGlobalAtomicIAdd32(EmitContext&) { |
| 401 | throw NotImplementedException("GLSL Instrucion"); | 401 | throw NotImplementedException("GLSL Instruction"); |
| 402 | } | 402 | } |
| 403 | 403 | ||
| 404 | void EmitGlobalAtomicSMin32(EmitContext&) { | 404 | void EmitGlobalAtomicSMin32(EmitContext&) { |
| 405 | throw NotImplementedException("GLSL Instrucion"); | 405 | throw NotImplementedException("GLSL Instruction"); |
| 406 | } | 406 | } |
| 407 | 407 | ||
| 408 | void EmitGlobalAtomicUMin32(EmitContext&) { | 408 | void EmitGlobalAtomicUMin32(EmitContext&) { |
| 409 | throw NotImplementedException("GLSL Instrucion"); | 409 | throw NotImplementedException("GLSL Instruction"); |
| 410 | } | 410 | } |
| 411 | 411 | ||
| 412 | void EmitGlobalAtomicSMax32(EmitContext&) { | 412 | void EmitGlobalAtomicSMax32(EmitContext&) { |
| 413 | throw NotImplementedException("GLSL Instrucion"); | 413 | throw NotImplementedException("GLSL Instruction"); |
| 414 | } | 414 | } |
| 415 | 415 | ||
| 416 | void EmitGlobalAtomicUMax32(EmitContext&) { | 416 | void EmitGlobalAtomicUMax32(EmitContext&) { |
| 417 | throw NotImplementedException("GLSL Instrucion"); | 417 | throw NotImplementedException("GLSL Instruction"); |
| 418 | } | 418 | } |
| 419 | 419 | ||
| 420 | void EmitGlobalAtomicInc32(EmitContext&) { | 420 | void EmitGlobalAtomicInc32(EmitContext&) { |
| 421 | throw NotImplementedException("GLSL Instrucion"); | 421 | throw NotImplementedException("GLSL Instruction"); |
| 422 | } | 422 | } |
| 423 | 423 | ||
| 424 | void EmitGlobalAtomicDec32(EmitContext&) { | 424 | void EmitGlobalAtomicDec32(EmitContext&) { |
| 425 | throw NotImplementedException("GLSL Instrucion"); | 425 | throw NotImplementedException("GLSL Instruction"); |
| 426 | } | 426 | } |
| 427 | 427 | ||
| 428 | void EmitGlobalAtomicAnd32(EmitContext&) { | 428 | void EmitGlobalAtomicAnd32(EmitContext&) { |
| 429 | throw NotImplementedException("GLSL Instrucion"); | 429 | throw NotImplementedException("GLSL Instruction"); |
| 430 | } | 430 | } |
| 431 | 431 | ||
| 432 | void EmitGlobalAtomicOr32(EmitContext&) { | 432 | void EmitGlobalAtomicOr32(EmitContext&) { |
| 433 | throw NotImplementedException("GLSL Instrucion"); | 433 | throw NotImplementedException("GLSL Instruction"); |
| 434 | } | 434 | } |
| 435 | 435 | ||
| 436 | void EmitGlobalAtomicXor32(EmitContext&) { | 436 | void EmitGlobalAtomicXor32(EmitContext&) { |
| 437 | throw NotImplementedException("GLSL Instrucion"); | 437 | throw NotImplementedException("GLSL Instruction"); |
| 438 | } | 438 | } |
| 439 | 439 | ||
| 440 | void EmitGlobalAtomicExchange32(EmitContext&) { | 440 | void EmitGlobalAtomicExchange32(EmitContext&) { |
| 441 | throw NotImplementedException("GLSL Instrucion"); | 441 | throw NotImplementedException("GLSL Instruction"); |
| 442 | } | 442 | } |
| 443 | 443 | ||
| 444 | void EmitGlobalAtomicIAdd64(EmitContext&) { | 444 | void EmitGlobalAtomicIAdd64(EmitContext&) { |
| 445 | throw NotImplementedException("GLSL Instrucion"); | 445 | throw NotImplementedException("GLSL Instruction"); |
| 446 | } | 446 | } |
| 447 | 447 | ||
| 448 | void EmitGlobalAtomicSMin64(EmitContext&) { | 448 | void EmitGlobalAtomicSMin64(EmitContext&) { |
| 449 | throw NotImplementedException("GLSL Instrucion"); | 449 | throw NotImplementedException("GLSL Instruction"); |
| 450 | } | 450 | } |
| 451 | 451 | ||
| 452 | void EmitGlobalAtomicUMin64(EmitContext&) { | 452 | void EmitGlobalAtomicUMin64(EmitContext&) { |
| 453 | throw NotImplementedException("GLSL Instrucion"); | 453 | throw NotImplementedException("GLSL Instruction"); |
| 454 | } | 454 | } |
| 455 | 455 | ||
| 456 | void EmitGlobalAtomicSMax64(EmitContext&) { | 456 | void EmitGlobalAtomicSMax64(EmitContext&) { |
| 457 | throw NotImplementedException("GLSL Instrucion"); | 457 | throw NotImplementedException("GLSL Instruction"); |
| 458 | } | 458 | } |
| 459 | 459 | ||
| 460 | void EmitGlobalAtomicUMax64(EmitContext&) { | 460 | void EmitGlobalAtomicUMax64(EmitContext&) { |
| 461 | throw NotImplementedException("GLSL Instrucion"); | 461 | throw NotImplementedException("GLSL Instruction"); |
| 462 | } | 462 | } |
| 463 | 463 | ||
| 464 | void EmitGlobalAtomicInc64(EmitContext&) { | 464 | void EmitGlobalAtomicInc64(EmitContext&) { |
| 465 | throw NotImplementedException("GLSL Instrucion"); | 465 | throw NotImplementedException("GLSL Instruction"); |
| 466 | } | 466 | } |
| 467 | 467 | ||
| 468 | void EmitGlobalAtomicDec64(EmitContext&) { | 468 | void EmitGlobalAtomicDec64(EmitContext&) { |
| 469 | throw NotImplementedException("GLSL Instrucion"); | 469 | throw NotImplementedException("GLSL Instruction"); |
| 470 | } | 470 | } |
| 471 | 471 | ||
| 472 | void EmitGlobalAtomicAnd64(EmitContext&) { | 472 | void EmitGlobalAtomicAnd64(EmitContext&) { |
| 473 | throw NotImplementedException("GLSL Instrucion"); | 473 | throw NotImplementedException("GLSL Instruction"); |
| 474 | } | 474 | } |
| 475 | 475 | ||
| 476 | void EmitGlobalAtomicOr64(EmitContext&) { | 476 | void EmitGlobalAtomicOr64(EmitContext&) { |
| 477 | throw NotImplementedException("GLSL Instrucion"); | 477 | throw NotImplementedException("GLSL Instruction"); |
| 478 | } | 478 | } |
| 479 | 479 | ||
| 480 | void EmitGlobalAtomicXor64(EmitContext&) { | 480 | void EmitGlobalAtomicXor64(EmitContext&) { |
| 481 | throw NotImplementedException("GLSL Instrucion"); | 481 | throw NotImplementedException("GLSL Instruction"); |
| 482 | } | 482 | } |
| 483 | 483 | ||
| 484 | void EmitGlobalAtomicExchange64(EmitContext&) { | 484 | void EmitGlobalAtomicExchange64(EmitContext&) { |
| 485 | throw NotImplementedException("GLSL Instrucion"); | 485 | throw NotImplementedException("GLSL Instruction"); |
| 486 | } | 486 | } |
| 487 | 487 | ||
| 488 | void EmitGlobalAtomicIAdd32x2(EmitContext&) { | 488 | void EmitGlobalAtomicIAdd32x2(EmitContext&) { |
| 489 | throw NotImplementedException("GLSL Instrucion"); | 489 | throw NotImplementedException("GLSL Instruction"); |
| 490 | } | 490 | } |
| 491 | 491 | ||
| 492 | void EmitGlobalAtomicSMin32x2(EmitContext&) { | 492 | void EmitGlobalAtomicSMin32x2(EmitContext&) { |
| 493 | throw NotImplementedException("GLSL Instrucion"); | 493 | throw NotImplementedException("GLSL Instruction"); |
| 494 | } | 494 | } |
| 495 | 495 | ||
| 496 | void EmitGlobalAtomicUMin32x2(EmitContext&) { | 496 | void EmitGlobalAtomicUMin32x2(EmitContext&) { |
| 497 | throw NotImplementedException("GLSL Instrucion"); | 497 | throw NotImplementedException("GLSL Instruction"); |
| 498 | } | 498 | } |
| 499 | 499 | ||
| 500 | void EmitGlobalAtomicSMax32x2(EmitContext&) { | 500 | void EmitGlobalAtomicSMax32x2(EmitContext&) { |
| 501 | throw NotImplementedException("GLSL Instrucion"); | 501 | throw NotImplementedException("GLSL Instruction"); |
| 502 | } | 502 | } |
| 503 | 503 | ||
| 504 | void EmitGlobalAtomicUMax32x2(EmitContext&) { | 504 | void EmitGlobalAtomicUMax32x2(EmitContext&) { |
| 505 | throw NotImplementedException("GLSL Instrucion"); | 505 | throw NotImplementedException("GLSL Instruction"); |
| 506 | } | 506 | } |
| 507 | 507 | ||
| 508 | void EmitGlobalAtomicInc32x2(EmitContext&) { | 508 | void EmitGlobalAtomicInc32x2(EmitContext&) { |
| 509 | throw NotImplementedException("GLSL Instrucion"); | 509 | throw NotImplementedException("GLSL Instruction"); |
| 510 | } | 510 | } |
| 511 | 511 | ||
| 512 | void EmitGlobalAtomicDec32x2(EmitContext&) { | 512 | void EmitGlobalAtomicDec32x2(EmitContext&) { |
| 513 | throw NotImplementedException("GLSL Instrucion"); | 513 | throw NotImplementedException("GLSL Instruction"); |
| 514 | } | 514 | } |
| 515 | 515 | ||
| 516 | void EmitGlobalAtomicAnd32x2(EmitContext&) { | 516 | void EmitGlobalAtomicAnd32x2(EmitContext&) { |
| 517 | throw NotImplementedException("GLSL Instrucion"); | 517 | throw NotImplementedException("GLSL Instruction"); |
| 518 | } | 518 | } |
| 519 | 519 | ||
| 520 | void EmitGlobalAtomicOr32x2(EmitContext&) { | 520 | void EmitGlobalAtomicOr32x2(EmitContext&) { |
| 521 | throw NotImplementedException("GLSL Instrucion"); | 521 | throw NotImplementedException("GLSL Instruction"); |
| 522 | } | 522 | } |
| 523 | 523 | ||
| 524 | void EmitGlobalAtomicXor32x2(EmitContext&) { | 524 | void EmitGlobalAtomicXor32x2(EmitContext&) { |
| 525 | throw NotImplementedException("GLSL Instrucion"); | 525 | throw NotImplementedException("GLSL Instruction"); |
| 526 | } | 526 | } |
| 527 | 527 | ||
| 528 | void EmitGlobalAtomicExchange32x2(EmitContext&) { | 528 | void EmitGlobalAtomicExchange32x2(EmitContext&) { |
| 529 | throw NotImplementedException("GLSL Instrucion"); | 529 | throw NotImplementedException("GLSL Instruction"); |
| 530 | } | 530 | } |
| 531 | 531 | ||
| 532 | void EmitGlobalAtomicAddF32(EmitContext&) { | 532 | void EmitGlobalAtomicAddF32(EmitContext&) { |
| 533 | throw NotImplementedException("GLSL Instrucion"); | 533 | throw NotImplementedException("GLSL Instruction"); |
| 534 | } | 534 | } |
| 535 | 535 | ||
| 536 | void EmitGlobalAtomicAddF16x2(EmitContext&) { | 536 | void EmitGlobalAtomicAddF16x2(EmitContext&) { |
| 537 | throw NotImplementedException("GLSL Instrucion"); | 537 | throw NotImplementedException("GLSL Instruction"); |
| 538 | } | 538 | } |
| 539 | 539 | ||
| 540 | void EmitGlobalAtomicAddF32x2(EmitContext&) { | 540 | void EmitGlobalAtomicAddF32x2(EmitContext&) { |
| 541 | throw NotImplementedException("GLSL Instrucion"); | 541 | throw NotImplementedException("GLSL Instruction"); |
| 542 | } | 542 | } |
| 543 | 543 | ||
| 544 | void EmitGlobalAtomicMinF16x2(EmitContext&) { | 544 | void EmitGlobalAtomicMinF16x2(EmitContext&) { |
| 545 | throw NotImplementedException("GLSL Instrucion"); | 545 | throw NotImplementedException("GLSL Instruction"); |
| 546 | } | 546 | } |
| 547 | 547 | ||
| 548 | void EmitGlobalAtomicMinF32x2(EmitContext&) { | 548 | void EmitGlobalAtomicMinF32x2(EmitContext&) { |
| 549 | throw NotImplementedException("GLSL Instrucion"); | 549 | throw NotImplementedException("GLSL Instruction"); |
| 550 | } | 550 | } |
| 551 | 551 | ||
| 552 | void EmitGlobalAtomicMaxF16x2(EmitContext&) { | 552 | void EmitGlobalAtomicMaxF16x2(EmitContext&) { |
| 553 | throw NotImplementedException("GLSL Instrucion"); | 553 | throw NotImplementedException("GLSL Instruction"); |
| 554 | } | 554 | } |
| 555 | 555 | ||
| 556 | void EmitGlobalAtomicMaxF32x2(EmitContext&) { | 556 | void EmitGlobalAtomicMaxF32x2(EmitContext&) { |
| 557 | throw NotImplementedException("GLSL Instrucion"); | 557 | throw NotImplementedException("GLSL Instruction"); |
| 558 | } | 558 | } |
| 559 | } // namespace Shader::Backend::GLSL | 559 | } // namespace Shader::Backend::GLSL |
diff --git a/src/shader_recompiler/backend/glsl/glsl_emit_context.h b/src/shader_recompiler/backend/glsl/glsl_emit_context.h index dfd10ac28..7587f7bab 100644 --- a/src/shader_recompiler/backend/glsl/glsl_emit_context.h +++ b/src/shader_recompiler/backend/glsl/glsl_emit_context.h | |||
| @@ -49,7 +49,7 @@ public: | |||
| 49 | void Add(const char* format_str, IR::Inst& inst, Args&&... args) { | 49 | void Add(const char* format_str, IR::Inst& inst, Args&&... args) { |
| 50 | const auto var_def{var_alloc.AddDefine(inst, type)}; | 50 | const auto var_def{var_alloc.AddDefine(inst, type)}; |
| 51 | if (var_def.empty()) { | 51 | if (var_def.empty()) { |
| 52 | // skip assigment. | 52 | // skip assignment. |
| 53 | code += fmt::format(fmt::runtime(format_str + 3), std::forward<Args>(args)...); | 53 | code += fmt::format(fmt::runtime(format_str + 3), std::forward<Args>(args)...); |
| 54 | } else { | 54 | } else { |
| 55 | code += fmt::format(fmt::runtime(format_str), var_def, std::forward<Args>(args)...); | 55 | code += fmt::format(fmt::runtime(format_str), var_def, std::forward<Args>(args)...); |
diff --git a/src/tests/common/ring_buffer.cpp b/src/tests/common/ring_buffer.cpp index 7dee988c8..e85f9977b 100644 --- a/src/tests/common/ring_buffer.cpp +++ b/src/tests/common/ring_buffer.cpp | |||
| @@ -52,7 +52,7 @@ TEST_CASE("RingBuffer: Basic Tests", "[common]") { | |||
| 52 | 52 | ||
| 53 | REQUIRE(buf.Size() == 1U); | 53 | REQUIRE(buf.Size() == 1U); |
| 54 | 54 | ||
| 55 | // Pushing more values than space available should partially suceed. | 55 | // Pushing more values than space available should partially succeed. |
| 56 | { | 56 | { |
| 57 | std::vector<char> to_push(6); | 57 | std::vector<char> to_push(6); |
| 58 | std::iota(to_push.begin(), to_push.end(), 88); | 58 | std::iota(to_push.begin(), to_push.end(), 88); |
diff --git a/src/tests/common/scratch_buffer.cpp b/src/tests/common/scratch_buffer.cpp index 132f139fa..26e401760 100644 --- a/src/tests/common/scratch_buffer.cpp +++ b/src/tests/common/scratch_buffer.cpp | |||
| @@ -191,7 +191,7 @@ TEST_CASE("ScratchBuffer: Span Writes", "[common]") { | |||
| 191 | 191 | ||
| 192 | for (size_t i = 0; i < buf_span.size(); ++i) { | 192 | for (size_t i = 0; i < buf_span.size(); ++i) { |
| 193 | const auto new_value = static_cast<u8>(i + 1U); | 193 | const auto new_value = static_cast<u8>(i + 1U); |
| 194 | // Writes to a span of the scratch buffer will propogate to the buffer itself | 194 | // Writes to a span of the scratch buffer will propagate to the buffer itself |
| 195 | buf_span[i] = new_value; | 195 | buf_span[i] = new_value; |
| 196 | REQUIRE(buf[i] == new_value); | 196 | REQUIRE(buf[i] == new_value); |
| 197 | } | 197 | } |
diff --git a/src/video_core/control/channel_state_cache.h b/src/video_core/control/channel_state_cache.h index cdaf4f8d5..46bc9e322 100644 --- a/src/video_core/control/channel_state_cache.h +++ b/src/video_core/control/channel_state_cache.h | |||
| @@ -44,7 +44,7 @@ public: | |||
| 44 | template <class P> | 44 | template <class P> |
| 45 | class ChannelSetupCaches { | 45 | class ChannelSetupCaches { |
| 46 | public: | 46 | public: |
| 47 | /// Operations for seting the channel of execution. | 47 | /// Operations for setting the channel of execution. |
| 48 | virtual ~ChannelSetupCaches(); | 48 | virtual ~ChannelSetupCaches(); |
| 49 | 49 | ||
| 50 | /// Create channel state. | 50 | /// Create channel state. |
diff --git a/src/video_core/engines/sw_blitter/blitter.cpp b/src/video_core/engines/sw_blitter/blitter.cpp index 2f1ea4626..3c9f38559 100644 --- a/src/video_core/engines/sw_blitter/blitter.cpp +++ b/src/video_core/engines/sw_blitter/blitter.cpp | |||
| @@ -193,7 +193,7 @@ bool SoftwareBlitEngine::Blit(Fermi2D::Surface& src, Fermi2D::Surface& dst, | |||
| 193 | output_converter->ConvertFrom(impl->intermediate_dst, impl->dst_buffer); | 193 | output_converter->ConvertFrom(impl->intermediate_dst, impl->dst_buffer); |
| 194 | }; | 194 | }; |
| 195 | 195 | ||
| 196 | // Do actuall Blit | 196 | // Do actual Blit |
| 197 | 197 | ||
| 198 | impl->dst_buffer.resize(dst_copy_size); | 198 | impl->dst_buffer.resize(dst_copy_size); |
| 199 | if (src.linear == Fermi2D::MemoryLayout::BlockLinear) { | 199 | if (src.linear == Fermi2D::MemoryLayout::BlockLinear) { |
diff --git a/src/video_core/host_shaders/astc_decoder.comp b/src/video_core/host_shaders/astc_decoder.comp index d608678a3..bf2693559 100644 --- a/src/video_core/host_shaders/astc_decoder.comp +++ b/src/video_core/host_shaders/astc_decoder.comp | |||
| @@ -125,7 +125,7 @@ uvec4 local_buff; | |||
| 125 | uvec4 color_endpoint_data; | 125 | uvec4 color_endpoint_data; |
| 126 | int color_bitsread = 0; | 126 | int color_bitsread = 0; |
| 127 | 127 | ||
| 128 | // Four values, two endpoints, four maximum paritions | 128 | // Four values, two endpoints, four maximum partitions |
| 129 | uint color_values[32]; | 129 | uint color_values[32]; |
| 130 | int colvals_index = 0; | 130 | int colvals_index = 0; |
| 131 | 131 | ||
diff --git a/src/video_core/host_shaders/opengl_smaa.glsl b/src/video_core/host_shaders/opengl_smaa.glsl index 3cbe87bbf..419f89bca 100644 --- a/src/video_core/host_shaders/opengl_smaa.glsl +++ b/src/video_core/host_shaders/opengl_smaa.glsl | |||
| @@ -97,7 +97,7 @@ | |||
| 97 | * half-rate linear filtering on GCN. | 97 | * half-rate linear filtering on GCN. |
| 98 | * | 98 | * |
| 99 | * If SMAA is applied to 64-bit color buffers, switching to point filtering | 99 | * If SMAA is applied to 64-bit color buffers, switching to point filtering |
| 100 | * when accesing them will increase the performance. Search for | 100 | * when accessing them will increase the performance. Search for |
| 101 | * 'SMAASamplePoint' to see which textures may benefit from point | 101 | * 'SMAASamplePoint' to see which textures may benefit from point |
| 102 | * filtering, and where (which is basically the color input in the edge | 102 | * filtering, and where (which is basically the color input in the edge |
| 103 | * detection and resolve passes). | 103 | * detection and resolve passes). |
diff --git a/src/video_core/memory_manager.h b/src/video_core/memory_manager.h index cf56392ef..51ae2de68 100644 --- a/src/video_core/memory_manager.h +++ b/src/video_core/memory_manager.h | |||
| @@ -103,8 +103,8 @@ public: | |||
| 103 | 103 | ||
| 104 | /** | 104 | /** |
| 105 | * Returns a vector with all the subranges of cpu addresses mapped beneath. | 105 | * Returns a vector with all the subranges of cpu addresses mapped beneath. |
| 106 | * if the region is continous, a single pair will be returned. If it's unmapped, an empty vector | 106 | * if the region is continuous, a single pair will be returned. If it's unmapped, an empty |
| 107 | * will be returned; | 107 | * vector will be returned; |
| 108 | */ | 108 | */ |
| 109 | std::vector<std::pair<GPUVAddr, std::size_t>> GetSubmappedRange(GPUVAddr gpu_addr, | 109 | std::vector<std::pair<GPUVAddr, std::size_t>> GetSubmappedRange(GPUVAddr gpu_addr, |
| 110 | std::size_t size) const; | 110 | std::size_t size) const; |
diff --git a/src/video_core/query_cache.h b/src/video_core/query_cache.h index 00ce53e3e..8906ba6d8 100644 --- a/src/video_core/query_cache.h +++ b/src/video_core/query_cache.h | |||
| @@ -341,7 +341,7 @@ public: | |||
| 341 | 341 | ||
| 342 | /// Flushes the query to guest memory. | 342 | /// Flushes the query to guest memory. |
| 343 | virtual void Flush() { | 343 | virtual void Flush() { |
| 344 | // When counter is nullptr it means that it's just been reseted. We are supposed to write a | 344 | // When counter is nullptr it means that it's just been reset. We are supposed to write a |
| 345 | // zero in these cases. | 345 | // zero in these cases. |
| 346 | const u64 value = counter ? counter->Query() : 0; | 346 | const u64 value = counter ? counter->Query() : 0; |
| 347 | std::memcpy(host_ptr, &value, sizeof(u64)); | 347 | std::memcpy(host_ptr, &value, sizeof(u64)); |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 33748762f..abe0f3582 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -576,7 +576,7 @@ bool RasterizerOpenGL::AccelerateConditionalRendering() { | |||
| 576 | // Reimplement Host conditional rendering. | 576 | // Reimplement Host conditional rendering. |
| 577 | return false; | 577 | return false; |
| 578 | } | 578 | } |
| 579 | // Medium / Low Hack: stub any checks on queries writen into the buffer cache. | 579 | // Medium / Low Hack: stub any checks on queries written into the buffer cache. |
| 580 | const GPUVAddr condition_address{maxwell3d->regs.render_enable.Address()}; | 580 | const GPUVAddr condition_address{maxwell3d->regs.render_enable.Address()}; |
| 581 | Maxwell::ReportSemaphore::Compare cmp; | 581 | Maxwell::ReportSemaphore::Compare cmp; |
| 582 | if (gpu_memory->IsMemoryDirty(condition_address, sizeof(cmp), | 582 | if (gpu_memory->IsMemoryDirty(condition_address, sizeof(cmp), |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index 1f6562ef8..ad6978bd0 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h | |||
| @@ -162,7 +162,7 @@ private: | |||
| 162 | /// Syncs the cull mode to match the guest state | 162 | /// Syncs the cull mode to match the guest state |
| 163 | void SyncCullMode(); | 163 | void SyncCullMode(); |
| 164 | 164 | ||
| 165 | /// Syncs the primitve restart to match the guest state | 165 | /// Syncs the primitive restart to match the guest state |
| 166 | void SyncPrimitiveRestart(); | 166 | void SyncPrimitiveRestart(); |
| 167 | 167 | ||
| 168 | /// Syncs the depth test state to match the guest state | 168 | /// Syncs the depth test state to match the guest state |
| @@ -246,7 +246,7 @@ private: | |||
| 246 | std::array<GLuint, MAX_TEXTURES> texture_handles{}; | 246 | std::array<GLuint, MAX_TEXTURES> texture_handles{}; |
| 247 | std::array<GLuint, MAX_IMAGES> image_handles{}; | 247 | std::array<GLuint, MAX_IMAGES> image_handles{}; |
| 248 | 248 | ||
| 249 | /// Number of commands queued to the OpenGL driver. Resetted on flush. | 249 | /// Number of commands queued to the OpenGL driver. Reset on flush. |
| 250 | size_t num_queued_commands = 0; | 250 | size_t num_queued_commands = 0; |
| 251 | bool has_written_global_memory = false; | 251 | bool has_written_global_memory = false; |
| 252 | 252 | ||
diff --git a/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp b/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp index f8398b511..e7df32d84 100644 --- a/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp +++ b/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp | |||
| @@ -271,7 +271,7 @@ bool FixedPipelineState::operator==(const FixedPipelineState& rhs) const noexcep | |||
| 271 | 271 | ||
| 272 | u32 FixedPipelineState::PackComparisonOp(Maxwell::ComparisonOp op) noexcept { | 272 | u32 FixedPipelineState::PackComparisonOp(Maxwell::ComparisonOp op) noexcept { |
| 273 | // OpenGL enums go from 0x200 to 0x207 and the others from 1 to 8 | 273 | // OpenGL enums go from 0x200 to 0x207 and the others from 1 to 8 |
| 274 | // If we substract 0x200 to OpenGL enums and 1 to the others we get a 0-7 range. | 274 | // If we subtract 0x200 to OpenGL enums and 1 to the others we get a 0-7 range. |
| 275 | // Perfect for a hash. | 275 | // Perfect for a hash. |
| 276 | const u32 value = static_cast<u32>(op); | 276 | const u32 value = static_cast<u32>(op); |
| 277 | return value - (value >= 0x200 ? 0x200 : 1); | 277 | return value - (value >= 0x200 ? 0x200 : 1); |
| @@ -322,8 +322,8 @@ Maxwell::StencilOp::Op FixedPipelineState::UnpackStencilOp(u32 packed) noexcept | |||
| 322 | } | 322 | } |
| 323 | 323 | ||
| 324 | u32 FixedPipelineState::PackCullFace(Maxwell::CullFace cull) noexcept { | 324 | u32 FixedPipelineState::PackCullFace(Maxwell::CullFace cull) noexcept { |
| 325 | // FrontAndBack is 0x408, by substracting 0x406 in it we get 2. | 325 | // FrontAndBack is 0x408, by subtracting 0x406 in it we get 2. |
| 326 | // Individual cull faces are in 0x404 and 0x405, substracting 0x404 we get 0 and 1. | 326 | // Individual cull faces are in 0x404 and 0x405, subtracting 0x404 we get 0 and 1. |
| 327 | const u32 value = static_cast<u32>(cull); | 327 | const u32 value = static_cast<u32>(cull); |
| 328 | return value - (value == 0x408 ? 0x406 : 0x404); | 328 | return value - (value == 0x408 ? 0x406 : 0x404); |
| 329 | } | 329 | } |
diff --git a/src/video_core/renderer_vulkan/vk_command_pool.cpp b/src/video_core/renderer_vulkan/vk_command_pool.cpp index 2f09de1c1..d0dbf7ca5 100644 --- a/src/video_core/renderer_vulkan/vk_command_pool.cpp +++ b/src/video_core/renderer_vulkan/vk_command_pool.cpp | |||
| @@ -22,8 +22,8 @@ CommandPool::CommandPool(MasterSemaphore& master_semaphore_, const Device& devic | |||
| 22 | CommandPool::~CommandPool() = default; | 22 | CommandPool::~CommandPool() = default; |
| 23 | 23 | ||
| 24 | void CommandPool::Allocate(size_t begin, size_t end) { | 24 | void CommandPool::Allocate(size_t begin, size_t end) { |
| 25 | // Command buffers are going to be commited, recorded, executed every single usage cycle. | 25 | // Command buffers are going to be committed, recorded, executed every single usage cycle. |
| 26 | // They are also going to be reseted when commited. | 26 | // They are also going to be reset when committed. |
| 27 | Pool& pool = pools.emplace_back(); | 27 | Pool& pool = pools.emplace_back(); |
| 28 | pool.handle = device.GetLogical().CreateCommandPool({ | 28 | pool.handle = device.GetLogical().CreateCommandPool({ |
| 29 | .sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, | 29 | .sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO, |
diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 855488ead..673ab478e 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp | |||
| @@ -671,7 +671,7 @@ bool RasterizerVulkan::AccelerateConditionalRendering() { | |||
| 671 | // TODO(Blinkhawk): Reimplement Host conditional rendering. | 671 | // TODO(Blinkhawk): Reimplement Host conditional rendering. |
| 672 | return false; | 672 | return false; |
| 673 | } | 673 | } |
| 674 | // Medium / Low Hack: stub any checks on queries writen into the buffer cache. | 674 | // Medium / Low Hack: stub any checks on queries written into the buffer cache. |
| 675 | const GPUVAddr condition_address{maxwell3d->regs.render_enable.Address()}; | 675 | const GPUVAddr condition_address{maxwell3d->regs.render_enable.Address()}; |
| 676 | Maxwell::ReportSemaphore::Compare cmp; | 676 | Maxwell::ReportSemaphore::Compare cmp; |
| 677 | if (gpu_memory->IsMemoryDirty(condition_address, sizeof(cmp), | 677 | if (gpu_memory->IsMemoryDirty(condition_address, sizeof(cmp), |
diff --git a/src/video_core/renderer_vulkan/vk_resource_pool.cpp b/src/video_core/renderer_vulkan/vk_resource_pool.cpp index 6c8ac22f4..6572f82ba 100644 --- a/src/video_core/renderer_vulkan/vk_resource_pool.cpp +++ b/src/video_core/renderer_vulkan/vk_resource_pool.cpp | |||
| @@ -37,7 +37,7 @@ size_t ResourcePool::CommitResource() { | |||
| 37 | found = free_resource; | 37 | found = free_resource; |
| 38 | } | 38 | } |
| 39 | } | 39 | } |
| 40 | // Free iterator is hinted to the resource after the one that's been commited. | 40 | // Free iterator is hinted to the resource after the one that's been committed. |
| 41 | hint_iterator = (*found + 1) % ticks.size(); | 41 | hint_iterator = (*found + 1) % ticks.size(); |
| 42 | return *found; | 42 | return *found; |
| 43 | } | 43 | } |
| @@ -46,7 +46,7 @@ size_t ResourcePool::ManageOverflow() { | |||
| 46 | const size_t old_capacity = ticks.size(); | 46 | const size_t old_capacity = ticks.size(); |
| 47 | Grow(); | 47 | Grow(); |
| 48 | 48 | ||
| 49 | // The last entry is guaranted to be free, since it's the first element of the freshly | 49 | // The last entry is guaranteed to be free, since it's the first element of the freshly |
| 50 | // allocated resources. | 50 | // allocated resources. |
| 51 | return old_capacity; | 51 | return old_capacity; |
| 52 | } | 52 | } |
diff --git a/src/video_core/renderer_vulkan/vk_swapchain.cpp b/src/video_core/renderer_vulkan/vk_swapchain.cpp index b6810eef9..85fdce6e5 100644 --- a/src/video_core/renderer_vulkan/vk_swapchain.cpp +++ b/src/video_core/renderer_vulkan/vk_swapchain.cpp | |||
| @@ -159,7 +159,7 @@ void Swapchain::CreateSwapchain(const VkSurfaceCapabilitiesKHR& capabilities, bo | |||
| 159 | present_mode = ChooseSwapPresentMode(present_modes); | 159 | present_mode = ChooseSwapPresentMode(present_modes); |
| 160 | 160 | ||
| 161 | u32 requested_image_count{capabilities.minImageCount + 1}; | 161 | u32 requested_image_count{capabilities.minImageCount + 1}; |
| 162 | // Ensure Tripple buffering if possible. | 162 | // Ensure Triple buffering if possible. |
| 163 | if (capabilities.maxImageCount > 0) { | 163 | if (capabilities.maxImageCount > 0) { |
| 164 | if (requested_image_count > capabilities.maxImageCount) { | 164 | if (requested_image_count > capabilities.maxImageCount) { |
| 165 | requested_image_count = capabilities.maxImageCount; | 165 | requested_image_count = capabilities.maxImageCount; |
diff --git a/src/video_core/renderer_vulkan/vk_update_descriptor.cpp b/src/video_core/renderer_vulkan/vk_update_descriptor.cpp index 4d4a6753b..009dab0b6 100644 --- a/src/video_core/renderer_vulkan/vk_update_descriptor.cpp +++ b/src/video_core/renderer_vulkan/vk_update_descriptor.cpp | |||
| @@ -25,7 +25,7 @@ void UpdateDescriptorQueue::TickFrame() { | |||
| 25 | 25 | ||
| 26 | void UpdateDescriptorQueue::Acquire() { | 26 | void UpdateDescriptorQueue::Acquire() { |
| 27 | // Minimum number of entries required. | 27 | // Minimum number of entries required. |
| 28 | // This is the maximum number of entries a single draw call migth use. | 28 | // This is the maximum number of entries a single draw call might use. |
| 29 | static constexpr size_t MIN_ENTRIES = 0x400; | 29 | static constexpr size_t MIN_ENTRIES = 0x400; |
| 30 | 30 | ||
| 31 | if (std::distance(payload.data(), payload_cursor) + MIN_ENTRIES >= payload.max_size()) { | 31 | if (std::distance(payload.data(), payload_cursor) + MIN_ENTRIES >= payload.max_size()) { |
diff --git a/src/video_core/texture_cache/image_base.h b/src/video_core/texture_cache/image_base.h index e8fa592d2..329396bb6 100644 --- a/src/video_core/texture_cache/image_base.h +++ b/src/video_core/texture_cache/image_base.h | |||
| @@ -25,7 +25,7 @@ enum class ImageFlagBits : u32 { | |||
| 25 | Registered = 1 << 6, ///< True when the image is registered | 25 | Registered = 1 << 6, ///< True when the image is registered |
| 26 | Picked = 1 << 7, ///< Temporary flag to mark the image as picked | 26 | Picked = 1 << 7, ///< Temporary flag to mark the image as picked |
| 27 | Remapped = 1 << 8, ///< Image has been remapped. | 27 | Remapped = 1 << 8, ///< Image has been remapped. |
| 28 | Sparse = 1 << 9, ///< Image has non continous submemory. | 28 | Sparse = 1 << 9, ///< Image has non continuous submemory. |
| 29 | 29 | ||
| 30 | // Garbage Collection Flags | 30 | // Garbage Collection Flags |
| 31 | BadOverlap = 1 << 10, ///< This image overlaps other but doesn't fit, has higher | 31 | BadOverlap = 1 << 10, ///< This image overlaps other but doesn't fit, has higher |
diff --git a/src/video_core/textures/astc.cpp b/src/video_core/textures/astc.cpp index 4381eed1d..a68bc0d77 100644 --- a/src/video_core/textures/astc.cpp +++ b/src/video_core/textures/astc.cpp | |||
| @@ -1571,7 +1571,7 @@ static void DecompressBlock(std::span<const u8, 16> inBuf, const u32 blockWidth, | |||
| 1571 | assert(strm.GetBitsRead() + weightParams.GetPackedBitSize() == 128); | 1571 | assert(strm.GetBitsRead() + weightParams.GetPackedBitSize() == 128); |
| 1572 | 1572 | ||
| 1573 | // Decode both color data and texel weight data | 1573 | // Decode both color data and texel weight data |
| 1574 | u32 colorValues[32]; // Four values, two endpoints, four maximum paritions | 1574 | u32 colorValues[32]; // Four values, two endpoints, four maximum partitions |
| 1575 | DecodeColorValues(colorValues, colorEndpointData, colorEndpointMode, nPartitions, | 1575 | DecodeColorValues(colorValues, colorEndpointData, colorEndpointMode, nPartitions, |
| 1576 | colorDataBits); | 1576 | colorDataBits); |
| 1577 | 1577 | ||
diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 48f1a3d14..df348af55 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp | |||
| @@ -417,7 +417,7 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR | |||
| 417 | 417 | ||
| 418 | sets_per_pool = 64; | 418 | sets_per_pool = 64; |
| 419 | if (is_amd_driver) { | 419 | if (is_amd_driver) { |
| 420 | // AMD drivers need a higher amount of Sets per Pool in certain circunstances like in XC2. | 420 | // AMD drivers need a higher amount of Sets per Pool in certain circumstances like in XC2. |
| 421 | sets_per_pool = 96; | 421 | sets_per_pool = 96; |
| 422 | // Disable VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT on AMD GCN4 and lower as it is broken. | 422 | // Disable VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT on AMD GCN4 and lower as it is broken. |
| 423 | if (!features.shader_float16_int8.shaderFloat16) { | 423 | if (!features.shader_float16_int8.shaderFloat16) { |
diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.h index 0662a2d9f..41b5da18a 100644 --- a/src/video_core/vulkan_common/vulkan_device.h +++ b/src/video_core/vulkan_common/vulkan_device.h | |||
| @@ -180,7 +180,7 @@ public: | |||
| 180 | ~Device(); | 180 | ~Device(); |
| 181 | 181 | ||
| 182 | /** | 182 | /** |
| 183 | * Returns a format supported by the device for the passed requeriments. | 183 | * Returns a format supported by the device for the passed requirements. |
| 184 | * @param wanted_format The ideal format to be returned. It may not be the returned format. | 184 | * @param wanted_format The ideal format to be returned. It may not be the returned format. |
| 185 | * @param wanted_usage The usage that must be fulfilled even if the format is not supported. | 185 | * @param wanted_usage The usage that must be fulfilled even if the format is not supported. |
| 186 | * @param format_type Format type usage. | 186 | * @param format_type Format type usage. |
| @@ -259,12 +259,12 @@ public: | |||
| 259 | 259 | ||
| 260 | bool ShouldBoostClocks() const; | 260 | bool ShouldBoostClocks() const; |
| 261 | 261 | ||
| 262 | /// Returns uniform buffer alignment requeriment. | 262 | /// Returns uniform buffer alignment requirement. |
| 263 | VkDeviceSize GetUniformBufferAlignment() const { | 263 | VkDeviceSize GetUniformBufferAlignment() const { |
| 264 | return properties.properties.limits.minUniformBufferOffsetAlignment; | 264 | return properties.properties.limits.minUniformBufferOffsetAlignment; |
| 265 | } | 265 | } |
| 266 | 266 | ||
| 267 | /// Returns storage alignment requeriment. | 267 | /// Returns storage alignment requirement. |
| 268 | VkDeviceSize GetStorageBufferAlignment() const { | 268 | VkDeviceSize GetStorageBufferAlignment() const { |
| 269 | return properties.properties.limits.minStorageBufferOffsetAlignment; | 269 | return properties.properties.limits.minStorageBufferOffsetAlignment; |
| 270 | } | 270 | } |
| @@ -656,7 +656,7 @@ private: | |||
| 656 | bool is_integrated{}; ///< Is GPU an iGPU. | 656 | bool is_integrated{}; ///< Is GPU an iGPU. |
| 657 | bool is_virtual{}; ///< Is GPU a virtual GPU. | 657 | bool is_virtual{}; ///< Is GPU a virtual GPU. |
| 658 | bool is_non_gpu{}; ///< Is SoftwareRasterizer, FPGA, non-GPU device. | 658 | bool is_non_gpu{}; ///< Is SoftwareRasterizer, FPGA, non-GPU device. |
| 659 | bool has_broken_cube_compatibility{}; ///< Has broken cube compatiblity bit | 659 | bool has_broken_cube_compatibility{}; ///< Has broken cube compatibility bit |
| 660 | bool has_renderdoc{}; ///< Has RenderDoc attached | 660 | bool has_renderdoc{}; ///< Has RenderDoc attached |
| 661 | bool has_nsight_graphics{}; ///< Has Nsight Graphics attached | 661 | bool has_nsight_graphics{}; ///< Has Nsight Graphics attached |
| 662 | bool supports_d24_depth{}; ///< Supports D24 depth buffers. | 662 | bool supports_d24_depth{}; ///< Supports D24 depth buffers. |
diff --git a/src/video_core/vulkan_common/vulkan_wrapper.h b/src/video_core/vulkan_common/vulkan_wrapper.h index e86f661cb..4ff328a21 100644 --- a/src/video_core/vulkan_common/vulkan_wrapper.h +++ b/src/video_core/vulkan_common/vulkan_wrapper.h | |||
| @@ -68,7 +68,7 @@ public: | |||
| 68 | constexpr Span(const Range& range) : ptr{std::data(range)}, num{std::size(range)} {} | 68 | constexpr Span(const Range& range) : ptr{std::data(range)}, num{std::size(range)} {} |
| 69 | 69 | ||
| 70 | /// Construct a span from a pointer and a size. | 70 | /// Construct a span from a pointer and a size. |
| 71 | /// This is inteded for subranges. | 71 | /// This is intended for subranges. |
| 72 | constexpr Span(const T* ptr_, std::size_t num_) noexcept : ptr{ptr_}, num{num_} {} | 72 | constexpr Span(const T* ptr_, std::size_t num_) noexcept : ptr{ptr_}, num{num_} {} |
| 73 | 73 | ||
| 74 | /// Returns the data pointer by the span. | 74 | /// Returns the data pointer by the span. |
| @@ -390,11 +390,11 @@ public: | |||
| 390 | Handle(const Handle&) = delete; | 390 | Handle(const Handle&) = delete; |
| 391 | Handle& operator=(const Handle&) = delete; | 391 | Handle& operator=(const Handle&) = delete; |
| 392 | 392 | ||
| 393 | /// Construct a handle transfering the ownership from another handle. | 393 | /// Construct a handle transferring the ownership from another handle. |
| 394 | Handle(Handle&& rhs) noexcept | 394 | Handle(Handle&& rhs) noexcept |
| 395 | : handle{std::exchange(rhs.handle, nullptr)}, owner{rhs.owner}, dld{rhs.dld} {} | 395 | : handle{std::exchange(rhs.handle, nullptr)}, owner{rhs.owner}, dld{rhs.dld} {} |
| 396 | 396 | ||
| 397 | /// Assign the current handle transfering the ownership from another handle. | 397 | /// Assign the current handle transferring the ownership from another handle. |
| 398 | /// Destroys any previously held object. | 398 | /// Destroys any previously held object. |
| 399 | Handle& operator=(Handle&& rhs) noexcept { | 399 | Handle& operator=(Handle&& rhs) noexcept { |
| 400 | Release(); | 400 | Release(); |
| @@ -463,10 +463,10 @@ public: | |||
| 463 | Handle(const Handle&) = delete; | 463 | Handle(const Handle&) = delete; |
| 464 | Handle& operator=(const Handle&) = delete; | 464 | Handle& operator=(const Handle&) = delete; |
| 465 | 465 | ||
| 466 | /// Construct a handle transfering ownership from another handle. | 466 | /// Construct a handle transferring ownership from another handle. |
| 467 | Handle(Handle&& rhs) noexcept : handle{std::exchange(rhs.handle, nullptr)}, dld{rhs.dld} {} | 467 | Handle(Handle&& rhs) noexcept : handle{std::exchange(rhs.handle, nullptr)}, dld{rhs.dld} {} |
| 468 | 468 | ||
| 469 | /// Assign the current handle transfering the ownership from another handle. | 469 | /// Assign the current handle transferring the ownership from another handle. |
| 470 | /// Destroys any previously held object. | 470 | /// Destroys any previously held object. |
| 471 | Handle& operator=(Handle&& rhs) noexcept { | 471 | Handle& operator=(Handle&& rhs) noexcept { |
| 472 | Release(); | 472 | Release(); |
| @@ -533,12 +533,12 @@ public: | |||
| 533 | PoolAllocations(const PoolAllocations&) = delete; | 533 | PoolAllocations(const PoolAllocations&) = delete; |
| 534 | PoolAllocations& operator=(const PoolAllocations&) = delete; | 534 | PoolAllocations& operator=(const PoolAllocations&) = delete; |
| 535 | 535 | ||
| 536 | /// Construct an allocation transfering ownership from another allocation. | 536 | /// Construct an allocation transferring ownership from another allocation. |
| 537 | PoolAllocations(PoolAllocations&& rhs) noexcept | 537 | PoolAllocations(PoolAllocations&& rhs) noexcept |
| 538 | : allocations{std::move(rhs.allocations)}, num{rhs.num}, device{rhs.device}, pool{rhs.pool}, | 538 | : allocations{std::move(rhs.allocations)}, num{rhs.num}, device{rhs.device}, pool{rhs.pool}, |
| 539 | dld{rhs.dld} {} | 539 | dld{rhs.dld} {} |
| 540 | 540 | ||
| 541 | /// Assign an allocation transfering ownership from another allocation. | 541 | /// Assign an allocation transferring ownership from another allocation. |
| 542 | PoolAllocations& operator=(PoolAllocations&& rhs) noexcept { | 542 | PoolAllocations& operator=(PoolAllocations&& rhs) noexcept { |
| 543 | allocations = std::move(rhs.allocations); | 543 | allocations = std::move(rhs.allocations); |
| 544 | num = rhs.num; | 544 | num = rhs.num; |
diff --git a/src/yuzu/applets/qt_web_browser.h b/src/yuzu/applets/qt_web_browser.h index e8fe511ed..ceae7926e 100644 --- a/src/yuzu/applets/qt_web_browser.h +++ b/src/yuzu/applets/qt_web_browser.h | |||
| @@ -110,7 +110,7 @@ private: | |||
| 110 | /** | 110 | /** |
| 111 | * Handles button presses to execute functions assigned in yuzu_key_callbacks. | 111 | * Handles button presses to execute functions assigned in yuzu_key_callbacks. |
| 112 | * yuzu_key_callbacks contains specialized functions for the buttons in the window footer | 112 | * yuzu_key_callbacks contains specialized functions for the buttons in the window footer |
| 113 | * that can be overriden by games to achieve desired functionality. | 113 | * that can be overridden by games to achieve desired functionality. |
| 114 | * | 114 | * |
| 115 | * @tparam HIDButton The list of buttons contained in yuzu_key_callbacks | 115 | * @tparam HIDButton The list of buttons contained in yuzu_key_callbacks |
| 116 | */ | 116 | */ |
diff --git a/src/yuzu/compatdb.cpp b/src/yuzu/compatdb.cpp index 05f49c0d2..a57a96a38 100644 --- a/src/yuzu/compatdb.cpp +++ b/src/yuzu/compatdb.cpp | |||
| @@ -76,7 +76,7 @@ void CompatDB::Submit() { | |||
| 76 | compatibility_Graphical->addButton(ui->radioButton_Audio_Minor, 1); | 76 | compatibility_Graphical->addButton(ui->radioButton_Audio_Minor, 1); |
| 77 | compatibility_Audio->addButton(ui->radioButton_Audio_No, 2); | 77 | compatibility_Audio->addButton(ui->radioButton_Audio_No, 2); |
| 78 | 78 | ||
| 79 | const int compatiblity = static_cast<int>(CalculateCompatibility()); | 79 | const int compatibility = static_cast<int>(CalculateCompatibility()); |
| 80 | 80 | ||
| 81 | switch ((static_cast<CompatDBPage>(currentId()))) { | 81 | switch ((static_cast<CompatDBPage>(currentId()))) { |
| 82 | case CompatDBPage::Intro: | 82 | case CompatDBPage::Intro: |
| @@ -113,9 +113,9 @@ void CompatDB::Submit() { | |||
| 113 | break; | 113 | break; |
| 114 | case CompatDBPage::Final: | 114 | case CompatDBPage::Final: |
| 115 | back(); | 115 | back(); |
| 116 | LOG_INFO(Frontend, "Compatibility Rating: {}", compatiblity); | 116 | LOG_INFO(Frontend, "Compatibility Rating: {}", compatibility); |
| 117 | telemetry_session.AddField(Common::Telemetry::FieldType::UserFeedback, "Compatibility", | 117 | telemetry_session.AddField(Common::Telemetry::FieldType::UserFeedback, "Compatibility", |
| 118 | compatiblity); | 118 | compatibility); |
| 119 | 119 | ||
| 120 | button(NextButton)->setEnabled(false); | 120 | button(NextButton)->setEnabled(false); |
| 121 | button(NextButton)->setText(tr("Submitting")); | 121 | button(NextButton)->setText(tr("Submitting")); |
diff --git a/src/yuzu/configuration/configure_hotkeys.h b/src/yuzu/configuration/configure_hotkeys.h index b45ecb185..e8e414320 100644 --- a/src/yuzu/configuration/configure_hotkeys.h +++ b/src/yuzu/configuration/configure_hotkeys.h | |||
| @@ -34,7 +34,7 @@ public: | |||
| 34 | 34 | ||
| 35 | /** | 35 | /** |
| 36 | * Populates the hotkey list widget using data from the provided registry. | 36 | * Populates the hotkey list widget using data from the provided registry. |
| 37 | * Called everytime the Configure dialog is opened. | 37 | * Called every time the Configure dialog is opened. |
| 38 | * @param registry The HotkeyRegistry whose data is used to populate the list. | 38 | * @param registry The HotkeyRegistry whose data is used to populate the list. |
| 39 | */ | 39 | */ |
| 40 | void Populate(const HotkeyRegistry& registry); | 40 | void Populate(const HotkeyRegistry& registry); |
diff --git a/src/yuzu/configuration/configure_input_player.h b/src/yuzu/configuration/configure_input_player.h index 99a9c875d..d4df43d73 100644 --- a/src/yuzu/configuration/configure_input_player.h +++ b/src/yuzu/configuration/configure_input_player.h | |||
| @@ -224,7 +224,7 @@ private: | |||
| 224 | 224 | ||
| 225 | /// Bottom row is where console wide settings are held, and its "owned" by the parent | 225 | /// Bottom row is where console wide settings are held, and its "owned" by the parent |
| 226 | /// ConfigureInput widget. On show, add this widget to the main layout. This will change the | 226 | /// ConfigureInput widget. On show, add this widget to the main layout. This will change the |
| 227 | /// parent of the widget to this widget (but thats fine). | 227 | /// parent of the widget to this widget (but that's fine). |
| 228 | QWidget* bottom_row; | 228 | QWidget* bottom_row; |
| 229 | 229 | ||
| 230 | Core::HID::HIDCore& hid_core; | 230 | Core::HID::HIDCore& hid_core; |
diff --git a/src/yuzu/configuration/configure_input_player_widget.h b/src/yuzu/configuration/configure_input_player_widget.h index 0e9e95e85..267d134de 100644 --- a/src/yuzu/configuration/configure_input_player_widget.h +++ b/src/yuzu/configuration/configure_input_player_widget.h | |||
| @@ -43,7 +43,7 @@ public: | |||
| 43 | // Handles emulated controller events | 43 | // Handles emulated controller events |
| 44 | void ControllerUpdate(Core::HID::ControllerTriggerType type); | 44 | void ControllerUpdate(Core::HID::ControllerTriggerType type); |
| 45 | 45 | ||
| 46 | // Updates input on sheduled interval | 46 | // Updates input on scheduled interval |
| 47 | void UpdateInput(); | 47 | void UpdateInput(); |
| 48 | 48 | ||
| 49 | protected: | 49 | protected: |
diff --git a/src/yuzu/loading_screen.cpp b/src/yuzu/loading_screen.cpp index e263a07a7..b081fff6b 100644 --- a/src/yuzu/loading_screen.cpp +++ b/src/yuzu/loading_screen.cpp | |||
| @@ -153,7 +153,7 @@ void LoadingScreen::OnLoadProgress(VideoCore::LoadCallbackStage stage, std::size | |||
| 153 | } | 153 | } |
| 154 | 154 | ||
| 155 | QString estimate; | 155 | QString estimate; |
| 156 | // If theres a drastic slowdown in the rate, then display an estimate | 156 | // If there's a drastic slowdown in the rate, then display an estimate |
| 157 | if (now - previous_time > milliseconds{50} || slow_shader_compile_start) { | 157 | if (now - previous_time > milliseconds{50} || slow_shader_compile_start) { |
| 158 | if (!slow_shader_compile_start) { | 158 | if (!slow_shader_compile_start) { |
| 159 | slow_shader_start = steady_clock::now(); | 159 | slow_shader_start = steady_clock::now(); |
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index c092507f4..ae14884b5 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -274,7 +274,7 @@ static QString PrettyProductName() { | |||
| 274 | 274 | ||
| 275 | #ifdef _WIN32 | 275 | #ifdef _WIN32 |
| 276 | static void OverrideWindowsFont() { | 276 | static void OverrideWindowsFont() { |
| 277 | // Qt5 chooses these fonts on Windows and they have fairly ugly alphanumeric/cyrllic characters | 277 | // Qt5 chooses these fonts on Windows and they have fairly ugly alphanumeric/cyrillic characters |
| 278 | // Asking to use "MS Shell Dlg 2" gives better other chars while leaving the Chinese Characters. | 278 | // Asking to use "MS Shell Dlg 2" gives better other chars while leaving the Chinese Characters. |
| 279 | const QString startup_font = QApplication::font().family(); | 279 | const QString startup_font = QApplication::font().family(); |
| 280 | const QStringList ugly_fonts = {QStringLiteral("SimSun"), QStringLiteral("PMingLiU")}; | 280 | const QStringList ugly_fonts = {QStringLiteral("SimSun"), QStringLiteral("PMingLiU")}; |
| @@ -3596,7 +3596,7 @@ bool GMainWindow::CreateShortcut(const std::string& shortcut_path, const std::st | |||
| 3596 | const std::string& command, const std::string& arguments, | 3596 | const std::string& command, const std::string& arguments, |
| 3597 | const std::string& categories, const std::string& keywords) { | 3597 | const std::string& categories, const std::string& keywords) { |
| 3598 | #if defined(__linux__) || defined(__FreeBSD__) | 3598 | #if defined(__linux__) || defined(__FreeBSD__) |
| 3599 | // This desktop file template was writting referencing | 3599 | // This desktop file template was writing referencing |
| 3600 | // https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-1.0.html | 3600 | // https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-1.0.html |
| 3601 | std::string shortcut_contents{}; | 3601 | std::string shortcut_contents{}; |
| 3602 | shortcut_contents.append("[Desktop Entry]\n"); | 3602 | shortcut_contents.append("[Desktop Entry]\n"); |
diff --git a/src/yuzu/multiplayer/lobby.cpp b/src/yuzu/multiplayer/lobby.cpp index 6c93e3511..387f6f7c9 100644 --- a/src/yuzu/multiplayer/lobby.cpp +++ b/src/yuzu/multiplayer/lobby.cpp | |||
| @@ -278,7 +278,7 @@ void Lobby::OnRefreshLobby() { | |||
| 278 | } | 278 | } |
| 279 | } | 279 | } |
| 280 | 280 | ||
| 281 | // Reenable the refresh button and resize the columns | 281 | // Re-enable the refresh button and resize the columns |
| 282 | ui->refresh_list->setEnabled(true); | 282 | ui->refresh_list->setEnabled(true); |
| 283 | ui->refresh_list->setText(tr("Refresh List")); | 283 | ui->refresh_list->setText(tr("Refresh List")); |
| 284 | ui->room_list->header()->stretchLastSection(); | 284 | ui->room_list->header()->stretchLastSection(); |
diff --git a/src/yuzu/multiplayer/state.cpp b/src/yuzu/multiplayer/state.cpp index 285bb150d..d82ca9aee 100644 --- a/src/yuzu/multiplayer/state.cpp +++ b/src/yuzu/multiplayer/state.cpp | |||
| @@ -112,7 +112,7 @@ void MultiplayerState::SetNotificationStatus(NotificationStatus status) { | |||
| 112 | 112 | ||
| 113 | void MultiplayerState::UpdateNotificationStatus() { | 113 | void MultiplayerState::UpdateNotificationStatus() { |
| 114 | switch (notification_status) { | 114 | switch (notification_status) { |
| 115 | case NotificationStatus::Unitialized: | 115 | case NotificationStatus::Uninitialized: |
| 116 | status_icon->setPixmap(QIcon::fromTheme(QStringLiteral("disconnected")).pixmap(16)); | 116 | status_icon->setPixmap(QIcon::fromTheme(QStringLiteral("disconnected")).pixmap(16)); |
| 117 | status_text->setText(tr("Not Connected. Click here to find a room!")); | 117 | status_text->setText(tr("Not Connected. Click here to find a room!")); |
| 118 | leave_room->setEnabled(false); | 118 | leave_room->setEnabled(false); |
diff --git a/src/yuzu/multiplayer/state.h b/src/yuzu/multiplayer/state.h index 5d681c5c6..d6149838f 100644 --- a/src/yuzu/multiplayer/state.h +++ b/src/yuzu/multiplayer/state.h | |||
| @@ -23,7 +23,7 @@ class MultiplayerState : public QWidget { | |||
| 23 | 23 | ||
| 24 | public: | 24 | public: |
| 25 | enum class NotificationStatus { | 25 | enum class NotificationStatus { |
| 26 | Unitialized, | 26 | Uninitialized, |
| 27 | Disconnected, | 27 | Disconnected, |
| 28 | Connected, | 28 | Connected, |
| 29 | Notification, | 29 | Notification, |
| @@ -98,7 +98,7 @@ private: | |||
| 98 | QAction* show_room; | 98 | QAction* show_room; |
| 99 | std::shared_ptr<Core::AnnounceMultiplayerSession> announce_multiplayer_session; | 99 | std::shared_ptr<Core::AnnounceMultiplayerSession> announce_multiplayer_session; |
| 100 | Network::RoomMember::State current_state = Network::RoomMember::State::Uninitialized; | 100 | Network::RoomMember::State current_state = Network::RoomMember::State::Uninitialized; |
| 101 | NotificationStatus notification_status = NotificationStatus::Unitialized; | 101 | NotificationStatus notification_status = NotificationStatus::Uninitialized; |
| 102 | bool has_mod_perms = false; | 102 | bool has_mod_perms = false; |
| 103 | Network::RoomMember::CallbackHandle<Network::RoomMember::State> state_callback_handle; | 103 | Network::RoomMember::CallbackHandle<Network::RoomMember::State> state_callback_handle; |
| 104 | Network::RoomMember::CallbackHandle<Network::RoomMember::Error> error_callback_handle; | 104 | Network::RoomMember::CallbackHandle<Network::RoomMember::Error> error_callback_handle; |
diff --git a/src/yuzu/startup_checks.cpp b/src/yuzu/startup_checks.cpp index 9f702fe95..5e1f76339 100644 --- a/src/yuzu/startup_checks.cpp +++ b/src/yuzu/startup_checks.cpp | |||
| @@ -86,7 +86,7 @@ bool StartupChecks(const char* arg0, bool* has_broken_vulkan, bool perform_vulka | |||
| 86 | return false; | 86 | return false; |
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | // Wait until the processs exits and get exit code from it | 89 | // Wait until the process exits and get exit code from it |
| 90 | WaitForSingleObject(process_info.hProcess, INFINITE); | 90 | WaitForSingleObject(process_info.hProcess, INFINITE); |
| 91 | DWORD exit_code = STILL_ACTIVE; | 91 | DWORD exit_code = STILL_ACTIVE; |
| 92 | const int err = GetExitCodeProcess(process_info.hProcess, &exit_code); | 92 | const int err = GetExitCodeProcess(process_info.hProcess, &exit_code); |
diff --git a/src/yuzu/util/overlay_dialog.h b/src/yuzu/util/overlay_dialog.h index 872283d61..62f9da311 100644 --- a/src/yuzu/util/overlay_dialog.h +++ b/src/yuzu/util/overlay_dialog.h | |||
| @@ -71,7 +71,7 @@ private: | |||
| 71 | const QString& left_button_text, const QString& right_button_text, | 71 | const QString& left_button_text, const QString& right_button_text, |
| 72 | Qt::Alignment alignment); | 72 | Qt::Alignment alignment); |
| 73 | 73 | ||
| 74 | /// Moves and resizes the dialog to be fully overlayed on top of the parent window. | 74 | /// Moves and resizes the dialog to be fully overlaid on top of the parent window. |
| 75 | void MoveAndResizeWindow(); | 75 | void MoveAndResizeWindow(); |
| 76 | 76 | ||
| 77 | /** | 77 | /** |