piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

mark all local functions as static

Browse Source
This commit is contained in:
degasus
2014-07-08 14:29:26 +02:00
parent 3ff1c538ee
commit 22e1aa5bb4
93 changed files with 260 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/VideoBackends/Software/Clipper.cpp
View File

@ -169,7 +169,7 @@ namespace Clipper
} \
}
void ClipTriangle(int *indices, int &numIndices)
static void ClipTriangle(int *indices, int &numIndices)
{
int mask = 0;
@ -218,7 +218,7 @@ namespace Clipper
}
}
void ClipLine(int *indices)
static void ClipLine(int *indices)
{
int mask = 0;
int clip_mask[2] = { 0, 0 };
@ -310,7 +310,7 @@ namespace Clipper
}
}
void CopyVertex(OutputVertexData *dst, OutputVertexData *src, float dx, float dy, unsigned int sOffset)
static void CopyVertex(OutputVertexData *dst, OutputVertexData *src, float dx, float dy, unsigned int sOffset)
{
dst->screenPosition.x = src->screenPosition.x + dx;
dst->screenPosition.y = src->screenPosition.y + dy;

8
Source/Core/VideoBackends/Software/DebugUtil.cpp
View File

@ -51,7 +51,7 @@ void Shutdown()
}
}
void SaveTexture(const std::string& filename, u32 texmap, s32 mip)
static void SaveTexture(const std::string& filename, u32 texmap, s32 mip)
{
FourTexUnits& texUnit = bpmem.tex[(texmap >> 2) & 1];
u8 subTexmap = texmap & 3;
@ -82,7 +82,7 @@ void GetTextureRGBA(u8 *dst, u32 texmap, s32 mip, u32 width, u32 height)
}
}
s32 GetMaxTextureLod(u32 texmap)
static s32 GetMaxTextureLod(u32 texmap)
{
FourTexUnits& texUnit = bpmem.tex[(texmap >> 2) & 1];
u8 subTexmap = texmap & 3;
@ -130,7 +130,7 @@ void DumpActiveTextures()
}
}
void DumpEfb(const std::string& filename)
static void DumpEfb(const std::string& filename)
{
u8 *data = new u8[EFB_WIDTH * EFB_HEIGHT * 4];
u8 *writePtr = data;
@ -153,7 +153,7 @@ void DumpEfb(const std::string& filename)
delete[] data;
}
void DumpDepth(const std::string& filename)
static void DumpDepth(const std::string& filename)
{
u8 *data = new u8[EFB_WIDTH * EFB_HEIGHT * 4];
u8 *writePtr = data;

6
Source/Core/VideoBackends/Software/EfbCopy.cpp
View File

@ -25,7 +25,7 @@ static const float s_gammaLUT[] =
namespace EfbCopy
{
void CopyToXfb(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc, float Gamma)
static void CopyToXfb(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc, float Gamma)
{
GLInterface->Update(); // update the render window position and the backbuffer size
@ -61,7 +61,7 @@ namespace EfbCopy
}
}
void CopyToRam()
static void CopyToRam()
{
if (!g_SWVideoConfig.bHwRasterizer)
{
@ -71,7 +71,7 @@ namespace EfbCopy
}
}
void ClearEfb()
static void ClearEfb()
{
u32 clearColor = (bpmem.clearcolorAR & 0xff) << 24 | bpmem.clearcolorGB << 8 | (bpmem.clearcolorAR & 0xff00) >> 8;

22
Source/Core/VideoBackends/Software/EfbInterface.cpp
View File

@ -35,7 +35,7 @@ namespace EfbInterface
p.DoArray(efb, EFB_WIDTH*EFB_HEIGHT*6);
}
void SetPixelAlphaOnly(u32 offset, u8 a)
static void SetPixelAlphaOnly(u32 offset, u8 a)
{
switch (bpmem.zcontrol.pixel_format)
{
@ -58,7 +58,7 @@ namespace EfbInterface
}
}
void SetPixelColorOnly(u32 offset, u8 *rgb)
static void SetPixelColorOnly(u32 offset, u8 *rgb)
{
switch (bpmem.zcontrol.pixel_format)
{
@ -98,7 +98,7 @@ namespace EfbInterface
}
}
void SetPixelAlphaColor(u32 offset, u8 *color)
static void SetPixelAlphaColor(u32 offset, u8 *color)
{
switch (bpmem.zcontrol.pixel_format)
{
@ -139,7 +139,7 @@ namespace EfbInterface
}
}
void GetPixelColor(u32 offset, u8 *color)
static void GetPixelColor(u32 offset, u8 *color)
{
switch (bpmem.zcontrol.pixel_format)
{
@ -175,7 +175,7 @@ namespace EfbInterface
}
}
void SetPixelDepth(u32 offset, u32 depth)
static void SetPixelDepth(u32 offset, u32 depth)
{
switch (bpmem.zcontrol.pixel_format)
{
@ -203,7 +203,7 @@ namespace EfbInterface
}
}
u32 GetPixelDepth(u32 offset)
static u32 GetPixelDepth(u32 offset)
{
u32 depth = 0;
@ -229,7 +229,7 @@ namespace EfbInterface
return depth;
}
u32 GetSourceFactor(u8 *srcClr, u8 *dstClr, BlendMode::BlendFactor mode)
static u32 GetSourceFactor(u8 *srcClr, u8 *dstClr, BlendMode::BlendFactor mode)
{
switch (mode)
{
@ -270,7 +270,7 @@ namespace EfbInterface
return 0;
}
u32 GetDestinationFactor(u8 *srcClr, u8 *dstClr, BlendMode::BlendFactor mode)
static u32 GetDestinationFactor(u8 *srcClr, u8 *dstClr, BlendMode::BlendFactor mode)
{
switch (mode)
{
@ -311,7 +311,7 @@ namespace EfbInterface
return 0;
}
void BlendColor(u8 *srcClr, u8 *dstClr)
static void BlendColor(u8 *srcClr, u8 *dstClr)
{
u32 srcFactor = GetSourceFactor(srcClr, dstClr, bpmem.blendmode.srcfactor);
u32 dstFactor = GetDestinationFactor(srcClr, dstClr, bpmem.blendmode.dstfactor);
@ -333,7 +333,7 @@ namespace EfbInterface
}
}
void LogicBlend(u32 srcClr, u32 &dstClr, BlendMode::LogicOp op)
static void LogicBlend(u32 srcClr, u32 &dstClr, BlendMode::LogicOp op)
{
switch (op)
{
@ -388,7 +388,7 @@ namespace EfbInterface
}
}
void SubtractBlend(u8 *srcClr, u8 *dstClr)
static void SubtractBlend(u8 *srcClr, u8 *dstClr)
{
for (int i = 0; i < 4; i++)
{

8
Source/Core/VideoBackends/Software/HwRasterizer.cpp
View File

@ -35,7 +35,7 @@ namespace HwRasterizer
// Clear shader
static GLint clear_apos = -1, clear_ucol = -1;
void CreateShaders()
static void CreateShaders()
{
// Color Vertices
static const char *fragcolText =
@ -155,7 +155,7 @@ namespace HwRasterizer
GL_REPORT_ERRORD();
}
static float width, height;
void LoadTexture()
static void LoadTexture()
{
FourTexUnits &texUnit = bpmem.tex[0];
u32 imageAddr = texUnit.texImage3[0].image_base;
@ -199,7 +199,7 @@ namespace HwRasterizer
glDisable(GL_BLEND);
}
void DrawColorVertex(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2)
static void DrawColorVertex(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2)
{
float x0 = (v0->screenPosition.x / efbHalfWidth) - 1.0f;
float y0 = 1.0f - (v0->screenPosition.y / efbHalfHeight);
@ -249,7 +249,7 @@ namespace HwRasterizer
GL_REPORT_ERRORD();
}
void DrawTextureVertex(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2)
static void DrawTextureVertex(OutputVertexData *v0, OutputVertexData *v1, OutputVertexData *v2)
{
float x0 = (v0->screenPosition.x / efbHalfWidth) - 1.0f;
float y0 = 1.0f - (v0->screenPosition.y / efbHalfHeight);

8
Source/Core/VideoBackends/Software/OpcodeDecoder.cpp
View File

@ -43,7 +43,7 @@ void DoState(PointerWrap &p)
ResetDecoding();
}
void DecodePrimitiveStream(u32 iBufferSize)
static void DecodePrimitiveStream(u32 iBufferSize)
{
u32 vertexSize = vertexLoader.GetVertexSize();
@ -77,7 +77,7 @@ void DecodePrimitiveStream(u32 iBufferSize)
}
}
void ReadXFData(u32 iBufferSize)
static void ReadXFData(u32 iBufferSize)
{
_assert_msg_(VIDEO, iBufferSize >= (u32)(streamSize * 4), "Underflow during standard opcode decoding");
@ -90,7 +90,7 @@ void ReadXFData(u32 iBufferSize)
ResetDecoding();
}
void ExecuteDisplayList(u32 addr, u32 count)
static void ExecuteDisplayList(u32 addr, u32 count)
{
u8 *videoDataSave = g_pVideoData;
@ -114,7 +114,7 @@ void ExecuteDisplayList(u32 addr, u32 count)
g_pVideoData = videoDataSave;
}
void DecodeStandard(u32 bufferSize)
static void DecodeStandard(u32 bufferSize)
{
_assert_msg_(VIDEO, CommandRunnable(bufferSize), "Underflow during standard opcode decoding");

6
Source/Core/VideoBackends/Software/Rasterizer.cpp
View File

@ -183,7 +183,7 @@ inline void Draw(s32 x, s32 y, s32 xi, s32 yi)
tev.Draw();
}
void InitTriangle(float X1, float Y1, s32 xi, s32 yi)
static void InitTriangle(float X1, float Y1, s32 xi, s32 yi)
{
vertex0X = xi;
vertex0Y = yi;
@ -195,7 +195,7 @@ void InitTriangle(float X1, float Y1, s32 xi, s32 yi)
vertexOffsetY = ((float)yi - Y1) + adjust;
}
void InitSlope(Slope *slope, float f1, float f2, float f3, float DX31, float DX12, float DY12, float DY31)
static void InitSlope(Slope *slope, float f1, float f2, float f3, float DX31, float DX12, float DY12, float DY31)
{
float DF31 = f3 - f1;
float DF21 = f2 - f1;
@ -253,7 +253,7 @@ inline void CalculateLOD(s32 &lod, bool &linear, u32 texmap, u32 texcoord)
lod = CLAMP(lod, (s32)tm1.min_lod, (s32)tm1.max_lod);
}
void BuildBlock(s32 blockX, s32 blockY)
static void BuildBlock(s32 blockX, s32 blockY)
{
for (s32 yi = 0; yi < BLOCK_SIZE; yi++)
{

6
Source/Core/VideoBackends/Software/SWCommandProcessor.cpp
View File

@ -66,7 +66,7 @@ inline u16 ReadLow (u32 _reg) {return (u16)(_reg & 0xFFFF);}
inline u16 ReadHigh (u32 _reg) {return (u16)(_reg >> 16);}
void UpdateInterrupts_Wrapper(u64 userdata, int cyclesLate)
static void UpdateInterrupts_Wrapper(u64 userdata, int cyclesLate)
{
UpdateInterrupts(userdata);
}
@ -219,7 +219,7 @@ void UpdateInterruptsFromVideoBackend(u64 userdata)
CoreTiming::ScheduleEvent_Threadsafe(0, et_UpdateInterrupts, userdata);
}
void ReadFifo()
static void ReadFifo()
{
bool canRead = cpreg.readptr != cpreg.writeptr && writePos < (int)maxCommandBufferWrite;
bool atBreakpoint = AtBreakpoint();
@ -256,7 +256,7 @@ void ReadFifo()
}
}
void SetStatus()
static void SetStatus()
{
// overflow check
if (cpreg.rwdistance > cpreg.hiwatermark)

2
Source/Core/VideoBackends/Software/SWRenderer.cpp
View File

@ -52,7 +52,7 @@ void SWRenderer::Shutdown()
}
}
void CreateShaders()
static void CreateShaders()
{
static const char *fragShaderText =
"#ifdef GL_ES\n"

2
Source/Core/VideoBackends/Software/SWmain.cpp
View File

@ -62,7 +62,7 @@ std::string VideoSoftware::GetName() const
return _trans("Software Renderer");
}
void *DllDebugger(void *_hParent, bool Show)
static void *DllDebugger(void *_hParent, bool Show)
{
return nullptr;
}

16
Source/Core/VideoBackends/Software/TextureEncoder.cpp
View File

@ -196,7 +196,7 @@ inline void boxfilterRGB_to_xx8(u8 *src, u8 &x1, u8 &x2, int comp1, int comp2)
x2 = x16_2 >> 2;
}
void SetBlockDimensions(int blkWidthLog2, int blkHeightLog2, u16 &sBlkCount, u16 &tBlkCount, u16 &sBlkSize, u16 &tBlkSize)
static void SetBlockDimensions(int blkWidthLog2, int blkHeightLog2, u16 &sBlkCount, u16 &tBlkCount, u16 &sBlkSize, u16 &tBlkSize)
{
// if half_scale is 1 then the size is cut in half
u32 width = bpmem.copyTexSrcWH.x >> bpmem.triggerEFBCopy.half_scale;
@ -209,7 +209,7 @@ void SetBlockDimensions(int blkWidthLog2, int blkHeightLog2, u16 &sBlkCount, u16
tBlkSize = 1 << blkHeightLog2;
}
void SetSpans(int sBlkSize, int tBlkSize, s32 &tSpan, s32 &sBlkSpan, s32 &tBlkSpan, s32 &writeStride)
static void SetSpans(int sBlkSize, int tBlkSize, s32 &tSpan, s32 &sBlkSpan, s32 &tBlkSpan, s32 &writeStride)
{
// width is 1 less than the number of pixels of width
u32 width = bpmem.copyTexSrcWH.x >> bpmem.triggerEFBCopy.half_scale;
@ -253,7 +253,7 @@ void SetSpans(int sBlkSize, int tBlkSize, s32 &tSpan, s32 &sBlkSpan, s32 &tBlkSp
dstBlockStart += writeStride; \
} \
void EncodeRGBA6(u8 *dst, u8 *src, u32 format)
static void EncodeRGBA6(u8 *dst, u8 *src, u32 format)
{
u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
@ -490,7 +490,7 @@ void EncodeRGBA6(u8 *dst, u8 *src, u32 format)
}
void EncodeRGBA6halfscale(u8 *dst, u8 *src, u32 format)
static void EncodeRGBA6halfscale(u8 *dst, u8 *src, u32 format)
{
u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
@ -725,7 +725,7 @@ void EncodeRGBA6halfscale(u8 *dst, u8 *src, u32 format)
}
}
void EncodeRGB8(u8 *dst, u8 *src, u32 format)
static void EncodeRGB8(u8 *dst, u8 *src, u32 format)
{
u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
@ -939,7 +939,7 @@ void EncodeRGB8(u8 *dst, u8 *src, u32 format)
}
}
void EncodeRGB8halfscale(u8 *dst, u8 *src, u32 format)
static void EncodeRGB8halfscale(u8 *dst, u8 *src, u32 format)
{
u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
@ -1170,7 +1170,7 @@ void EncodeRGB8halfscale(u8 *dst, u8 *src, u32 format)
}
}
void EncodeZ24(u8 *dst, u8 *src, u32 format)
static void EncodeZ24(u8 *dst, u8 *src, u32 format)
{
u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
@ -1274,7 +1274,7 @@ void EncodeZ24(u8 *dst, u8 *src, u32 format)
}
}
void EncodeZ24halfscale(u8 *dst, u8 *src, u32 format)
static void EncodeZ24halfscale(u8 *dst, u8 *src, u32 format)
{
u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
s32 tSpan, sBlkSpan, tBlkSpan, writeStride;

20
Source/Core/VideoBackends/Software/TransformUnit.cpp
View File

@ -19,42 +19,42 @@
namespace TransformUnit
{
void MultiplyVec2Mat24(const Vec3 &vec, const float *mat, Vec3 &result)
static void MultiplyVec2Mat24(const Vec3 &vec, const float *mat, Vec3 &result)
{
result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] + mat[3];
result.y = mat[4] * vec.x + mat[5] * vec.y + mat[6] + mat[7];
result.z = 1.0f;
}
void MultiplyVec2Mat34(const Vec3 &vec, const float *mat, Vec3 &result)
static void MultiplyVec2Mat34(const Vec3 &vec, const float *mat, Vec3 &result)
{
result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] + mat[3];
result.y = mat[4] * vec.x + mat[5] * vec.y + mat[6] + mat[7];
result.z = mat[8] * vec.x + mat[9] * vec.y + mat[10] + mat[11];
}
void MultiplyVec3Mat33(const Vec3 &vec, const float *mat, Vec3 &result)
static void MultiplyVec3Mat33(const Vec3 &vec, const float *mat, Vec3 &result)
{
result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] * vec.z;
result.y = mat[3] * vec.x + mat[4] * vec.y + mat[5] * vec.z;
result.z = mat[6] * vec.x + mat[7] * vec.y + mat[8] * vec.z;
}
void MultiplyVec3Mat24(const Vec3 &vec, const float *mat, Vec3 &result)
static void MultiplyVec3Mat24(const Vec3 &vec, const float *mat, Vec3 &result)
{
result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] * vec.z + mat[3];
result.y = mat[4] * vec.x + mat[5] * vec.y + mat[6] * vec.z + mat[7];
result.z = 1.0f;
}
void MultiplyVec3Mat34(const Vec3 &vec, const float *mat, Vec3 &result)
static void MultiplyVec3Mat34(const Vec3 &vec, const float *mat, Vec3 &result)
{
result.x = mat[0] * vec.x + mat[1] * vec.y + mat[2] * vec.z + mat[3];
result.y = mat[4] * vec.x + mat[5] * vec.y + mat[6] * vec.z + mat[7];
result.z = mat[8] * vec.x + mat[9] * vec.y + mat[10] * vec.z + mat[11];
}
void MultipleVec3Perspective(const Vec3 &vec, const float *proj, Vec4 &result)
static void MultipleVec3Perspective(const Vec3 &vec, const float *proj, Vec4 &result)
{
result.x = proj[0] * vec.x + proj[1] * vec.z;
result.y = proj[2] * vec.y + proj[3] * vec.z;
@ -63,7 +63,7 @@ void MultipleVec3Perspective(const Vec3 &vec, const float *proj, Vec4 &result)
result.w = -vec.z;
}
void MultipleVec3Ortho(const Vec3 &vec, const float *proj, Vec4 &result)
static void MultipleVec3Ortho(const Vec3 &vec, const float *proj, Vec4 &result)
{
result.x = proj[0] * vec.x + proj[1];
result.y = proj[2] * vec.y + proj[3];
@ -104,7 +104,7 @@ void TransformNormal(const InputVertexData *src, bool nbt, OutputVertexData *dst
}
}
void TransformTexCoordRegular(const TexMtxInfo &texinfo, int coordNum, bool specialCase, const InputVertexData *srcVertex, OutputVertexData *dstVertex)
static void TransformTexCoordRegular(const TexMtxInfo &texinfo, int coordNum, bool specialCase, const InputVertexData *srcVertex, OutputVertexData *dstVertex)
{
const Vec3 *src;
switch (texinfo.sourcerow)
@ -208,7 +208,7 @@ inline float SafeDivide(float n, float d)
return (d==0) ? (n>0?1:0) : n/d;
}
void LightColor(const Vec3 &pos, const Vec3 &normal, u8 lightNum, const LitChannel &chan, Vec3 &lightCol)
static void LightColor(const Vec3 &pos, const Vec3 &normal, u8 lightNum, const LitChannel &chan, Vec3 &lightCol)
{
const LightPointer *light = (const LightPointer*)&xfmem.lights[lightNum];
@ -293,7 +293,7 @@ void LightColor(const Vec3 &pos, const Vec3 &normal, u8 lightNum, const LitChann
}
}
void LightAlpha(const Vec3 &pos, const Vec3 &normal, u8 lightNum, const LitChannel &chan, float &lightCol)
static void LightAlpha(const Vec3 &pos, const Vec3 &normal, u8 lightNum, const LitChannel &chan, float &lightCol)
{
const LightPointer *light = (const LightPointer*)&xfmem.lights[lightNum];