diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-07-11 16:37:42 +0200 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-07-11 16:37:42 +0200 |
| commit | 84bf097fb76304eb27d625e5f221dfb5ce922b1f (patch) | |
| tree | 57079ff88525dade11b2d1901357e221df6ddab7 /Source/Core/VideoCommon/VertexLoader.cpp | |
| parent | 326af097d9708ea49d54996aec46a7fa328cec1e (diff) | |
| parent | 7e79806efcd5c5e41efea89fa385b480ac1882f5 (diff) | |
Merge pull request #579 from degasus/statics
Mark unexported global variables and functions as statics.
Diffstat (limited to 'Source/Core/VideoCommon/VertexLoader.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/VertexLoader.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/Source/Core/VideoCommon/VertexLoader.cpp b/Source/Core/VideoCommon/VertexLoader.cpp index bdf58899e4..4087554716 100644 --- a/Source/Core/VideoCommon/VertexLoader.cpp +++ b/Source/Core/VideoCommon/VertexLoader.cpp @@ -51,7 +51,6 @@ static int loop_counter; // Vertex loaders read these. Although the scale ones should be baked into the shader. int tcIndex; int colIndex; -TVtxAttr* pVtxAttr; int colElements[2]; float posScale; float tcScale[8]; @@ -84,13 +83,13 @@ static const float fractionTable[32] = { using namespace Gen; -void LOADERDECL PosMtx_ReadDirect_UByte() +static void LOADERDECL PosMtx_ReadDirect_UByte() { s_curposmtx = DataReadU8() & 0x3f; PRIM_LOG("posmtx: %d, ", s_curposmtx); } -void LOADERDECL PosMtx_Write() +static void LOADERDECL PosMtx_Write() { DataWrite<u8>(s_curposmtx); DataWrite<u8>(0); @@ -101,7 +100,7 @@ void LOADERDECL PosMtx_Write() s_curposmtx = (u8) MatrixIndexA.PosNormalMtxIdx; } -void LOADERDECL UpdateBoundingBoxPrepare() +static void LOADERDECL UpdateBoundingBoxPrepare() { if (!PixelEngine::bbox_active) return; @@ -112,7 +111,7 @@ void LOADERDECL UpdateBoundingBoxPrepare() VertexManager::s_pCurBufferPointer = (u8*)s_bbox_vertex_buffer; } -inline bool UpdateBoundingBoxVars() +static inline bool UpdateBoundingBoxVars() { switch (s_bbox_primitive) { @@ -198,7 +197,7 @@ inline bool UpdateBoundingBoxVars() } } -void LOADERDECL UpdateBoundingBox() +static void LOADERDECL UpdateBoundingBox() { if (!PixelEngine::bbox_active) return; @@ -431,25 +430,25 @@ void LOADERDECL UpdateBoundingBox() PixelEngine::bbox[3] = (bottom > PixelEngine::bbox[3]) ? bottom : PixelEngine::bbox[3]; } -void LOADERDECL TexMtx_ReadDirect_UByte() +static void LOADERDECL TexMtx_ReadDirect_UByte() { s_curtexmtx[s_texmtxread] = DataReadU8() & 0x3f; PRIM_LOG("texmtx%d: %d, ", s_texmtxread, s_curtexmtx[s_texmtxread]); s_texmtxread++; } -void LOADERDECL TexMtx_Write_Float() +static void LOADERDECL TexMtx_Write_Float() { DataWrite(float(s_curtexmtx[s_texmtxwrite++])); } -void LOADERDECL TexMtx_Write_Float2() +static void LOADERDECL TexMtx_Write_Float2() { DataWrite(0.f); DataWrite(float(s_curtexmtx[s_texmtxwrite++])); } -void LOADERDECL TexMtx_Write_Float4() +static void LOADERDECL TexMtx_Write_Float4() { DataWrite(0.f); DataWrite(0.f); @@ -837,7 +836,6 @@ void VertexLoader::SetupRunVertices(int vtx_attr_group, int primitive, int const m_VtxAttr.texCoord[6].Frac = g_VtxAttr[vtx_attr_group].g2.Tex6Frac; m_VtxAttr.texCoord[7].Frac = g_VtxAttr[vtx_attr_group].g2.Tex7Frac; - pVtxAttr = &m_VtxAttr; posScale = fractionTable[m_VtxAttr.PosFrac]; if (m_NativeFmt->m_components & VB_HAS_UVALL) for (int i = 0; i < 8; i++) |