summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/Software
diff options
context:
space:
mode:
authorlioncash <mathew1800@gmail.com>2014-02-10 13:54:46 -0500
committerLioncash <mathew1800@gmail.com>2014-02-10 18:07:16 -0500
commitd2038049f51192fbb55fbde2fc08128bacfb7707 (patch)
tree2f352e13e3d5868db072f1e75d611a90e938d0cf /Source/Core/VideoBackends/Software
parenta0a65a2906af132f6da04cf552812aac6ac5f20a (diff)
Replace all include guard ifdefs with "#pragma once"
Diffstat (limited to 'Source/Core/VideoBackends/Software')
-rw-r--r--Source/Core/VideoBackends/Software/BPMemLoader.h5
-rw-r--r--Source/Core/VideoBackends/Software/CPMemLoader.h6
-rw-r--r--Source/Core/VideoBackends/Software/Clipper.h7
-rw-r--r--Source/Core/VideoBackends/Software/DebugUtil.h5
-rw-r--r--Source/Core/VideoBackends/Software/EfbCopy.h7
-rw-r--r--Source/Core/VideoBackends/Software/EfbInterface.h5
-rw-r--r--Source/Core/VideoBackends/Software/HwRasterizer.h5
-rw-r--r--Source/Core/VideoBackends/Software/NativeVertexFormat.h5
-rw-r--r--Source/Core/VideoBackends/Software/OpcodeDecoder.h5
-rw-r--r--Source/Core/VideoBackends/Software/RasterFont.h5
-rw-r--r--Source/Core/VideoBackends/Software/Rasterizer.h5
-rw-r--r--Source/Core/VideoBackends/Software/SWCommandProcessor.h6
-rw-r--r--Source/Core/VideoBackends/Software/SWPixelEngine.h5
-rw-r--r--Source/Core/VideoBackends/Software/SWRenderer.h5
-rw-r--r--Source/Core/VideoBackends/Software/SWStatistics.h5
-rw-r--r--Source/Core/VideoBackends/Software/SWVertexLoader.h5
-rw-r--r--Source/Core/VideoBackends/Software/SWVideoConfig.h5
-rw-r--r--Source/Core/VideoBackends/Software/SetupUnit.h6
-rw-r--r--Source/Core/VideoBackends/Software/Tev.h5
-rw-r--r--Source/Core/VideoBackends/Software/TextureEncoder.h5
-rw-r--r--Source/Core/VideoBackends/Software/TextureSampler.h7
-rw-r--r--Source/Core/VideoBackends/Software/TransformUnit.h5
-rw-r--r--Source/Core/VideoBackends/Software/Vec3.h5
-rw-r--r--Source/Core/VideoBackends/Software/VideoBackend.h6
-rw-r--r--Source/Core/VideoBackends/Software/VideoConfigDialog.h5
-rw-r--r--Source/Core/VideoBackends/Software/XFMemLoader.h6
26 files changed, 26 insertions, 115 deletions
diff --git a/Source/Core/VideoBackends/Software/BPMemLoader.h b/Source/Core/VideoBackends/Software/BPMemLoader.h
index 0ef122ec24..6ea09293cf 100644
--- a/Source/Core/VideoBackends/Software/BPMemLoader.h
+++ b/Source/Core/VideoBackends/Software/BPMemLoader.h
@@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#ifndef _BPMEMLOADER_H_
-#define _BPMEMLOADER_H_
+#pragma once
#include "Common.h"
@@ -12,5 +11,3 @@
void InitBPMemory();
void SWBPWritten(int address, int newvalue);
void SWLoadBPReg(u32 value);
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/CPMemLoader.h b/Source/Core/VideoBackends/Software/CPMemLoader.h
index 5bbb2969ea..a08fac2a73 100644
--- a/Source/Core/VideoBackends/Software/CPMemLoader.h
+++ b/Source/Core/VideoBackends/Software/CPMemLoader.h
@@ -2,13 +2,9 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#ifndef _CPMEMLOADER_H_
-#define _CPMEMLOADER_H_
-
+#pragma once
#include "Common.h"
#include "CPMemory.h"
void SWLoadCPReg(u32 sub_cmd, u32 value);
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/Clipper.h b/Source/Core/VideoBackends/Software/Clipper.h
index f28db764c1..acf32b32ff 100644
--- a/Source/Core/VideoBackends/Software/Clipper.h
+++ b/Source/Core/VideoBackends/Software/Clipper.h
@@ -2,9 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#ifndef _CLIPPER_H_
-#define _CLIPPER_H_
-
+#pragma once
#include "Common.h"
#include "NativeVertexFormat.h"
@@ -27,6 +25,3 @@ namespace Clipper
void DoState(PointerWrap &p);
}
-
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/DebugUtil.h b/Source/Core/VideoBackends/Software/DebugUtil.h
index 7d5ac4beea..ba2d7dd1c9 100644
--- a/Source/Core/VideoBackends/Software/DebugUtil.h
+++ b/Source/Core/VideoBackends/Software/DebugUtil.h
@@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#ifndef _DEBUGUTIL_H
-#define _DEBUGUTIL_H
+#pragma once
namespace DebugUtil
{
@@ -23,5 +22,3 @@ namespace DebugUtil
void DrawTempBuffer(u8 *color, int buffer);
void CopyTempBuffer(s16 x, s16 y, int bufferBase, int subBuffer, const char *name);
}
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/EfbCopy.h b/Source/Core/VideoBackends/Software/EfbCopy.h
index c2352eab34..3a8d7d7ad6 100644
--- a/Source/Core/VideoBackends/Software/EfbCopy.h
+++ b/Source/Core/VideoBackends/Software/EfbCopy.h
@@ -2,9 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#ifndef _EFB_COPY_H_
-#define _EFB_COPY_H_
-
+#pragma once
#include "Common.h"
@@ -14,6 +12,3 @@ namespace EfbCopy
// Clear the EFB if needed
void CopyEfb();
}
-
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/EfbInterface.h b/Source/Core/VideoBackends/Software/EfbInterface.h
index b00a06239e..59ef834a03 100644
--- a/Source/Core/VideoBackends/Software/EfbInterface.h
+++ b/Source/Core/VideoBackends/Software/EfbInterface.h
@@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#ifndef _EFB_INTERFACE_H_
-#define _EFB_INTERFACE_H_
+#pragma once
#include "VideoCommon.h"
@@ -53,5 +52,3 @@ namespace EfbInterface
void DoState(PointerWrap &p);
}
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/HwRasterizer.h b/Source/Core/VideoBackends/Software/HwRasterizer.h
index 5a439c4333..f9c5810389 100644
--- a/Source/Core/VideoBackends/Software/HwRasterizer.h
+++ b/Source/Core/VideoBackends/Software/HwRasterizer.h
@@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#ifndef _HW_RASTERIZER_H
-#define _HW_RASTERIZER_H
+#pragma once
#include <map>
@@ -46,5 +45,3 @@ namespace HwRasterizer
typedef std::map<u32, TexCacheEntry> TextureCache;
static TextureCache textures;
}
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/NativeVertexFormat.h b/Source/Core/VideoBackends/Software/NativeVertexFormat.h
index 9f9610910a..a6e22f9850 100644
--- a/Source/Core/VideoBackends/Software/NativeVertexFormat.h
+++ b/Source/Core/VideoBackends/Software/NativeVertexFormat.h
@@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#ifndef _NATIVEVERTEXFORMAT_H
-#define _NATIVEVERTEXFORMAT_H
+#pragma once
#include "Vec3.h"
#include "ChunkFile.h"
@@ -93,5 +92,3 @@ struct OutputVertexData
}
};
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/OpcodeDecoder.h b/Source/Core/VideoBackends/Software/OpcodeDecoder.h
index 20b7fe6be2..4ba83507de 100644
--- a/Source/Core/VideoBackends/Software/OpcodeDecoder.h
+++ b/Source/Core/VideoBackends/Software/OpcodeDecoder.h
@@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#ifndef _OPCODEDECODER_H_
-#define _OPCODEDECODER_H_
+#pragma once
#include "CommonTypes.h"
#include "ChunkFile.h"
@@ -47,5 +46,3 @@ namespace OpcodeDecoder
void DoState(PointerWrap &p);
}
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/RasterFont.h b/Source/Core/VideoBackends/Software/RasterFont.h
index 00cf9eb3fb..009b5aecc7 100644
--- a/Source/Core/VideoBackends/Software/RasterFont.h
+++ b/Source/Core/VideoBackends/Software/RasterFont.h
@@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#ifndef _RASTERFONT_H_
-#define _RASTERFONT_H_
+#pragma once
class RasterFont
{
@@ -26,5 +25,3 @@ private:
char *temp_buffer;
enum {TEMP_BUFFER_SIZE = 64 * 1024};
};
-
-#endif // _RASTERFONT_H_
diff --git a/Source/Core/VideoBackends/Software/Rasterizer.h b/Source/Core/VideoBackends/Software/Rasterizer.h
index 3f61fcaefe..a4599145b0 100644
--- a/Source/Core/VideoBackends/Software/Rasterizer.h
+++ b/Source/Core/VideoBackends/Software/Rasterizer.h
@@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#ifndef _RASTERIZER_H_
-#define _RASTERIZER_H_
+#pragma once
#include "NativeVertexFormat.h"
#include "ChunkFile.h"
@@ -50,5 +49,3 @@ namespace Rasterizer
void DoState(PointerWrap &p);
}
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/SWCommandProcessor.h b/Source/Core/VideoBackends/Software/SWCommandProcessor.h
index 8273af2f31..043ff85d0e 100644
--- a/Source/Core/VideoBackends/Software/SWCommandProcessor.h
+++ b/Source/Core/VideoBackends/Software/SWCommandProcessor.h
@@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#ifndef _COMMANDPROCESSOR_H_
-#define _COMMANDPROCESSOR_H_
+#pragma once
#include "Common.h"
@@ -141,6 +140,3 @@ namespace SWCommandProcessor
void SetRendering(bool enabled);
} // end of namespace SWCommandProcessor
-
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/SWPixelEngine.h b/Source/Core/VideoBackends/Software/SWPixelEngine.h
index 4a6c6ec2aa..5e4018a03c 100644
--- a/Source/Core/VideoBackends/Software/SWPixelEngine.h
+++ b/Source/Core/VideoBackends/Software/SWPixelEngine.h
@@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#ifndef _PIXELENGINE_H
-#define _PIXELENGINE_H
+#pragma once
#include "Common.h"
#include "VideoCommon.h"
@@ -214,5 +213,3 @@ namespace SWPixelEngine
bool AllowIdleSkipping();
} // end of namespace SWPixelEngine
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/SWRenderer.h b/Source/Core/VideoBackends/Software/SWRenderer.h
index 35770bf364..97b65566dd 100644
--- a/Source/Core/VideoBackends/Software/SWRenderer.h
+++ b/Source/Core/VideoBackends/Software/SWRenderer.h
@@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#ifndef _RENDERER_H_
-#define _RENDERER_H_
+#pragma once
#include "CommonTypes.h"
#include "EfbInterface.h"
@@ -27,5 +26,3 @@ namespace SWRenderer
void Swap(u32 fbWidth, u32 fbHeight);
void SwapBuffer();
}
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/SWStatistics.h b/Source/Core/VideoBackends/Software/SWStatistics.h
index d6d889337f..b77953f06f 100644
--- a/Source/Core/VideoBackends/Software/SWStatistics.h
+++ b/Source/Core/VideoBackends/Software/SWStatistics.h
@@ -5,8 +5,7 @@
#include "CommonTypes.h"
#include "SWVideoConfig.h"
-#ifndef _STATISTICS_H
-#define _STATISTICS_H
+#pragma once
struct SWStatistics
{
@@ -46,5 +45,3 @@ extern SWStatistics swstats;
#define ADDSTAT(a,b) ;
#define SETSTAT(a,x) ;
#endif
-
-#endif // _STATISTICS_H
diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.h b/Source/Core/VideoBackends/Software/SWVertexLoader.h
index 5008e7aeb2..0b6a023bff 100644
--- a/Source/Core/VideoBackends/Software/SWVertexLoader.h
+++ b/Source/Core/VideoBackends/Software/SWVertexLoader.h
@@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#ifndef _VERTEXLOADER_H_
-#define _VERTEXLOADER_H_
+#pragma once
#include "Common.h"
@@ -59,5 +58,3 @@ public:
void LoadVertex();
void DoState(PointerWrap &p);
};
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/SWVideoConfig.h b/Source/Core/VideoBackends/Software/SWVideoConfig.h
index 1e02feb2ed..0de5b93998 100644
--- a/Source/Core/VideoBackends/Software/SWVideoConfig.h
+++ b/Source/Core/VideoBackends/Software/SWVideoConfig.h
@@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#ifndef _VIDEOSOFTWARE_CONFIG_H_
-#define _VIDEOSOFTWARE_CONFIG_H_
+#pragma once
#include "Common.h"
@@ -43,5 +42,3 @@ struct SWVideoConfig : NonCopyable
};
extern SWVideoConfig g_SWVideoConfig;
-
-#endif // _VIDEOSOFTWARE_CONFIG_H_
diff --git a/Source/Core/VideoBackends/Software/SetupUnit.h b/Source/Core/VideoBackends/Software/SetupUnit.h
index bd4d0291c9..37e5017581 100644
--- a/Source/Core/VideoBackends/Software/SetupUnit.h
+++ b/Source/Core/VideoBackends/Software/SetupUnit.h
@@ -2,9 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-
-#ifndef _SETUPUNIT_H_
-#define _SETUPUNIT_H_
+#pragma once
#include "Common.h"
#include "NativeVertexFormat.h"
@@ -35,5 +33,3 @@ public:
void SetupVertex();
void DoState(PointerWrap &p);
};
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/Tev.h b/Source/Core/VideoBackends/Software/Tev.h
index e86768ac0b..0642778e0b 100644
--- a/Source/Core/VideoBackends/Software/Tev.h
+++ b/Source/Core/VideoBackends/Software/Tev.h
@@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#ifndef _TEV_H_
-#define _TEV_H_
+#pragma once
#include "BPMemLoader.h"
#include "ChunkFile.h"
@@ -87,5 +86,3 @@ public:
void DoState(PointerWrap &p);
};
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/TextureEncoder.h b/Source/Core/VideoBackends/Software/TextureEncoder.h
index 841590cbba..c675f1fca6 100644
--- a/Source/Core/VideoBackends/Software/TextureEncoder.h
+++ b/Source/Core/VideoBackends/Software/TextureEncoder.h
@@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#ifndef _TEXTUREENCODER_H_
-#define _TEXTUREENCODER_H_
+#pragma once
#include "Common.h"
@@ -11,5 +10,3 @@ namespace TextureEncoder
{
void Encode(u8 *dest_ptr);
}
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/TextureSampler.h b/Source/Core/VideoBackends/Software/TextureSampler.h
index 28a2aa84d9..6cd13537bf 100644
--- a/Source/Core/VideoBackends/Software/TextureSampler.h
+++ b/Source/Core/VideoBackends/Software/TextureSampler.h
@@ -2,9 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#ifndef _TEXTURESAMPLER_H_
-#define _TEXTURESAMPLER_H_
-
+#pragma once
#include "Common.h"
@@ -16,6 +14,3 @@ namespace TextureSampler
enum { RED_SMP, GRN_SMP, BLU_SMP, ALP_SMP };
}
-
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/TransformUnit.h b/Source/Core/VideoBackends/Software/TransformUnit.h
index 974e44372d..f231567982 100644
--- a/Source/Core/VideoBackends/Software/TransformUnit.h
+++ b/Source/Core/VideoBackends/Software/TransformUnit.h
@@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#ifndef _TRANSFORM_UNIT_H_
-#define _TRANSFORM_UNIT_H_
+#pragma once
struct InputVertexData;
struct OutputVertexData;
@@ -20,5 +19,3 @@ namespace TransformUnit
void TransformColor(const InputVertexData *src, OutputVertexData *dst);
void TransformTexCoord(const InputVertexData *src, OutputVertexData *dst, bool specialCase);
}
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/Vec3.h b/Source/Core/VideoBackends/Software/Vec3.h
index 117a6f4197..08f8877e2b 100644
--- a/Source/Core/VideoBackends/Software/Vec3.h
+++ b/Source/Core/VideoBackends/Software/Vec3.h
@@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#ifndef _VEC3_H
-#define _VEC3_H
+#pragma once
#include <stdlib.h>
#include <math.h>
@@ -106,5 +105,3 @@ public:
p.Do(z);
}
};
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/VideoBackend.h b/Source/Core/VideoBackends/Software/VideoBackend.h
index 4d85c637f0..cf955bfeed 100644
--- a/Source/Core/VideoBackends/Software/VideoBackend.h
+++ b/Source/Core/VideoBackends/Software/VideoBackend.h
@@ -1,6 +1,4 @@
-
-#ifndef SW_VIDEO_BACKEND_H_
-#define SW_VIDEO_BACKEND_H_
+#pragma once
#include "VideoBackendBase.h"
@@ -63,5 +61,3 @@ public:
};
}
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/VideoConfigDialog.h b/Source/Core/VideoBackends/Software/VideoConfigDialog.h
index a4ebedae62..e0884dd79f 100644
--- a/Source/Core/VideoBackends/Software/VideoConfigDialog.h
+++ b/Source/Core/VideoBackends/Software/VideoConfigDialog.h
@@ -2,8 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#ifndef _VIDEOSOFTWARE_CONFIG_DIAG_H_
-#define _VIDEOSOFTWARE_CONFIG_DIAG_H_
+#pragma once
#include <vector>
#include <string>
@@ -48,5 +47,3 @@ protected:
SWVideoConfig& vconfig;
std::string ininame;
};
-
-#endif
diff --git a/Source/Core/VideoBackends/Software/XFMemLoader.h b/Source/Core/VideoBackends/Software/XFMemLoader.h
index ff6c7267dd..d790c98cd6 100644
--- a/Source/Core/VideoBackends/Software/XFMemLoader.h
+++ b/Source/Core/VideoBackends/Software/XFMemLoader.h
@@ -2,9 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#ifndef _XFMEMLOADER_H_
-#define _XFMEMLOADER_H_
-
+#pragma once
#include "Common.h"
@@ -241,5 +239,3 @@ void XFWritten(u32 transferSize, u32 baseAddress);
void SWLoadXFReg(u32 transferSize, u32 baseAddress, u32 *pData);
void SWLoadIndexedXF(u32 val, int array);
-
-#endif