Merge pull request #211 from linkmauve/master

Remove trailing spaces from the entire project

6 files changed, 17 insertions, 17 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) {
     return;
 
 #ifndef HAVE_PNG
-        return;
+    return;
 #else
-        if (!data)
+    if (!data)
         return;
 
     // 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
 // Utility class to log Pica commands.
 struct PicaTrace {
     struct Write : public std::pair<u32,u32> {
-                Write(u32 id, u32 value) : std::pair<u32,u32>(id, value) {}
+        Write(u32 id, u32 value) : std::pair<u32,u32>(id, value) {}
 
         u32& Id() { return first; }
         const u32& Id() const { return first; }
diff --git a/src/video_core/renderer_base.h b/src/video_core/renderer_base.h
index f1dbc9d17..bce402b88 100644
--- a/src/video_core/renderer_base.h
+++ b/src/video_core/renderer_base.h
@@ -25,7 +25,7 @@ public:
     /// Swap buffers (render frame)
     virtual void SwapBuffers() = 0;
 
-    /** 
+    /**
      * Set the emulator window to use for renderer
      * @param window EmuWindow handle to emulator window to use for rendering
      */
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() {
 
     MathUtil::Rectangle<unsigned> viewport_extent;
     if (window_aspect_ratio > emulation_aspect_ratio) {
-                // Window is narrower than the emulation content => apply borders to the top and bottom
+        // Window is narrower than the emulation content => apply borders to the top and bottom
         unsigned viewport_height = emulation_aspect_ratio * framebuffer_width;
         viewport_extent.left = 0;
         viewport_extent.top = (framebuffer_height - viewport_height) / 2;
diff --git a/src/video_core/utils.cpp b/src/video_core/utils.cpp
index c1848f923..f1156a493 100644
--- a/src/video_core/utils.cpp
+++ b/src/video_core/utils.cpp
@@ -20,7 +20,7 @@ namespace VideoCore {
 void DumpTGA(std::string filename, short width, short height, u8* raw_data) {
     TGAHeader hdr = {0, 0, 2, 0, 0, 0, 0, width, height, 24, 0};
     FILE* fout = fopen(filename.c_str(), "wb");
-    
+
     fwrite(&hdr, sizeof(TGAHeader), 1, fout);
 
     for (int y = 0; y < height; y++) {
@@ -30,7 +30,7 @@ void DumpTGA(std::string filename, short width, short height, u8* raw_data) {
             putc(raw_data[(3 * (y * width)) + (3 * x) + 2], fout); // r
         }
     }
-    
+
     fclose(fout);
 }
 } // namespace
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 {
 
 /// Adjust RGBA8 color with RGBA6 precision
 static inline u32 rgba8_with_rgba6(u32 src) {
-        u32 color = src;
-        color &= 0xFCFCFCFC;
-        color |= (color >> 6) & 0x03030303;
-        return color;
+    u32 color = src;
+    color &= 0xFCFCFCFC;
+    color |= (color >> 6) & 0x03030303;
+    return color;
 }
 
 /// Adjust RGBA8 color with RGB565 precision
 static inline u32 rgba8_with_rgb565(u32 src) {
-        u32 color = (src & 0xF8FCF8);
-        color |= (color >> 5) & 0x070007;
-        color |= (color >> 6) & 0x000300;
-        color |= 0xFF000000;
-        return color;
+    u32 color = (src & 0xF8FCF8);
+    color |= (color >> 5) & 0x070007;
+    color |= (color >> 6) & 0x000300;
+    color |= 0xFF000000;
+    return color;
 }
 
 /// Adjust Z24 depth value with Z16 precision
 static inline u32 z24_with_z16(u32 src) {
-        return (src & 0xFFFF00) | (src >> 16);
+    return (src & 0xFFFF00) | (src >> 16);
 }
 
 } // namespace