diff options
| author | 2014-11-19 09:02:05 +0000 | |
|---|---|---|
| committer | 2014-11-19 09:04:03 +0000 | |
| commit | 739bb58c3a92ba94baeaa2156dc72fb7ff0ce8b7 (patch) | |
| tree | c3c44671c32434b4678f502ae06edf5f71157327 /src/video_core | |
| parent | Remove trailing spaces in every file but the ones imported from SkyEye, AOSP ... (diff) | |
| download | yuzu-739bb58c3a92ba94baeaa2156dc72fb7ff0ce8b7.tar.gz yuzu-739bb58c3a92ba94baeaa2156dc72fb7ff0ce8b7.tar.xz yuzu-739bb58c3a92ba94baeaa2156dc72fb7ff0ce8b7.zip | |
Remove tabs in all files except in skyeye imports and in generated GL code
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/debug_utils/debug_utils.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/debug_utils/debug_utils.h | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/utils.h | 20 |
4 files changed, 14 insertions, 14 deletions
diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp index 22b8e9950..275b06b7c 100644 --- a/src/video_core/debug_utils/debug_utils.cpp +++ b/src/video_core/debug_utils/debug_utils.cpp | |||
| @@ -318,9 +318,9 @@ void DumpTexture(const Pica::Regs::TextureConfig& texture_config, u8* data) { | |||
| 318 | return; | 318 | return; |
| 319 | 319 | ||
| 320 | #ifndef HAVE_PNG | 320 | #ifndef HAVE_PNG |
| 321 | return; | 321 | return; |
| 322 | #else | 322 | #else |
| 323 | if (!data) | 323 | if (!data) |
| 324 | return; | 324 | return; |
| 325 | 325 | ||
| 326 | // Write data to file | 326 | // Write data to file |
diff --git a/src/video_core/debug_utils/debug_utils.h b/src/video_core/debug_utils/debug_utils.h index 8b1499bf2..b1558cfae 100644 --- a/src/video_core/debug_utils/debug_utils.h +++ b/src/video_core/debug_utils/debug_utils.h | |||
| @@ -41,7 +41,7 @@ void DumpShader(const u32* binary_data, u32 binary_size, const u32* swizzle_data | |||
| 41 | // Utility class to log Pica commands. | 41 | // Utility class to log Pica commands. |
| 42 | struct PicaTrace { | 42 | struct PicaTrace { |
| 43 | struct Write : public std::pair<u32,u32> { | 43 | struct Write : public std::pair<u32,u32> { |
| 44 | Write(u32 id, u32 value) : std::pair<u32,u32>(id, value) {} | 44 | Write(u32 id, u32 value) : std::pair<u32,u32>(id, value) {} |
| 45 | 45 | ||
| 46 | u32& Id() { return first; } | 46 | u32& Id() { return first; } |
| 47 | const u32& Id() const { return first; } | 47 | const u32& Id() const { return first; } |
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 729e8e73d..abbb4c2cb 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp | |||
| @@ -239,7 +239,7 @@ MathUtil::Rectangle<unsigned> RendererOpenGL::GetViewportExtent() { | |||
| 239 | 239 | ||
| 240 | MathUtil::Rectangle<unsigned> viewport_extent; | 240 | MathUtil::Rectangle<unsigned> viewport_extent; |
| 241 | if (window_aspect_ratio > emulation_aspect_ratio) { | 241 | if (window_aspect_ratio > emulation_aspect_ratio) { |
| 242 | // Window is narrower than the emulation content => apply borders to the top and bottom | 242 | // Window is narrower than the emulation content => apply borders to the top and bottom |
| 243 | unsigned viewport_height = emulation_aspect_ratio * framebuffer_width; | 243 | unsigned viewport_height = emulation_aspect_ratio * framebuffer_width; |
| 244 | viewport_extent.left = 0; | 244 | viewport_extent.left = 0; |
| 245 | viewport_extent.top = (framebuffer_height - viewport_height) / 2; | 245 | viewport_extent.top = (framebuffer_height - viewport_height) / 2; |
diff --git a/src/video_core/utils.h b/src/video_core/utils.h index 9cb3d4d43..21380a908 100644 --- a/src/video_core/utils.h +++ b/src/video_core/utils.h | |||
| @@ -12,24 +12,24 @@ namespace FormatPrecision { | |||
| 12 | 12 | ||
| 13 | /// Adjust RGBA8 color with RGBA6 precision | 13 | /// Adjust RGBA8 color with RGBA6 precision |
| 14 | static inline u32 rgba8_with_rgba6(u32 src) { | 14 | static inline u32 rgba8_with_rgba6(u32 src) { |
| 15 | u32 color = src; | 15 | u32 color = src; |
| 16 | color &= 0xFCFCFCFC; | 16 | color &= 0xFCFCFCFC; |
| 17 | color |= (color >> 6) & 0x03030303; | 17 | color |= (color >> 6) & 0x03030303; |
| 18 | return color; | 18 | return color; |
| 19 | } | 19 | } |
| 20 | 20 | ||
| 21 | /// Adjust RGBA8 color with RGB565 precision | 21 | /// Adjust RGBA8 color with RGB565 precision |
| 22 | static inline u32 rgba8_with_rgb565(u32 src) { | 22 | static inline u32 rgba8_with_rgb565(u32 src) { |
| 23 | u32 color = (src & 0xF8FCF8); | 23 | u32 color = (src & 0xF8FCF8); |
| 24 | color |= (color >> 5) & 0x070007; | 24 | color |= (color >> 5) & 0x070007; |
| 25 | color |= (color >> 6) & 0x000300; | 25 | color |= (color >> 6) & 0x000300; |
| 26 | color |= 0xFF000000; | 26 | color |= 0xFF000000; |
| 27 | return color; | 27 | return color; |
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | /// Adjust Z24 depth value with Z16 precision | 30 | /// Adjust Z24 depth value with Z16 precision |
| 31 | static inline u32 z24_with_z16(u32 src) { | 31 | static inline u32 z24_with_z16(u32 src) { |
| 32 | return (src & 0xFFFF00) | (src >> 16); | 32 | return (src & 0xFFFF00) | (src >> 16); |
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | } // namespace | 35 | } // namespace |