diff options
| author | lioncash <mathew1800@gmail.com> | 2014-02-10 13:54:46 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-02-10 18:07:16 -0500 |
| commit | d2038049f51192fbb55fbde2fc08128bacfb7707 (patch) | |
| tree | 2f352e13e3d5868db072f1e75d611a90e938d0cf /Source/Core/VideoBackends | |
| parent | a0a65a2906af132f6da04cf552812aac6ac5f20a (diff) | |
Replace all include guard ifdefs with "#pragma once"
Diffstat (limited to 'Source/Core/VideoBackends')
55 files changed, 59 insertions, 236 deletions
diff --git a/Source/Core/VideoBackends/D3D/FramebufferManager.h b/Source/Core/VideoBackends/D3D/FramebufferManager.h index 8327b0369c..c55ec3c696 100644 --- a/Source/Core/VideoBackends/D3D/FramebufferManager.h +++ b/Source/Core/VideoBackends/D3D/FramebufferManager.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _FBMANAGER_D3D_H_ -#define _FBMANAGER_D3D_H_ +#pragma once #include "d3d11.h" @@ -105,5 +104,3 @@ private: }; } // namespace DX11 - -#endif diff --git a/Source/Core/VideoBackends/D3D/Globals.h b/Source/Core/VideoBackends/D3D/Globals.h index 89800694e8..5717baee93 100644 --- a/Source/Core/VideoBackends/D3D/Globals.h +++ b/Source/Core/VideoBackends/D3D/Globals.h @@ -2,13 +2,10 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _GLOBALS_H_ -#define _GLOBALS_H_ +#pragma once #include "Common.h" #include "VideoConfig.h" #include "main.h" #include "VideoCommon.h" - -#endif // _GLOBALS_H_
\ No newline at end of file diff --git a/Source/Core/VideoBackends/D3D/LineGeometryShader.h b/Source/Core/VideoBackends/D3D/LineGeometryShader.h index a92e7983fc..987016fe9d 100644 --- a/Source/Core/VideoBackends/D3D/LineGeometryShader.h +++ b/Source/Core/VideoBackends/D3D/LineGeometryShader.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _LINEGEOMETRYSHADER_H -#define _LINEGEOMETRYSHADER_H +#pragma once #include "VideoCommon.h" @@ -41,5 +40,3 @@ private: }; } - -#endif diff --git a/Source/Core/VideoBackends/D3D/PSTextureEncoder.h b/Source/Core/VideoBackends/D3D/PSTextureEncoder.h index ff33e22c0a..48832535e6 100644 --- a/Source/Core/VideoBackends/D3D/PSTextureEncoder.h +++ b/Source/Core/VideoBackends/D3D/PSTextureEncoder.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _PSTEXTUREENCODER_H -#define _PSTEXTUREENCODER_H +#pragma once #include "TextureEncoder.h" @@ -102,5 +101,3 @@ private: }; } - -#endif diff --git a/Source/Core/VideoBackends/D3D/PerfQuery.h b/Source/Core/VideoBackends/D3D/PerfQuery.h index b3709d1013..e9c526b6c2 100644 --- a/Source/Core/VideoBackends/D3D/PerfQuery.h +++ b/Source/Core/VideoBackends/D3D/PerfQuery.h @@ -1,5 +1,4 @@ -#ifndef _PERFQUERY_H_ -#define _PERFQUERY_H_ +#pragma once #include "PerfQueryBase.h" @@ -42,5 +41,3 @@ private: }; } // namespace - -#endif // _PERFQUERY_H_ diff --git a/Source/Core/VideoBackends/D3D/PointGeometryShader.h b/Source/Core/VideoBackends/D3D/PointGeometryShader.h index 4fc59801c7..1b1c5812c1 100644 --- a/Source/Core/VideoBackends/D3D/PointGeometryShader.h +++ b/Source/Core/VideoBackends/D3D/PointGeometryShader.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _POINTGEOMETRYSHADER_H -#define _POINTGEOMETRYSHADER_H +#pragma once #include "VideoCommon.h" @@ -41,5 +40,3 @@ private: }; } - -#endif diff --git a/Source/Core/VideoBackends/D3D/Render.h b/Source/Core/VideoBackends/D3D/Render.h index 12e5b595d3..f391e4b47d 100644 --- a/Source/Core/VideoBackends/D3D/Render.h +++ b/Source/Core/VideoBackends/D3D/Render.h @@ -1,6 +1,4 @@ - -#ifndef _RENDER_H_ -#define _RENDER_H_ +#pragma once #include "RenderBase.h" @@ -54,5 +52,3 @@ public: }; } - -#endif diff --git a/Source/Core/VideoBackends/D3D/Television.h b/Source/Core/VideoBackends/D3D/Television.h index a33ae7112d..e6f0c42f84 100644 --- a/Source/Core/VideoBackends/D3D/Television.h +++ b/Source/Core/VideoBackends/D3D/Television.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _TELEVISION_H -#define _TELEVISION_H +#pragma once #include "VideoCommon.h" @@ -50,5 +49,3 @@ private: }; } - -#endif diff --git a/Source/Core/VideoBackends/D3D/TextureEncoder.h b/Source/Core/VideoBackends/D3D/TextureEncoder.h index d97434d380..d43f4cefeb 100644 --- a/Source/Core/VideoBackends/D3D/TextureEncoder.h +++ b/Source/Core/VideoBackends/D3D/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 "VideoCommon.h" @@ -118,5 +117,3 @@ public: }; } - -#endif diff --git a/Source/Core/VideoBackends/D3D/VertexManager.h b/Source/Core/VideoBackends/D3D/VertexManager.h index 644d13ae3f..db8be6de62 100644 --- a/Source/Core/VideoBackends/D3D/VertexManager.h +++ b/Source/Core/VideoBackends/D3D/VertexManager.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _VERTEXMANAGER_H -#define _VERTEXMANAGER_H +#pragma once #include "VertexManagerBase.h" #include "LineGeometryShader.h" @@ -51,5 +50,3 @@ private: }; } // namespace - -#endif diff --git a/Source/Core/VideoBackends/D3D/VertexShaderCache.h b/Source/Core/VideoBackends/D3D/VertexShaderCache.h index 5fe81a11d5..8b28790157 100644 --- a/Source/Core/VideoBackends/D3D/VertexShaderCache.h +++ b/Source/Core/VideoBackends/D3D/VertexShaderCache.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _VERTEXSHADERCACHE_H -#define _VERTEXSHADERCACHE_H +#pragma once #include "VertexShaderGen.h" @@ -64,5 +63,3 @@ private: }; } // namespace DX11 - -#endif // _VERTEXSHADERCACHE_H diff --git a/Source/Core/VideoBackends/D3D/VideoBackend.h b/Source/Core/VideoBackends/D3D/VideoBackend.h index f714dbe05a..15224c478b 100644 --- a/Source/Core/VideoBackends/D3D/VideoBackend.h +++ b/Source/Core/VideoBackends/D3D/VideoBackend.h @@ -1,6 +1,4 @@ - -#ifndef DX11_VIDEO_BACKEND_H_ -#define DX11_VIDEO_BACKEND_H_ +#pragma once #include "VideoBackendBase.h" @@ -26,4 +24,3 @@ class VideoBackend : public VideoBackendHardware } -#endif diff --git a/Source/Core/VideoBackends/D3D/XFBEncoder.h b/Source/Core/VideoBackends/D3D/XFBEncoder.h index c96e683ceb..655059cd56 100644 --- a/Source/Core/VideoBackends/D3D/XFBEncoder.h +++ b/Source/Core/VideoBackends/D3D/XFBEncoder.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _XFBENCODER_H -#define _XFBENCODER_H +#pragma once #include "VideoCommon.h" @@ -51,5 +50,3 @@ private: }; } - -#endif diff --git a/Source/Core/VideoBackends/D3D/main.h b/Source/Core/VideoBackends/D3D/main.h index 061ed8ef3f..4932c0e367 100644 --- a/Source/Core/VideoBackends/D3D/main.h +++ b/Source/Core/VideoBackends/D3D/main.h @@ -2,10 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef MAIN_H -#define MAIN_H +#pragma once #include "Render.h" #include "MainBase.h" - -#endif diff --git a/Source/Core/VideoBackends/OGL/FramebufferManager.h b/Source/Core/VideoBackends/OGL/FramebufferManager.h index 3d67bff610..34c8b80a8c 100644 --- a/Source/Core/VideoBackends/OGL/FramebufferManager.h +++ b/Source/Core/VideoBackends/OGL/FramebufferManager.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _FRAMEBUFFERMANAGER_H_ -#define _FRAMEBUFFERMANAGER_H_ +#pragma once #include "GLUtil.h" #include "FramebufferManagerBase.h" @@ -117,5 +116,3 @@ private: }; } // namespace OGL - -#endif diff --git a/Source/Core/VideoBackends/OGL/GLUtil.h b/Source/Core/VideoBackends/OGL/GLUtil.h index 7d15399930..67fa8f237e 100644 --- a/Source/Core/VideoBackends/OGL/GLUtil.h +++ b/Source/Core/VideoBackends/OGL/GLUtil.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _GLINIT_H_ -#define _GLINIT_H_ +#pragma once #include "VideoConfig.h" #include "MathUtil.h" @@ -40,5 +39,3 @@ __forceinline GLenum GL_REPORT_ERROR() { return GL_NO_ERROR; } #else #define DEBUG_GLSL 0 #endif - -#endif // _GLINIT_H_ diff --git a/Source/Core/VideoBackends/OGL/Globals.h b/Source/Core/VideoBackends/OGL/Globals.h index ab90d8e279..268322335b 100644 --- a/Source/Core/VideoBackends/OGL/Globals.h +++ b/Source/Core/VideoBackends/OGL/Globals.h @@ -2,12 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _GLOBALS_H_ -#define _GLOBALS_H_ +#pragma once #include "Common.h" #include "VideoConfig.h" #include "VideoCommon.h" - -#endif // _GLOBALS_H_ diff --git a/Source/Core/VideoBackends/OGL/PerfQuery.h b/Source/Core/VideoBackends/OGL/PerfQuery.h index c47fa194d1..1f93c99d83 100644 --- a/Source/Core/VideoBackends/OGL/PerfQuery.h +++ b/Source/Core/VideoBackends/OGL/PerfQuery.h @@ -1,5 +1,4 @@ -#ifndef _PERFQUERY_H_ -#define _PERFQUERY_H_ +#pragma once #include "PerfQueryBase.h" @@ -42,5 +41,3 @@ private: }; } // namespace - -#endif // _PERFQUERY_H_ diff --git a/Source/Core/VideoBackends/OGL/PostProcessing.h b/Source/Core/VideoBackends/OGL/PostProcessing.h index 1deb050a75..0cd93116f4 100644 --- a/Source/Core/VideoBackends/OGL/PostProcessing.h +++ b/Source/Core/VideoBackends/OGL/PostProcessing.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _POSTPROCESSING_H_ -#define _POSTPROCESSING_H_ +#pragma once #include "VideoCommon.h" #include "GLUtil.h" @@ -28,5 +27,3 @@ void ApplyShader(); } // namespace } // namespace - -#endif // _POSTPROCESSING_H_ diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h index a7b21a929d..ee3c174ec6 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef PROGRAM_SHADER_CACHE_H_ -#define PROGRAM_SHADER_CACHE_H_ +#pragma once #include "GLUtil.h" @@ -112,4 +111,3 @@ private: }; } // namespace OGL -#endif diff --git a/Source/Core/VideoBackends/OGL/RasterFont.h b/Source/Core/VideoBackends/OGL/RasterFont.h index 7f3cff1414..9a7732d353 100644 --- a/Source/Core/VideoBackends/OGL/RasterFont.h +++ b/Source/Core/VideoBackends/OGL/RasterFont.h @@ -2,12 +2,13 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _RASTERFONT_H_ -#define _RASTERFONT_H_ +#pragma once -namespace OGL { +namespace OGL +{ -class RasterFont { +class RasterFont +{ public: RasterFont(); ~RasterFont(void); @@ -24,5 +25,3 @@ private: }; } - -#endif // _RASTERFONT_H_ diff --git a/Source/Core/VideoBackends/OGL/Render.h b/Source/Core/VideoBackends/OGL/Render.h index 58ba086d18..feaad32aa1 100644 --- a/Source/Core/VideoBackends/OGL/Render.h +++ b/Source/Core/VideoBackends/OGL/Render.h @@ -1,6 +1,4 @@ - -#ifndef _RENDER_H_ -#define _RENDER_H_ +#pragma once #include "RenderBase.h" @@ -87,5 +85,3 @@ private: }; } - -#endif diff --git a/Source/Core/VideoBackends/OGL/SamplerCache.h b/Source/Core/VideoBackends/OGL/SamplerCache.h index 4de716b27d..ef470e0758 100644 --- a/Source/Core/VideoBackends/OGL/SamplerCache.h +++ b/Source/Core/VideoBackends/OGL/SamplerCache.h @@ -1,6 +1,4 @@ - -#ifndef INCLUDE_SAMPLER_CACHE_H_ -#define INCLUDE_SAMPLER_CACHE_H_ +#pragma once #include <map> @@ -76,5 +74,3 @@ private: extern SamplerCache *g_sampler_cache; } - -#endif diff --git a/Source/Core/VideoBackends/OGL/StreamBuffer.h b/Source/Core/VideoBackends/OGL/StreamBuffer.h index 8e57b81d17..00e8579a15 100644 --- a/Source/Core/VideoBackends/OGL/StreamBuffer.h +++ b/Source/Core/VideoBackends/OGL/StreamBuffer.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef STREAMBUFFER_H -#define STREAMBUFFER_H +#pragma once #include <utility> #include "VideoCommon.h" @@ -51,5 +50,3 @@ private: }; } - -#endif // STREAMBUFFER_H diff --git a/Source/Core/VideoBackends/OGL/TextureCache.h b/Source/Core/VideoBackends/OGL/TextureCache.h index ca3b857190..3c0e421bc7 100644 --- a/Source/Core/VideoBackends/OGL/TextureCache.h +++ b/Source/Core/VideoBackends/OGL/TextureCache.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _TEXTUREMNGR_H_ -#define _TEXTUREMNGR_H_ +#pragma once #include <map> @@ -64,5 +63,3 @@ private: bool SaveTexture(const std::string filename, u32 textarget, u32 tex, int virtual_width, int virtual_height, unsigned int level); } - -#endif // _TEXTUREMNGR_H_ diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.h b/Source/Core/VideoBackends/OGL/TextureConverter.h index 24bfbbc2d2..f86241e5ff 100644 --- a/Source/Core/VideoBackends/OGL/TextureConverter.h +++ b/Source/Core/VideoBackends/OGL/TextureConverter.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _TEXTURECONVERTER_H_ -#define _TEXTURECONVERTER_H_ +#pragma once #include "VideoCommon.h" #include "GLUtil.h" @@ -30,5 +29,3 @@ int EncodeToRamFromTexture(u32 address, GLuint source_texture, bool bFromZBuffer } } // namespace OGL - -#endif // _TEXTURECONVERTER_H_ diff --git a/Source/Core/VideoBackends/OGL/VertexManager.h b/Source/Core/VideoBackends/OGL/VertexManager.h index 11001ff1ca..db0573e8f6 100644 --- a/Source/Core/VideoBackends/OGL/VertexManager.h +++ b/Source/Core/VideoBackends/OGL/VertexManager.h @@ -2,8 +2,7 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _VERTEXMANAGER_H_ -#define _VERTEXMANAGER_H_ +#pragma once #include "CPMemory.h" @@ -50,5 +49,3 @@ private: }; } - -#endif // _VERTEXMANAGER_H_ diff --git a/Source/Core/VideoBackends/OGL/VideoBackend.h b/Source/Core/VideoBackends/OGL/VideoBackend.h index ed4a748eb4..761772a8ed 100644 --- a/Source/Core/VideoBackends/OGL/VideoBackend.h +++ b/Source/Core/VideoBackends/OGL/VideoBackend.h @@ -1,6 +1,4 @@ - -#ifndef OGL_VIDEO_BACKEND_H_ -#define OGL_VIDEO_BACKEND_H_ +#pragma once #include "VideoBackendBase.h" @@ -25,5 +23,3 @@ class VideoBackend : public VideoBackendHardware }; } - -#endif diff --git a/Source/Core/VideoBackends/OGL/main.h b/Source/Core/VideoBackends/OGL/main.h index 03cc6fc174..7ea6077d30 100644 --- a/Source/Core/VideoBackends/OGL/main.h +++ b/Source/Core/VideoBackends/OGL/main.h @@ -2,9 +2,6 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#ifndef _MAIN_H_ -#define _MAIN_H_ +#pragma once #include "MainBase.h" - -#endif // _MAIN_H_ 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 |
