diff options
| author | degasus <wickmarkus@web.de> | 2014-07-08 15:58:25 +0200 |
|---|---|---|
| committer | degasus <wickmarkus@web.de> | 2014-07-11 16:10:20 +0200 |
| commit | 6d3f249dcc746cc7845ef88ddb8ce3bcc9221aca (patch) | |
| tree | e2ca5783d36a54283ff241ef9a053053bb5cc258 /Source/Core/VideoBackends | |
| parent | 9560ecdbec319ab4bb7aca2b8bd2e6ed27d0b7c0 (diff) | |
mark all local variables as static
Diffstat (limited to 'Source/Core/VideoBackends')
9 files changed, 40 insertions, 40 deletions
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp index 5a62de6e65..7b70871ccb 100644 --- a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp +++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp @@ -1574,10 +1574,10 @@ const GLFunc gl_function_array[] = namespace GLExtensions { // Private members and functions - bool _isES3; - bool _isES; - u32 _GLVersion; - std::unordered_map<std::string, bool> m_extension_list; + static bool _isES3; + static bool _isES; + static u32 _GLVersion; + static std::unordered_map<std::string, bool> m_extension_list; // Private initialization functions bool InitFunctionPointers(); diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp index cafa560485..99f3ad5485 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp @@ -29,7 +29,7 @@ s32 ProgramShaderCache::s_ubo_align; static StreamBuffer *s_buffer; static int num_failures = 0; -LinearDiskCache<SHADERUID, u8> g_program_disk_cache; +static LinearDiskCache<SHADERUID, u8> g_program_disk_cache; static GLuint CurrentProgram = 0; ProgramShaderCache::PCache ProgramShaderCache::pshaders; ProgramShaderCache::PCacheEntry* ProgramShaderCache::last_entry; diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index 5cdc8d031f..2674c8a3ee 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -67,7 +67,7 @@ void VideoConfig::UpdateProjectionHack() ::UpdateProjectionHack(g_Config.iPhackvalue, g_Config.sPhackvalue); } -int OSDInternalW, OSDInternalH; +static int OSDInternalW, OSDInternalH; namespace OGL { diff --git a/Source/Core/VideoBackends/Software/Clipper.cpp b/Source/Core/VideoBackends/Software/Clipper.cpp index 4bdbe85230..9e8e603a92 100644 --- a/Source/Core/VideoBackends/Software/Clipper.cpp +++ b/Source/Core/VideoBackends/Software/Clipper.cpp @@ -47,10 +47,10 @@ namespace Clipper { enum { NUM_CLIPPED_VERTICES = 33, NUM_INDICES = NUM_CLIPPED_VERTICES + 3 }; - float m_ViewOffset[2]; + static float m_ViewOffset[2]; - OutputVertexData ClippedVertices[NUM_CLIPPED_VERTICES]; - OutputVertexData *Vertices[NUM_INDICES]; + static OutputVertexData ClippedVertices[NUM_CLIPPED_VERTICES]; + static OutputVertexData *Vertices[NUM_INDICES]; void DoState(PointerWrap &p) { diff --git a/Source/Core/VideoBackends/Software/EfbInterface.cpp b/Source/Core/VideoBackends/Software/EfbInterface.cpp index fd985f8662..aabbee0607 100644 --- a/Source/Core/VideoBackends/Software/EfbInterface.cpp +++ b/Source/Core/VideoBackends/Software/EfbInterface.cpp @@ -14,7 +14,7 @@ #include "VideoCommon/PixelEngine.h" -u8 efb[EFB_WIDTH*EFB_HEIGHT*6]; +static u8 efb[EFB_WIDTH*EFB_HEIGHT*6]; namespace EfbInterface { diff --git a/Source/Core/VideoBackends/Software/HwRasterizer.cpp b/Source/Core/VideoBackends/Software/HwRasterizer.cpp index 9515e8d8af..5645c26bf9 100644 --- a/Source/Core/VideoBackends/Software/HwRasterizer.cpp +++ b/Source/Core/VideoBackends/Software/HwRasterizer.cpp @@ -16,11 +16,11 @@ namespace HwRasterizer { - float efbHalfWidth; - float efbHalfHeight; - bool hasTexture; + static float efbHalfWidth; + static float efbHalfHeight; + static bool hasTexture; - u8 *temp; + static u8 *temp; // Programs static GLuint colProg, texProg, clearProg; diff --git a/Source/Core/VideoBackends/Software/Rasterizer.cpp b/Source/Core/VideoBackends/Software/Rasterizer.cpp index 90fe84ffee..1a5e469435 100644 --- a/Source/Core/VideoBackends/Software/Rasterizer.cpp +++ b/Source/Core/VideoBackends/Software/Rasterizer.cpp @@ -32,23 +32,23 @@ static inline s32 FixedLog2(float f) namespace Rasterizer { -Slope ZSlope; -Slope WSlope; -Slope ColorSlopes[2][4]; -Slope TexSlopes[8][3]; - -s32 vertex0X; -s32 vertex0Y; -float vertexOffsetX; -float vertexOffsetY; - -s32 scissorLeft = 0; -s32 scissorTop = 0; -s32 scissorRight = 0; -s32 scissorBottom = 0; - -Tev tev; -RasterBlock rasterBlock; +static Slope ZSlope; +static Slope WSlope; +static Slope ColorSlopes[2][4]; +static Slope TexSlopes[8][3]; + +static s32 vertex0X; +static s32 vertex0Y; +static float vertexOffsetX; +static float vertexOffsetY; + +static s32 scissorLeft = 0; +static s32 scissorTop = 0; +static s32 scissorRight = 0; +static s32 scissorBottom = 0; + +static Tev tev; +static RasterBlock rasterBlock; void DoState(PointerWrap &p) { diff --git a/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp b/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp index ed8115f1ab..1a2dcc0cbf 100644 --- a/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp +++ b/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp @@ -33,14 +33,14 @@ enum // STATE_TO_SAVE // variables -const int commandBufferSize = 1024 * 1024; -const int maxCommandBufferWrite = commandBufferSize - GATHER_PIPE_SIZE; -u8 commandBuffer[commandBufferSize]; -u32 readPos; -u32 writePos; -int et_UpdateInterrupts; -volatile bool interruptSet; -volatile bool interruptWaiting; +static const int commandBufferSize = 1024 * 1024; +static const int maxCommandBufferWrite = commandBufferSize - GATHER_PIPE_SIZE; +static u8 commandBuffer[commandBufferSize]; +static u32 readPos; +static u32 writePos; +static int et_UpdateInterrupts; +static volatile bool interruptSet; +static volatile bool interruptWaiting; CPReg cpreg; // shared between gfx and emulator thread diff --git a/Source/Core/VideoBackends/Software/SWRenderer.cpp b/Source/Core/VideoBackends/Software/SWRenderer.cpp index 5bd44782a7..40e89dd3d1 100644 --- a/Source/Core/VideoBackends/Software/SWRenderer.cpp +++ b/Source/Core/VideoBackends/Software/SWRenderer.cpp @@ -32,7 +32,7 @@ static std::string s_sScreenshotName; // Rasterfont isn't compatible with GLES // degasus: I think it does, but I can't test it -RasterFont* s_pfont = nullptr; +static RasterFont* s_pfont = nullptr; void SWRenderer::Init() { |
