mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-30 21:30:04 +00:00 
			
		
		
		
	Fix compile errors
This commit is contained in:
		
							parent
							
								
									7a3e126a4f
								
							
						
					
					
						commit
						71e1d6e25d
					
				
					 13 changed files with 20 additions and 12 deletions
				
			
		|  | @ -2,6 +2,7 @@ | ||||||
| // Licensed under GPLv2 or any later version
 | // Licensed under GPLv2 or any later version
 | ||||||
| // Refer to the license.txt file included.
 | // Refer to the license.txt file included.
 | ||||||
| 
 | 
 | ||||||
|  | #include <algorithm> | ||||||
| #include <array> | #include <array> | ||||||
| #include <cstddef> | #include <cstddef> | ||||||
| #include <cstring> | #include <cstring> | ||||||
|  |  | ||||||
|  | @ -2,6 +2,7 @@ | ||||||
| // Licensed under GPLv2 or any later version
 | // Licensed under GPLv2 or any later version
 | ||||||
| // Refer to the license.txt file included.
 | // Refer to the license.txt file included.
 | ||||||
| 
 | 
 | ||||||
|  | #include <algorithm> | ||||||
| #include <array> | #include <array> | ||||||
| #include <cstddef> | #include <cstddef> | ||||||
| #include "audio_core/hle/common.h" | #include "audio_core/hle/common.h" | ||||||
|  |  | ||||||
|  | @ -2,8 +2,8 @@ | ||||||
| // Licensed under GPLv2 or any later version
 | // Licensed under GPLv2 or any later version
 | ||||||
| // Refer to the license.txt file included.
 | // Refer to the license.txt file included.
 | ||||||
| 
 | 
 | ||||||
|  | #include <algorithm> | ||||||
| #include <cstddef> | #include <cstddef> | ||||||
| 
 |  | ||||||
| #include "audio_core/hle/mixers.h" | #include "audio_core/hle/mixers.h" | ||||||
| #include "common/assert.h" | #include "common/assert.h" | ||||||
| #include "common/logging/log.h" | #include "common/logging/log.h" | ||||||
|  |  | ||||||
|  | @ -2,6 +2,7 @@ | ||||||
| // Licensed under GPLv2 or any later version
 | // Licensed under GPLv2 or any later version
 | ||||||
| // Refer to the license.txt file included.
 | // Refer to the license.txt file included.
 | ||||||
| 
 | 
 | ||||||
|  | #include <algorithm> | ||||||
| #include "audio_core/interpolate.h" | #include "audio_core/interpolate.h" | ||||||
| #include "common/assert.h" | #include "common/assert.h" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -2,6 +2,7 @@ | ||||||
| // Licensed under GPLv2 or any later version
 | // Licensed under GPLv2 or any later version
 | ||||||
| // Refer to the license.txt file included.
 | // Refer to the license.txt file included.
 | ||||||
| 
 | 
 | ||||||
|  | #include <algorithm> | ||||||
| #include <chrono> | #include <chrono> | ||||||
| #include <cmath> | #include <cmath> | ||||||
| #include <vector> | #include <vector> | ||||||
|  |  | ||||||
|  | @ -2,6 +2,7 @@ | ||||||
| // Licensed under GPLv2 or any later version
 | // Licensed under GPLv2 or any later version
 | ||||||
| // Refer to the license.txt file included.
 | // Refer to the license.txt file included.
 | ||||||
| 
 | 
 | ||||||
|  | #include <algorithm> | ||||||
| #include <cstring> | #include <cstring> | ||||||
| #include <QImage> | #include <QImage> | ||||||
| #include "citra_qt/camera/camera_util.h" | #include "citra_qt/camera/camera_util.h" | ||||||
|  |  | ||||||
|  | @ -2,6 +2,7 @@ | ||||||
| // Licensed under GPLv2 or any later version
 | // Licensed under GPLv2 or any later version
 | ||||||
| // Refer to the license.txt file included.
 | // Refer to the license.txt file included.
 | ||||||
| 
 | 
 | ||||||
|  | #include <algorithm> | ||||||
| #include <chrono> | #include <chrono> | ||||||
| #include <mutex> | #include <mutex> | ||||||
| #include <thread> | #include <thread> | ||||||
|  |  | ||||||
|  | @ -2,6 +2,7 @@ | ||||||
| // Licensed under GPLv2 or any later version
 | // Licensed under GPLv2 or any later version
 | ||||||
| // Refer to the license.txt file included.
 | // Refer to the license.txt file included.
 | ||||||
| 
 | 
 | ||||||
