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

added xbrz 6x support to the wxwidgets interface, will take care of the gtk end shortly.

This commit is contained in:
DoctorWho11 2015-09-19 04:08:13 -04:00
parent 31b4b7afc5
commit 68e67b7269
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/wx/filters.h
View File

@ -66,6 +66,7 @@ void xbrz2x32(u8* src, u32 spitch, u8*, u8* dst, u32 dstp, int w, int h);
void xbrz3x32(u8* src, u32 spitch, u8*, u8* dst, u32 dstp, int w, int h); void xbrz3x32(u8* src, u32 spitch, u8*, u8* dst, u32 dstp, int w, int h);
void xbrz4x32(u8* src, u32 spitch, u8*, u8* dst, u32 dstp, int w, int h); void xbrz4x32(u8* src, u32 spitch, u8*, u8* dst, u32 dstp, int w, int h);
void xbrz5x32(u8* src, u32 spitch, u8*, u8* dst, u32 dstp, int w, int h); void xbrz5x32(u8* src, u32 spitch, u8*, u8* dst, u32 dstp, int w, int h);
void xbrz6x32(u8* src, u32 spitch, u8*, u8* dst, u32 dstp, int w, int h);
// call ifc to ignore previous frame / when starting new // call ifc to ignore previous frame / when starting new
void InterframeCleanup(); void InterframeCleanup();

2
src/wx/opts.cpp
View File

@ -138,7 +138,7 @@ opt_desc opts[] =
ENUMOPT("Display/Filter", "", wxTRANSLATE("Full-screen filter to apply"), gopts.filter, ENUMOPT("Display/Filter", "", wxTRANSLATE("Full-screen filter to apply"), gopts.filter,
wxTRANSLATE("none|2xsai|super2xsai|supereagle|pixelate|advmame|" wxTRANSLATE("none|2xsai|super2xsai|supereagle|pixelate|advmame|"
L"bilinear|bilinearplus|scanlines|tvmode|hq2x|lq2x|" L"bilinear|bilinearplus|scanlines|tvmode|hq2x|lq2x|"
L"simple2x|simple3x|hq3x|simple4x|hq4x|xbrz2x|xbrz3x|xbrz4x|xbrz5x|plugin")), L"simple2x|simple3x|hq3x|simple4x|hq4x|xbrz2x|xbrz3x|xbrz4x|xbrz5x|xbrz6x|plugin")),
STROPT("Display/FilterPlugin", "", wxTRANSLATE("Filter plugin library"), gopts.filter_plugin), STROPT("Display/FilterPlugin", "", wxTRANSLATE("Filter plugin library"), gopts.filter_plugin),
ENUMOPT("Display/IFB", "", wxTRANSLATE("Interframe blending function"), gopts.ifb, wxTRANSLATE("none|smart|motionblur")), ENUMOPT("Display/IFB", "", wxTRANSLATE("Interframe blending function"), gopts.ifb, wxTRANSLATE("none|smart|motionblur")),
BOOLOPT("Display/KeepOnTop", "KeepOnTop", wxTRANSLATE("Keep window on top"), gopts.keep_on_top), BOOLOPT("Display/KeepOnTop", "KeepOnTop", wxTRANSLATE("Keep window on top"), gopts.keep_on_top),

4
src/wx/panel.cpp
View File

@ -1653,6 +1653,10 @@ public:
xbrz5x32(src, instride, delta, dst, outstride, width, height); xbrz5x32(src, instride, delta, dst, outstride, width, height);
break; break;
case FF_XBRZ6X:
xbrz6x32(src, instride, delta, dst, outstride, width, height);
break;
case FF_PLUGIN: case FF_PLUGIN:
// MFC interface did not do plugins in parallel // MFC interface did not do plugins in parallel
// Probably because it's almost certain they carry state or do // Probably because it's almost certain they carry state or do

5
src/wx/wxvbam.h
View File

@ -345,10 +345,11 @@ enum filtfunc
FF_NONE, FF_2XSAI, FF_SUPER2XSAI, FF_SUPEREAGLE, FF_PIXELATE, FF_NONE, FF_2XSAI, FF_SUPER2XSAI, FF_SUPEREAGLE, FF_PIXELATE,
FF_ADVMAME, FF_BILINEAR, FF_BILINEARPLUS, FF_SCANLINES, FF_TV, FF_ADVMAME, FF_BILINEAR, FF_BILINEARPLUS, FF_SCANLINES, FF_TV,
FF_HQ2X, FF_LQ2X, FF_SIMPLE2X, FF_SIMPLE3X, FF_HQ3X, FF_SIMPLE4X, FF_HQ2X, FF_LQ2X, FF_SIMPLE2X, FF_SIMPLE3X, FF_HQ3X, FF_SIMPLE4X,
FF_HQ4X, FF_XBRZ2X, FF_XBRZ3X, FF_XBRZ4X, FF_XBRZ5X, FF_PLUGIN // plugin must always be last FF_HQ4X, FF_XBRZ2X, FF_XBRZ3X, FF_XBRZ4X, FF_XBRZ5X, FF_XBRZ6X, FF_PLUGIN // plugin must always be last
}; };
#define builtin_ff_scale(x) \ #define builtin_ff_scale(x) \
((x == FF_XBRZ5X) ? 5 : \ ((x == FF_XBRZ6X) ? 6 : \
(x == FF_XBRZ5X) ? 5 : \
(x == FF_XBRZ4X || x == FF_HQ4X || x == FF_SIMPLE4X) ? 4 : \ (x == FF_XBRZ4X || x == FF_HQ4X || x == FF_SIMPLE4X) ? 4 : \
(x == FF_XBRZ3X || x == FF_HQ3X || x == FF_SIMPLE3X) ? 3 : \ (x == FF_XBRZ3X || x == FF_HQ3X || x == FF_SIMPLE3X) ? 3 : \
x == FF_PLUGIN ? 0 : x == FF_NONE ? 1 : 2) x == FF_PLUGIN ? 0 : x == FF_NONE ? 1 : 2)

1
src/wx/xrc/DisplayConfig.xrc
View File

@ -239,6 +239,7 @@
<item>xBRZ 3x</item> <item>xBRZ 3x</item>
<item>xBRZ 4x</item> <item>xBRZ 4x</item>
<item>xBRZ 5x</item> <item>xBRZ 5x</item>
<item>xBRZ 6x</item>
<item>Plugin</item> <item>Plugin</item>
</content> </content>
</object> </object>