ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4237 from lioncash/const 

Software: const correctness
This commit is contained in:
Markus Wick 2016-09-23 10:24:55 +02:00 committed by GitHub
parent 2d0e857cb3 330944eef8
commit 9d85d9b000
8 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,7 +72,7 @@ enum
CLIP_NEG_Z_BIT = 0x20 CLIP_NEG_Z_BIT = 0x20
}; };
static inline int CalcClipMask(OutputVertexData* v) static inline int CalcClipMask(const OutputVertexData* v)
{ {
int cmask = 0; int cmask = 0;
Vec4 pos = v->projectedPosition; Vec4 pos = v->projectedPosition;
@ -329,7 +329,7 @@ void ProcessTriangle(OutputVertexData* v0, OutputVertexData* v1, OutputVertexDat
} }
} }
static void CopyVertex(OutputVertexData* dst, OutputVertexData* src, float dx, float dy, static void CopyVertex(OutputVertexData* dst, const OutputVertexData* src, float dx, float dy,
unsigned int sOffset) unsigned int sOffset)
{ {
dst->screenPosition.x = src->screenPosition.x + dx; dst->screenPosition.x = src->screenPosition.x + dx;
@ -403,7 +403,8 @@ void ProcessLine(OutputVertexData* lineV0, OutputVertexData* lineV1)
} }
} }
bool CullTest(OutputVertexData* v0, OutputVertexData* v1, OutputVertexData* v2, bool& backface) bool CullTest(const OutputVertexData* v0, const OutputVertexData* v1, const OutputVertexData* v2,
bool& backface)
{ {
int mask = CalcClipMask(v0); int mask = CalcClipMask(v0);
mask &= CalcClipMask(v1); mask &= CalcClipMask(v1);

3
Source/Core/VideoBackends/Software/Clipper.h
View File

@ -14,7 +14,8 @@ void ProcessTriangle(OutputVertexData* v0, OutputVertexData* v1, OutputVertexDat
void ProcessLine(OutputVertexData* v0, OutputVertexData* v1); void ProcessLine(OutputVertexData* v0, OutputVertexData* v1);
bool CullTest(OutputVertexData* v0, OutputVertexData* v1, OutputVertexData* v2, bool& backface); bool CullTest(const OutputVertexData* v0, const OutputVertexData* v1, const OutputVertexData* v2,
bool& backface);
void PerspectiveDivide(OutputVertexData* vertex); void PerspectiveDivide(OutputVertexData* vertex);
} }

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

@ -154,7 +154,8 @@ static void DumpEfb(const std::string& filename)
delete[] data; delete[] data;
} }
void DrawObjectBuffer(s16 x, s16 y, u8* color, int bufferBase, int subBuffer, const char* name) void DrawObjectBuffer(s16 x, s16 y, const u8* color, int bufferBase, int subBuffer,
const char* name)
{ {
int buffer = bufferBase + subBuffer; int buffer = bufferBase + subBuffer;
@ -170,7 +171,7 @@ void DrawObjectBuffer(s16 x, s16 y, u8* color, int bufferBase, int subBuffer, co
BufferBase[buffer] = bufferBase; BufferBase[buffer] = bufferBase;
} }
void DrawTempBuffer(u8* color, int buffer) void DrawTempBuffer(const u8* color, int buffer)
{ {
u8* dst = (u8*)&TempBuffer[buffer]; u8* dst = (u8*)&TempBuffer[buffer];
*(dst++) = color[2]; *(dst++) = color[2];

7
Source/Core/VideoBackends/Software/DebugUtil.h
View File

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "Common/Common.h" #include "Common/CommonTypes.h"
namespace DebugUtil namespace DebugUtil
{ {
@ -18,8 +18,9 @@ void DumpActiveTextures();
void OnObjectBegin(); void OnObjectBegin();
void OnObjectEnd(); void OnObjectEnd();
void DrawObjectBuffer(s16 x, s16 y, u8* color, int bufferBase, int subBuffer, const char* name); void DrawObjectBuffer(s16 x, s16 y, const u8* color, int bufferBase, int subBuffer,
const char* name);
void DrawTempBuffer(u8* color, int buffer); void DrawTempBuffer(const u8* color, int buffer);
void CopyTempBuffer(s16 x, s16 y, int bufferBase, int subBuffer, const char* name); void CopyTempBuffer(s16 x, s16 y, int bufferBase, int subBuffer, const char* name);
} }

2
Source/Core/VideoBackends/Software/NativeVertexFormat.h
View File

@ -44,7 +44,7 @@ struct OutputVertexData
u8 color[2][4] = {}; u8 color[2][4] = {};
Vec3 texCoords[8] = {}; Vec3 texCoords[8] = {};
void Lerp(float t, OutputVertexData* a, OutputVertexData* b) void Lerp(float t, const OutputVertexData* a, const OutputVertexData* b)
{ {
#define LINTERP(T, OUT, IN) (OUT) + ((IN - OUT) * T) #define LINTERP(T, OUT, IN) (OUT) + ((IN - OUT) * T)

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

@ -264,7 +264,8 @@ static void BuildBlock(s32 blockX, s32 blockY)
} }
} }
void DrawTriangleFrontFace(OutputVertexData* v0, OutputVertexData* v1, OutputVertexData* v2) void DrawTriangleFrontFace(const OutputVertexData* v0, const OutputVertexData* v1,
const OutputVertexData* v2)
{ {
INCSTAT(stats.thisFrame.numTrianglesDrawn); INCSTAT(stats.thisFrame.numTrianglesDrawn);

5
Source/Core/VideoBackends/Software/Rasterizer.h
View File

@ -12,7 +12,8 @@ namespace Rasterizer
{ {
void Init(); void Init();
void DrawTriangleFrontFace(OutputVertexData* v0, OutputVertexData* v1, OutputVertexData* v2); void DrawTriangleFrontFace(const OutputVertexData* v0, const OutputVertexData* v1,
const OutputVertexData* v2);
void SetTevReg(int reg, int comp, s16 color); void SetTevReg(int reg, int comp, s16 color);
@ -22,7 +23,7 @@ struct Slope
float dfdy; float dfdy;
float f0; float f0;
float GetValue(float dx, float dy) { return f0 + (dfdx * dx) + (dfdy * dy); } float GetValue(float dx, float dy) const { return f0 + (dfdx * dx) + (dfdy * dy); }
}; };
struct RasterBlockPixel struct RasterBlockPixel

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

@ -157,7 +157,7 @@ static inline void BoxfilterRGB_to_RGB8(const u8* src, u8* r, u8* g, u8* b)
*b = b16 >> 2; *b = b16 >> 2;
} }
static inline void BoxfilterRGB_to_x8(u8* src, u8* x8, int comp) static inline void BoxfilterRGB_to_x8(const u8* src, u8* x8, int comp)
{ {
u16 x16 = 0; u16 x16 = 0;
@ -260,7 +260,7 @@ static void SetSpans(int sBlkSize, int tBlkSize, s32* tSpan, s32* sBlkSpan, s32*
dstBlockStart += writeStride; \ dstBlockStart += writeStride; \
} }
static void EncodeRGBA6(u8* dst, u8* src, u32 format) static void EncodeRGBA6(u8* dst, const u8* src, u32 format)
{ {
u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize; u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
s32 tSpan, sBlkSpan, tBlkSpan, writeStride; s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
@ -499,7 +499,7 @@ static void EncodeRGBA6(u8* dst, u8* src, u32 format)
} }
} }
static void EncodeRGBA6halfscale(u8* dst, u8* src, u32 format) static void EncodeRGBA6halfscale(u8* dst, const u8* src, u32 format)
{ {
u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize; u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
s32 tSpan, sBlkSpan, tBlkSpan, writeStride; s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
@ -734,7 +734,7 @@ static void EncodeRGBA6halfscale(u8* dst, u8* src, u32 format)
} }
} }
static void EncodeRGB8(u8* dst, u8* src, u32 format) static void EncodeRGB8(u8* dst, const u8* src, u32 format)
{ {
u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize; u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
s32 tSpan, sBlkSpan, tBlkSpan, writeStride; s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
@ -946,7 +946,7 @@ static void EncodeRGB8(u8* dst, u8* src, u32 format)
} }
} }
static void EncodeRGB8halfscale(u8* dst, u8* src, u32 format) static void EncodeRGB8halfscale(u8* dst, const u8* src, u32 format)
{ {
u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize; u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
s32 tSpan, sBlkSpan, tBlkSpan, writeStride; s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
@ -1174,7 +1174,7 @@ static void EncodeRGB8halfscale(u8* dst, u8* src, u32 format)
} }
} }
static void EncodeZ24(u8* dst, u8* src, u32 format) static void EncodeZ24(u8* dst, const u8* src, u32 format)
{ {
u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize; u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
s32 tSpan, sBlkSpan, tBlkSpan, writeStride; s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
@ -1278,7 +1278,7 @@ static void EncodeZ24(u8* dst, u8* src, u32 format)
} }
} }
static void EncodeZ24halfscale(u8* dst, u8* src, u32 format) static void EncodeZ24halfscale(u8* dst, const u8* src, u32 format)
{ {
u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize; u16 sBlkCount, tBlkCount, sBlkSize, tBlkSize;
s32 tSpan, sBlkSpan, tBlkSpan, writeStride; s32 tSpan, sBlkSpan, tBlkSpan, writeStride;
@ -1409,7 +1409,8 @@ void Encode(u8* dest_ptr)
else if (copyfmt > GX_TF_RGBA8 || (copyfmt < GX_TF_RGB565 && !bIsIntensityFmt)) else if (copyfmt > GX_TF_RGBA8 || (copyfmt < GX_TF_RGB565 && !bIsIntensityFmt))
format |= _GX_TF_CTF; format |= _GX_TF_CTF;
u8* src = EfbInterface::GetPixelPointer(bpmem.copyTexSrcXY.x, bpmem.copyTexSrcXY.y, bFromZBuffer); const u8* src =
EfbInterface::GetPixelPointer(bpmem.copyTexSrcXY.x, bpmem.copyTexSrcXY.y, bFromZBuffer);
if (bpmem.triggerEFBCopy.half_scale) if (bpmem.triggerEFBCopy.half_scale)
{ {