|  | #include <algorithm> | ||||||
| #include <chrono> | #include <chrono> | ||||||
| #include <mutex> | #include <mutex> | ||||||
| #include <thread> | #include <thread> | ||||||
|  | @ -45,7 +46,7 @@ public: | ||||||
|             } else { |             } else { | ||||||
|                 tilt_direction = mouse_move.Cast<float>(); |                 tilt_direction = mouse_move.Cast<float>(); | ||||||
|                 tilt_angle = std::clamp(tilt_direction.Normalize() * sensitivity, 0.0f, |                 tilt_angle = std::clamp(tilt_direction.Normalize() * sensitivity, 0.0f, | ||||||
|                                              MathUtil::PI * this->tilt_clamp / 180.0f); |                                         MathUtil::PI * this->tilt_clamp / 180.0f); | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|  | @ -2,6 +2,7 @@ | ||||||
| // Licensed under GPLv2 or any later version
 | // Licensed under GPLv2 or any later version
 | ||||||
| // Refer to the license.txt file included.
 | // Refer to the license.txt file included.
 | ||||||
| 
 | 
 | ||||||
|  | #include <algorithm> | ||||||
| #include <memory> | #include <memory> | ||||||
| #include <string> | #include <string> | ||||||
| #include <tuple> | #include <tuple> | ||||||
|  | @ -534,17 +535,17 @@ bool RasterizerOpenGL::Draw(bool accelerate, bool is_indexed) { | ||||||
| 
 | 
 | ||||||
|     MathUtil::Rectangle<u32> draw_rect{ |     MathUtil::Rectangle<u32> draw_rect{ | ||||||
|         static_cast<u32>(std::clamp<s32>(static_cast<s32>(surfaces_rect.left) + |         static_cast<u32>(std::clamp<s32>(static_cast<s32>(surfaces_rect.left) + | ||||||
|                                                   viewport_rect_unscaled.left * res_scale, |                                              viewport_rect_unscaled.left * res_scale, | ||||||
|                                               surfaces_rect.left, surfaces_rect.right)), // Left
 |                                          surfaces_rect.left, surfaces_rect.right)), // Left
 | ||||||
|         static_cast<u32>(std::clamp<s32>(static_cast<s32>(surfaces_rect.bottom) + |         static_cast<u32>(std::clamp<s32>(static_cast<s32>(surfaces_rect.bottom) + | ||||||
|                                                   viewport_rect_unscaled.top * res_scale, |                                              viewport_rect_unscaled.top * res_scale, | ||||||
|                                               surfaces_rect.bottom, surfaces_rect.top)), // Top
 |                                          surfaces_rect.bottom, surfaces_rect.top)), // Top
 | ||||||
|         static_cast<u32>(std::clamp<s32>(static_cast<s32>(surfaces_rect.left) + |         static_cast<u32>(std::clamp<s32>(static_cast<s32>(surfaces_rect.left) + | ||||||
|                                                   viewport_rect_unscaled.right * res_scale, |                                              viewport_rect_unscaled.right * res_scale, | ||||||
|                                               surfaces_rect.left, surfaces_rect.right)), // Right
 |                                          surfaces_rect.left, surfaces_rect.right)), // Right
 | ||||||
|         static_cast<u32>(std::clamp<s32>(static_cast<s32>(surfaces_rect.bottom) + |         static_cast<u32>(std::clamp<s32>(static_cast<s32>(surfaces_rect.bottom) + | ||||||
|                                                   viewport_rect_unscaled.bottom * res_scale, |                                              viewport_rect_unscaled.bottom * res_scale, | ||||||
|                                               surfaces_rect.bottom, surfaces_rect.top))}; // Bottom
 |                                          surfaces_rect.bottom, surfaces_rect.top))}; // Bottom
 | ||||||
| 
 | 
 | ||||||
|     // Bind the framebuffer surfaces
 |     // Bind the framebuffer surfaces
 | ||||||
|     state.draw.draw_framebuffer = framebuffer.handle; |     state.draw.draw_framebuffer = framebuffer.handle; | ||||||
|  |  | ||||||
|  | @ -3,7 +3,6 @@ | ||||||
| // Refer to the license.txt file included.
 | // Refer to the license.txt file included.
 | ||||||
| 
 | 
 | ||||||
| #include <algorithm> | #include <algorithm> | ||||||
| 
 |  | ||||||
| #include "common/assert.h" | #include "common/assert.h" | ||||||
| #include "common/color.h" | #include "common/color.h" | ||||||
| #include "common/common_types.h" | #include "common/common_types.h" | ||||||
|  |  | ||||||
|  | @ -2,6 +2,7 @@ | ||||||
| // Licensed under GPLv2 or any later version
 | // Licensed under GPLv2 or any later version
 | ||||||
| // Refer to the license.txt file included.
 | // Refer to the license.txt file included.
 | ||||||
| 
 | 
 | ||||||
|  | #include <algorithm> | ||||||
| #include "video_core/swrasterizer/lighting.h" | #include "video_core/swrasterizer/lighting.h" | ||||||
| 
 | 
 | ||||||
| namespace Pica { | namespace Pica { | ||||||
|  |  | ||||||
|  | @ -3,7 +3,6 @@ | ||||||
| // Refer to the license.txt file included.
 | // Refer to the license.txt file included.
 | ||||||
| 
 | 
 | ||||||
| #include <algorithm> | #include <algorithm> | ||||||
| 
 |  | ||||||
| #include "common/assert.h" | #include "common/assert.h" | ||||||
| #include "common/common_types.h" | #include "common/common_types.h" | ||||||
| #include "common/vector_math.h" | #include "common/vector_math.h" | ||||||
|  |  | ||||||
|  | @ -2,6 +2,7 @@ | ||||||
| // Licensed under GPLv2 or any later version
 | // Licensed under GPLv2 or any later version
 | ||||||
| // Refer to the license.txt file included.
 | // Refer to the license.txt file included.
 | ||||||
| 
 | 
 | ||||||
|  | #include <algorithm> | ||||||
| #include <array> | #include <array> | ||||||
| #include "common/bit_field.h" | #include "common/bit_field.h" | ||||||
| #include "common/color.h" | #include "common/color.h" | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue