Merge pull request #11960 from jdgleaver/filter-upscale-320x240

Add 'Upscale_256x-320x240' video filter
libretro · Jan 31, 2021 · 94beed5 · 94beed5
2 parents 1f58ceb + ebfe32d
commit 94beed5
Show file tree

Hide file tree

Showing 6 changed files with 732 additions and 2 deletions.
diff --git a/Makefile.common b/Makefile.common
@@ -2316,7 +2316,8 @@ ifeq ($(HAVE_STATIC_VIDEO_FILTERS), 1)
           gfx/video_filters/gameboy4x.o \
           gfx/video_filters/dot_matrix_3x.o \
           gfx/video_filters/dot_matrix_4x.o \
-          gfx/video_filters/upscale_1_5x.o
+          gfx/video_filters/upscale_1_5x.o \
+          gfx/video_filters/upscale_256x_320x240.o
 endif
 
 ifeq ($(WANT_IOSUHAX), 1)

diff --git a/gfx/video_filter.c b/gfx/video_filter.c
@@ -291,6 +291,7 @@ extern const struct softfilter_implementation *gameboy4x_get_implementation(soft
 extern const struct softfilter_implementation *dot_matrix_3x_get_implementation(softfilter_simd_mask_t simd);
 extern const struct softfilter_implementation *dot_matrix_4x_get_implementation(softfilter_simd_mask_t simd);
 extern const struct softfilter_implementation *upscale_1_5x_get_implementation(softfilter_simd_mask_t simd);
+extern const struct softfilter_implementation *upscale_256x_320x240_get_implementation(softfilter_simd_mask_t simd);
 
 static const softfilter_get_implementation_t soft_plugs_builtin[] = {
    blargg_ntsc_snes_get_implementation,
@@ -315,6 +316,7 @@ static const softfilter_get_implementation_t soft_plugs_builtin[] = {
    dot_matrix_3x_get_implementation,
    dot_matrix_4x_get_implementation,
    upscale_1_5x_get_implementation,
+   upscale_256x_320x240_get_implementation,
 };
 
 static bool append_softfilter_plugs(rarch_softfilter_t *filt,

diff --git a/gfx/video_filters/Makefile b/gfx/video_filters/Makefile
@@ -74,7 +74,7 @@ objects += blargg_ntsc_snes.$(DYLIB) phosphor2x.$(DYLIB) epx.$(DYLIB) lq2x.$(DYL
 	   scanline2x.$(DYLIB) grid2x.$(DYLIB) grid3x.$(DYLIB) \
 	   gameboy3x.$(DYLIB) gameboy4x.$(DYLIB) \
 	   dot_matrix_3x.$(DYLIB) dot_matrix_4x.$(DYLIB) \
-	   upscale_1_5x.$(DYLIB)
+	   upscale_1_5x.$(DYLIB) upscale_256x_320x240.$(DYLIB)
 
 all: build;
 

diff --git a/gfx/video_filters/Upscale_256x-320x240.filt b/gfx/video_filters/Upscale_256x-320x240.filt
@@ -0,0 +1 @@
+filter = upscale_256x_320x240