From 5ac161c132ffd9364d470a735f7abb72edd756dd Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 22 Sep 2016 21:00:18 -0400 Subject: [PATCH] TextureEncoder: const correctness --- .../VideoBackends/Software/TextureEncoder.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Source/Core/VideoBackends/Software/TextureEncoder.cpp b/Source/Core/VideoBackends/Software/TextureEncoder.cpp index c046d9e5a5..15e159b30f 100644 --- a/Source/Core/VideoBackends/Software/TextureEncoder.cpp +++ b/Source/Core/VideoBackends/Software/TextureEncoder.cpp @@ -157,7 +157,7 @@ static inline void BoxfilterRGB_to_RGB8(const u8* src, u8* r, u8* g, u8* b) *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; @@ -260,7 +260,7 @@ static void SetSpans(int sBlkSize, int tBlkSize, s32* tSpan, s32* sBlkSpan, s32* 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; 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; 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; 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; 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; 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; 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)) 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) {