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

filters: Fix warnings on gcc

This commit is contained in:
Emmanuel Gil Peyrot 2020-12-16 21:21:11 +01:00
parent 50a24fbbd7
commit d503376558
3 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desmume/src/filter/hq2x.cpp
View File

@ -151,7 +151,7 @@
static void hq2x_32_def(u32 *__restrict dst0, u32 *__restrict dst1, const u32 *src0, const u32 *src1, const u32 *src2, unsigned count)
{
for (int i = 0; i < count; ++i)
for (unsigned i = 0; i < count; ++i)
{
u8 mask = 0;
u32 c[9];
@ -409,7 +409,7 @@ static void hq2x_32_def(u32 *__restrict dst0, u32 *__restrict dst1, const u32 *s
static void hq2xS_32_def(u32 *__restrict dst0, u32 *__restrict dst1, const u32 *src0, const u32 *src1, const u32 *src2, unsigned count)
{
for (int i = 0; i < count; ++i)
for (unsigned i = 0; i < count; ++i)
{
u8 mask = 0;
u32 c[9];

4
desmume/src/filter/hq4x.cpp
View File

@ -43,7 +43,7 @@ void hq4x_32_def(u32 *__restrict dst0, u32 *__restrict dst1, u32 *__restrict dst
const u32 *src0, const u32 *src1, const u32 *src2,
unsigned count, unsigned flag)
{
for (int i = 0; i < count; ++i)
for (unsigned i = 0; i < count; ++i)
{
u8 mask = 0;
u32 c[9];
@ -132,7 +132,7 @@ void hq4xS_32_def(u32 *__restrict dst0, u32 *__restrict dst1, u32 *__restrict ds
const u32 *src0, const u32 *src1, const u32 *src2,
unsigned count, unsigned flag)
{
for (int i = 0; i < count; ++i)
for (unsigned i = 0; i < count; ++i)
{
u8 mask = 0;
u32 c[9];

24
desmume/src/filter/interp.h
View File

@ -245,7 +245,7 @@ static inline u32 interp_32_97(u32 p1, u32 p2)
//return 0;
//}
static int interp_32_diff(u32 p1, u32 p2)
static inline int interp_32_diff(u32 p1, u32 p2)
{
int r, g, b;
int y, u, v;
@ -306,28 +306,6 @@ static FORCEINLINE u32 ABS(s32 x) { return (x+(x>>31))^(x>>31); } // faster
// return 0;
//}
static int interp_32_diff2(u32 p1, u32 p2)
{
int r, g, b;
int y, u, v;
if ((p1 & 0xF0F0F0) == (p2 & 0xF0F0F0))
return 0;
b = (int)((p1 & 0xF8) - (p2 & 0xF8));
g = (int)((p1 & 0xF800) - (p2 & 0xF800)) >> 8;
r = (int)((p1 & 0xF80000) - (p2 & 0xF80000)) >> 16;
// y = 30*r + 58*g + 12*b;
y = 33*r + 36*g + 31*b;
u = -14*r - 29*g + 44*b;
v = 62*r - 51*g - 10*b;
if (11*ABS(y) + 8*ABS(u) + 6*ABS(v) > INTERP_LIMIT2)
return 1;
return 0;
}
//
//static void interp_set(unsigned bits_per_pixel)
//{