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

Filters need to be C90-compatible for Android build

This commit is contained in:
twinaphex 2014-04-17 20:51:46 +02:00
parent 569de131a0
commit 34fc044bbf
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/filters/2xbr.c
View File

@ -121,7 +121,7 @@ uint16_t pg_lbmask;
{\ {\
e = (df(PE,PC)+df(PE,PG)+df(PI,H5)+df(PI,F4))+(df(PH,PF)<<2); \ e = (df(PE,PC)+df(PE,PG)+df(PI,H5)+df(PI,F4))+(df(PH,PF)<<2); \
i = (df(PH,PD)+df(PH,I5)+df(PF,I4)+df(PF,PB))+(df(PE,PI)<<2); \ i = (df(PH,PD)+df(PH,I5)+df(PF,I4)+df(PF,PB))+(df(PE,PI)<<2); \
if ((e<i) && ( !eq(PF,PB) && !eq(PH,PD) || eq(PE,PI) && (!eq(PF,I4) && !eq(PH,I5)) || eq(PE,PG) || eq(PE,PC)) )\ if ((e<i) && ((!eq(PF,PB) && !eq(PH,PD)) || (eq(PE,PI) && (!eq(PF,I4) && !eq(PH,I5))) || eq(PE,PG) || eq(PE,PC)) )\
{\ {\
ke=df(PF,PG); ki=df(PH,PC); \ ke=df(PF,PG); ki=df(PH,PC); \
ex2 = (PE!=PC && PB!=PC); ex3 = (PE!=PG && PD!=PG); px = (df(PE,PF) <= df(PE,PH)) ? PF : PH; \ ex2 = (PE!=PC && PB!=PC); ex3 = (PE!=PG && PD!=PG); px = (df(PE,PF) <= df(PE,PH)) ? PF : PH; \

10
gfx/filters/2xsai.c
View File

@ -198,14 +198,15 @@ static void twoxsai_generic_xrgb8888(unsigned width, unsigned height,
int first, int last, uint32_t *src, int first, int last, uint32_t *src,
unsigned src_stride, uint32_t *dst, unsigned dst_stride) unsigned src_stride, uint32_t *dst, unsigned dst_stride)
{ {
const unsigned nextline = (last) ? 0 : src_stride; unsigned nextline, finish;
nextline = (last) ? 0 : src_stride;
for (; height; height--) for (; height; height--)
{ {
uint32_t *in = (uint32_t*)src; uint32_t *in = (uint32_t*)src;
uint32_t *out = (uint32_t*)dst; uint32_t *out = (uint32_t*)dst;
for (unsigned finish = width; finish; finish -= 1) for (finish = width; finish; finish -= 1)
{ {
twoxsai_declare_variables(uint32_t, in, nextline); twoxsai_declare_variables(uint32_t, in, nextline);
@ -227,14 +228,15 @@ static void twoxsai_generic_rgb565(unsigned width, unsigned height,
int first, int last, uint16_t *src, int first, int last, uint16_t *src,
unsigned src_stride, uint16_t *dst, unsigned dst_stride) unsigned src_stride, uint16_t *dst, unsigned dst_stride)
{ {
const unsigned nextline = (last) ? 0 : src_stride; unsigned nextline, finish;
nextline = (last) ? 0 : src_stride;
for (; height; height--) for (; height; height--)
{ {
uint16_t *in = (uint16_t*)src; uint16_t *in = (uint16_t*)src;
uint16_t *out = (uint16_t*)dst; uint16_t *out = (uint16_t*)dst;
for (unsigned finish = width; finish; finish -= 1) for (finish = width; finish; finish -= 1)
{ {
twoxsai_declare_variables(uint16_t, in, nextline); twoxsai_declare_variables(uint16_t, in, nextline);

10
gfx/filters/super2xsai.c
View File

@ -172,14 +172,15 @@ static void supertwoxsai_generic_xrgb8888(unsigned width, unsigned height,
int first, int last, uint32_t *src, int first, int last, uint32_t *src,
unsigned src_stride, uint32_t *dst, unsigned dst_stride) unsigned src_stride, uint32_t *dst, unsigned dst_stride)
{ {
const unsigned nextline = (last) ? 0 : src_stride; unsigned nextline, finish;
nextline = (last) ? 0 : src_stride;
for (; height; height--) for (; height; height--)
{ {
uint32_t *in = (uint32_t*)src; uint32_t *in = (uint32_t*)src;
uint32_t *out = (uint32_t*)dst; uint32_t *out = (uint32_t*)dst;
for (unsigned finish = width; finish; finish -= 1) for (finish = width; finish; finish -= 1)
{ {
supertwoxsai_declare_variables(uint32_t, in, nextline); supertwoxsai_declare_variables(uint32_t, in, nextline);
@ -201,14 +202,15 @@ static void supertwoxsai_generic_rgb565(unsigned width, unsigned height,
int first, int last, uint16_t *src, int first, int last, uint16_t *src,
unsigned src_stride, uint16_t *dst, unsigned dst_stride) unsigned src_stride, uint16_t *dst, unsigned dst_stride)
{ {
const unsigned nextline = (last) ? 0 : src_stride; unsigned nextline, finish;
nextline = (last) ? 0 : src_stride;
for (; height; height--) for (; height; height--)
{ {
uint16_t *in = (uint16_t*)src; uint16_t *in = (uint16_t*)src;
uint16_t *out = (uint16_t*)dst; uint16_t *out = (uint16_t*)dst;
for (unsigned finish = width; finish; finish -= 1) for (finish = width; finish; finish -= 1)
{ {
supertwoxsai_declare_variables(uint16_t, in, nextline); supertwoxsai_declare_variables(uint16_t, in, nextline);

10
gfx/filters/supereagle.c
View File

@ -189,14 +189,15 @@ static void supereagle_generic_xrgb8888(unsigned width, unsigned height,
int first, int last, uint32_t *src, int first, int last, uint32_t *src,
unsigned src_stride, uint32_t *dst, unsigned dst_stride) unsigned src_stride, uint32_t *dst, unsigned dst_stride)
{ {
const unsigned nextline = (last) ? 0 : src_stride; unsigned finish, nextline;
nextline = (last) ? 0 : src_stride;
for (; height; height--) for (; height; height--)
{ {
uint32_t *in = (uint32_t*)src; uint32_t *in = (uint32_t*)src;
uint32_t *out = (uint32_t*)dst; uint32_t *out = (uint32_t*)dst;
for (unsigned finish = width; finish; finish -= 1) for (finish = width; finish; finish -= 1)
{ {
supereagle_declare_variables(uint32_t, in, nextline); supereagle_declare_variables(uint32_t, in, nextline);
@ -212,14 +213,15 @@ static void supereagle_generic_rgb565(unsigned width, unsigned height,
int first, int last, uint16_t *src, int first, int last, uint16_t *src,
unsigned src_stride, uint16_t *dst, unsigned dst_stride) unsigned src_stride, uint16_t *dst, unsigned dst_stride)
{ {
const unsigned nextline = (last) ? 0 : src_stride; unsigned nextline, finish;
nextline = (last) ? 0 : src_stride;
for (; height; height--) for (; height; height--)
{ {
uint16_t *in = (uint16_t*)src; uint16_t *in = (uint16_t*)src;
uint16_t *out = (uint16_t*)dst; uint16_t *out = (uint16_t*)dst;
for (unsigned finish = width; finish; finish -= 1) for (finish = width; finish; finish -= 1)
{ {
supereagle_declare_variables(uint16_t, in, nextline); supereagle_declare_variables(uint16_t, in, nextline);