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

TransformUnit: Make LightColor()'s chan parameter const 

Also marks references/pointers const where applicable
This commit is contained in:
Lioncash 2017-08-06 18:14:51 -04:00
parent bc11fad6eb
commit 4d35a3105e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -265,7 +265,7 @@ static float CalculateLightAttn(const LightPointer* light, Vec3* _ldir, const Ve
return attn; return attn;
} }
static void LightColor(const Vec3& pos, const Vec3& normal, u8 lightNum, LitChannel& chan, static void LightColor(const Vec3& pos, const Vec3& normal, u8 lightNum, const LitChannel& chan,
Vec3& lightCol) Vec3& lightCol)
{ {
const LightPointer* light = (const LightPointer*)&xfmem.lights[lightNum]; const LightPointer* light = (const LightPointer*)&xfmem.lights[lightNum];
@ -326,7 +326,7 @@ void TransformColor(const InputVertexData* src, OutputVertexData* dst)
u8 chancolor[4]; u8 chancolor[4];
// color // color
LitChannel& colorchan = xfmem.color[chan]; const LitChannel& colorchan = xfmem.color[chan];
if (colorchan.matsource) if (colorchan.matsource)
*(u32*)matcolor = *(u32*)src->color[chan]; // vertex *(u32*)matcolor = *(u32*)src->color[chan]; // vertex
else else
@ -344,7 +344,7 @@ void TransformColor(const InputVertexData* src, OutputVertexData* dst)
} }
else else
{ {
u8* ambColor = (u8*)&xfmem.ambColor[chan]; const u8* ambColor = reinterpret_cast<u8*>(&xfmem.ambColor[chan]);
lightCol.x = ambColor[1]; lightCol.x = ambColor[1];
lightCol.y = ambColor[2]; lightCol.y = ambColor[2];
lightCol.z = ambColor[3]; lightCol.z = ambColor[3];
@ -370,7 +370,7 @@ void TransformColor(const InputVertexData* src, OutputVertexData* dst)
} }
// alpha // alpha
LitChannel& alphachan = xfmem.alpha[chan]; const LitChannel& alphachan = xfmem.alpha[chan];
if (alphachan.matsource) if (alphachan.matsource)
matcolor[0] = src->color[chan][0]; // vertex matcolor[0] = src->color[chan][0]; // vertex
else else