diff --git a/driver.h b/driver.h
index 3b1381bca9..0ac93028dd 100644
--- a/driver.h
+++ b/driver.h
@@ -692,6 +692,7 @@ extern const struct softfilter_implementation *blargg_ntsc_snes_composite_get_im
extern const struct softfilter_implementation *blargg_ntsc_snes_svideo_get_implementation(softfilter_simd_mask_t simd);
extern const struct softfilter_implementation *blargg_ntsc_snes_rgb_get_implementation(softfilter_simd_mask_t simd);
extern const struct softfilter_implementation *lq2x_get_implementation(softfilter_simd_mask_t simd);
+extern const struct softfilter_implementation *phosphor2x_get_implementation(softfilter_simd_mask_t simd);
extern const struct softfilter_implementation *twoxbr_get_implementation(softfilter_simd_mask_t simd);
extern const struct softfilter_implementation *epx_get_implementation(softfilter_simd_mask_t simd);
extern const struct softfilter_implementation *twoxsai_get_implementation(softfilter_simd_mask_t simd);
diff --git a/gfx/filter.c b/gfx/filter.c
index 48d3e81afc..1b4876e269 100644
--- a/gfx/filter.c
+++ b/gfx/filter.c
@@ -93,6 +93,7 @@ static const struct softfilter_implementation *(*softfilter_drivers[]) (softfilt
&blargg_ntsc_snes_svideo_get_implementation,
&blargg_ntsc_snes_rgb_get_implementation,
&lq2x_get_implementation,
+ &phosphor2x_get_implementation,
&twoxbr_get_implementation,
&darken_get_implementation,
&twoxsai_get_implementation,
diff --git a/gfx/filters/2xsai.c b/gfx/filters/2xsai.c
index e963995ee9..35a949b72c 100644
--- a/gfx/filters/2xsai.c
+++ b/gfx/filters/2xsai.c
@@ -80,7 +80,7 @@ static void twoxsai_generic_destroy(void *data)
#define twoxsai_interpolate2_xrgb8888(A, B, C, D) ((((A) & 0xFCFCFCFC) >> 2) + (((B) & 0xFCFCFCFC) >> 2) + (((C) & 0xFCFCFCFC) >> 2) + (((D) & 0xFCFCFCFC) >> 2) + (((((A) & 0x03030303) + ((B) & 0x03030303) + ((C) & 0x03030303) + ((D) & 0x03030303)) >> 2) & 0x03030303))
-#define twoxsai_interpolate_rgb565(A, B) ((((A) & 0xF7DE) >> 1) + (((B) & 0xF7DE) >> 1) + ((A) & (B) & 0x0821));
+#define twoxsai_interpolate_rgb565(A, B) ((((A) & 0xF7DE) >> 1) + (((B) & 0xF7DE) >> 1) + ((A) & (B) & 0x0821))
#define twoxsai_interpolate2_rgb565(A, B, C, D) ((((A) & 0xE79C) >> 2) + (((B) & 0xE79C) >> 2) + (((C) & 0xE79C) >> 2) + (((D) & 0xE79C) >> 2) + (((((A) & 0x1863) + ((B) & 0x1863) + ((C) & 0x1863) + ((D) & 0x1863)) >> 2) & 0x1863))
diff --git a/gfx/filters/Makefile b/gfx/filters/Makefile
index 22a6216d4c..fa600a530e 100644
--- a/gfx/filters/Makefile
+++ b/gfx/filters/Makefile
@@ -68,7 +68,7 @@ ASMFLAGS := -INEON/asm
asflags += -mfpu=neon
endif
-objects += blargg_ntsc_snes_composite.$(DYLIB) blargg_ntsc_snes_rf.$(DYLIB) blargg_ntsc_snes_svideo.$(DYLIB) blargg_ntsc_snes_rgb.$(DYLIB) epx.$(DYLIB) lq2x.$(DYLIB) 2xsai.$(DYLIB) super2xsai.$(DYLIB) supereagle.$(DYLIB) 2xbr.$(DYLIB) darken.$(DYLIB) scale2x.$(DYLIB)
+objects += blargg_ntsc_snes_composite.$(DYLIB) blargg_ntsc_snes_rf.$(DYLIB) blargg_ntsc_snes_svideo.$(DYLIB) blargg_ntsc_snes_rgb.$(DYLIB) phosphor2x.$(DYLIB) epx.$(DYLIB) lq2x.$(DYLIB) 2xsai.$(DYLIB) super2xsai.$(DYLIB) supereagle.$(DYLIB) 2xbr.$(DYLIB) darken.$(DYLIB) scale2x.$(DYLIB)
all: build;
diff --git a/gfx/filters/phosphor2x.c b/gfx/filters/phosphor2x.c
new file mode 100644
index 0000000000..79e2936859
--- /dev/null
+++ b/gfx/filters/phosphor2x.c
@@ -0,0 +1,401 @@
+/* RetroArch - A frontend for libretro.
+ * Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ * Copyright (C) 2011-2014 - Daniel De Matteis
+ *
+ * RetroArch is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Found-
+ * ation, either version 3 of the License, or (at your option) any later version.
+ *
+ * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with RetroArch.
+ * If not, see .
+ */
+
+// Compile: gcc -o phosphor2x.so -shared phosphor2x.c -std=c99 -O3 -Wall -pedantic -fPIC
+
+#include "softfilter.h"
+#include "softfilter_prototypes.h"
+#include "boolean.h"
+#include
+#include
+#include
+
+#ifdef RARCH_INTERNAL
+#define softfilter_get_implementation phosphor2x_get_implementation
+#endif
+
+#define PHOSPHOR2X_SCALE 2
+
+static const float phosphor_bleed = 0.78;
+static const float scale_add = 1.0;
+static const float scale_times = 0.8;
+
+static const float scanrange_low = 0.5;
+static const float scanrange_high = 0.65;
+
+static float phosphor_bloom[256];
+static float scan_range[256];
+
+#define clamp(x) ((x) > 255 ? 255 : ((x < 0) ? 0 : (uint32_t)x))
+
+#define red_rgb565(x) (((x) >> 10) & 0x1f)
+#define green_rgb565(x) (((x) >> 5) & 0x1f)
+#define blue_rgb565(x) (((x) >> 0) & 0x1f)
+#define red_xrgb8888(x) (((x) >> 16) & 0xff)
+#define green_xrgb8888(x) (((x) >> 8) & 0xff)
+#define blue_xrgb8888(x) (((x) >> 0) & 0xff)
+
+#define set_red_rgb565(var, x) (var = ((var) & 0x7C00) | ((x) << 10))
+#define set_green_rgb565(var, x) (var = ((var) & 0x3E0) | ((x) << 5))
+#define set_blue_rgb565(var, x) (var = ((var) & 0x1F) | ((x) << 0))
+#define set_red_xrgb8888(var, x) (var = ((var) & 0x00ffff) | ((x) << 16))
+#define set_green_xrgb8888(var, x) (var = ((var) & 0xff00ff) | ((x) << 8))
+#define set_blue_xrgb8888(var, x) (var = ((var) & 0xffff00) | ((x) << 0))
+
+#define blend_pixels_xrgb8888(a, b) (((a >> 1) & 0x7f7f7f7f) + ((b >> 1) & 0x7f7f7f7f))
+#define blend_pixels_rgb565(a, b) (((a >> 1) & 0x7f7f7f7f) + ((b >> 1) & 0x7f7f7f7f))
+
+static inline unsigned max_component_xrgb8888(uint32_t color)
+{
+ unsigned red, green, blue, max;
+ red = red_xrgb8888(color);
+ green = green_xrgb8888(color);
+ blue = blue_xrgb8888(color);
+
+ max = red;
+ max = (green > max) ? green : max;
+ max = (blue > max) ? blue : max;
+ return max;
+}
+
+static inline unsigned max_component_rgb565(uint32_t color)
+{
+ unsigned red, green, blue, max;
+ red = red_rgb565(color);
+ green = green_rgb565(color);
+ blue = blue_rgb565(color);
+
+ max = red;
+ max = (green > max) ? green : max;
+ max = (blue > max) ? blue : max;
+ return max;
+}
+
+static void blit_linear_line_xrgb8888(uint32_t * out, const uint32_t *in, unsigned width)
+{
+ unsigned i;
+ // Splat pixels out on the line.
+ for (i = 0; i < width; i++)
+ out[i << 1] = in[i];
+
+ // Blend in-between pixels.
+ for (i = 1; i < (width << 1) - 1; i += 2)
+ out[i] = blend_pixels_xrgb8888(out[i - 1], out[i + 1]);
+
+ // Blend edge pixels against black.
+ out[0] = blend_pixels_xrgb8888(out[0], 0);
+ out[(width << 1) - 1] = blend_pixels_xrgb8888(out[(width << 1) - 1], 0);
+}
+
+static void blit_linear_line_rgb565(uint16_t * out, const uint16_t *in, unsigned width)
+{
+ unsigned i;
+ // Splat pixels out on the line.
+ for (i = 0; i < width; i++)
+ out[i << 1] = in[i];
+
+ // Blend in-between pixels.
+ for (i = 1; i < (width << 1) - 1; i += 2)
+ out[i] = blend_pixels_rgb565(out[i - 1], out[i + 1]);
+
+ // Blend edge pixels against black.
+ out[0] = blend_pixels_rgb565(out[0], 0);
+ out[(width << 1) - 1] = blend_pixels_rgb565(out[(width << 1) - 1], 0);
+}
+
+static void bleed_phosphors_xrgb8888(uint32_t *scanline, unsigned width)
+{
+ unsigned x;
+
+ // Red phosphor
+ for (x = 0; x < width; x += 2)
+ {
+ unsigned r = red_xrgb8888(scanline[x]);
+ unsigned r_set = clamp(r * phosphor_bleed * phosphor_bloom[r]);
+ set_red_xrgb8888(scanline[x + 1], r_set);
+ }
+
+ // Green phosphor
+ for (x = 0; x < width; x++)
+ {
+ unsigned g = green_xrgb8888(scanline[x]);
+ unsigned g_set = clamp((g >> 1) + 0.5 * g * phosphor_bleed * phosphor_bloom[g]);
+ set_green_xrgb8888(scanline[x], g_set);
+ }
+
+ // Blue phosphor
+ set_blue_xrgb8888(scanline[0], 0);
+ for (x = 1; x < width; x += 2)
+ {
+ unsigned b = blue_xrgb8888(scanline[x]);
+ unsigned b_set = clamp(b * phosphor_bleed * phosphor_bloom[b]);
+ set_blue_xrgb8888(scanline[x + 1], b_set);
+ }
+}
+
+static void bleed_phosphors_rgb565(uint16_t *scanline, unsigned width)
+{
+ unsigned x;
+
+ // Red phosphor
+ for (x = 0; x < width; x += 2)
+ {
+ unsigned r = red_rgb565(scanline[x]);
+ unsigned r_set = clamp(r * phosphor_bleed * phosphor_bloom[r]);
+ set_red_rgb565(scanline[x + 1], r_set);
+ }
+
+ // Green phosphor
+ for (x = 0; x < width; x++)
+ {
+ unsigned g = green_rgb565(scanline[x]);
+ unsigned g_set = clamp((g >> 1) + 0.5 * g * phosphor_bleed * phosphor_bloom[g]);
+ set_green_rgb565(scanline[x], g_set);
+ }
+
+ // Blue phosphor
+ set_blue_rgb565(scanline[0], 0);
+ for (x = 1; x < width; x += 2)
+ {
+ unsigned b = blue_rgb565(scanline[x]);
+ unsigned b_set = clamp(b * phosphor_bleed * phosphor_bloom[b]);
+ set_blue_rgb565(scanline[x + 1], b_set);
+ }
+}
+
+static void stretch_scanline_xrgb8888(const uint32_t * scan_in, uint32_t * scan_out, unsigned width)
+{
+ unsigned x;
+ for (x = 0; x < width; x++)
+ {
+ unsigned max = max_component_xrgb8888(scan_in[x]);
+ set_red_xrgb8888(scan_out[x], (uint32_t)(scan_range[max] * red_xrgb8888(scan_in[x])));
+ set_green_xrgb8888(scan_out[x], (uint32_t)(scan_range[max] * green_xrgb8888(scan_in[x])));
+ set_blue_xrgb8888(scan_out[x], (uint32_t)(scan_range[max] * blue_xrgb8888(scan_in[x])));
+ }
+}
+
+static void stretch_scanline_rgb565(const uint16_t * scan_in, uint16_t * scan_out, unsigned width)
+{
+ unsigned x;
+ for (x = 0; x < width; x++)
+ {
+ unsigned max = max_component_rgb565(scan_in[x]);
+ set_red_rgb565(scan_out[x], (uint16_t)(scan_range[max] * red_rgb565(scan_in[x])));
+ set_green_rgb565(scan_out[x], (uint16_t)(scan_range[max] * green_rgb565(scan_in[x])));
+ set_blue_rgb565(scan_out[x], (uint16_t)(scan_range[max] * blue_rgb565(scan_in[x])));
+ }
+}
+
+static unsigned phosphor2x_generic_input_fmts(void)
+{
+ return SOFTFILTER_FMT_RGB565 | SOFTFILTER_FMT_XRGB8888;
+}
+
+static unsigned phosphor2x_generic_output_fmts(unsigned input_fmts)
+{
+ return input_fmts;
+}
+
+static unsigned phosphor2x_generic_threads(void *data)
+{
+ struct filter_data *filt = (struct filter_data*)data;
+ return filt->threads;
+}
+
+static void *phosphor2x_generic_create(unsigned in_fmt, unsigned out_fmt,
+ unsigned max_width, unsigned max_height,
+ unsigned threads, softfilter_simd_mask_t simd)
+{
+ (void)simd;
+
+ struct filter_data *filt = (struct filter_data*)calloc(1, sizeof(*filt));
+ if (!filt)
+ return NULL;
+ filt->workers = (struct softfilter_thread_data*)calloc(threads, sizeof(struct softfilter_thread_data));
+ filt->threads = threads;
+ filt->in_fmt = in_fmt;
+ if (!filt->workers)
+ {
+ free(filt);
+ return NULL;
+ }
+ return filt;
+}
+
+static void phosphor2x_generic_output(void *data, unsigned *out_width, unsigned *out_height,
+ unsigned width, unsigned height)
+{
+ *out_width = width * PHOSPHOR2X_SCALE;
+ *out_height = height * PHOSPHOR2X_SCALE;
+}
+
+static void phosphor2x_generic_destroy(void *data)
+{
+ struct filter_data *filt = (struct filter_data*)data;
+ free(filt->workers);
+ free(filt);
+}
+
+static void phosphor2x_generic_xrgb8888(unsigned width, unsigned height,
+ int first, int last, uint32_t *src,
+ unsigned src_stride, uint32_t *dst, unsigned dst_stride)
+{
+ unsigned y;
+ static bool filter_inited = false;
+
+ if (!filter_inited)
+ {
+ unsigned i;
+ // Init lookup tables:
+ // phosphorBloom = (scaleTimes .* linspace(0, 1, 255) .^ (1/2.2)) + scaleAdd;
+ // Not exactly sure of order of operations here ...
+ for (i = 0; i < 256; i++)
+ {
+ phosphor_bloom[i] = scale_times * powf((float)i / 255.0f, 1.0f/2.2f) + scale_add;
+ scan_range[i] = scanrange_low + i * (scanrange_high - scanrange_low) / 255.0f;
+ }
+ filter_inited = true;
+ }
+
+ memset(dst, 0, height * dst_stride);
+
+ for (y = 0; y < height; y++)
+ {
+ uint32_t *out_line = (uint32_t*)(dst + y * (dst_stride) * 2); // Output in a scanlines fashion.
+ const uint32_t *in_line = (const uint32_t*)(src + y * (src_stride)); // Input
+
+ blit_linear_line_xrgb8888(out_line, in_line, width); // Bilinear stretch horizontally.
+ bleed_phosphors_xrgb8888(out_line, width << 1); // Mask 'n bleed phosphors.
+ stretch_scanline_xrgb8888(out_line, out_line + (dst_stride), width << 1); // Apply scanlines.
+ }
+}
+
+static void phosphor2x_generic_rgb565(unsigned width, unsigned height,
+ int first, int last, uint16_t *src,
+ unsigned src_stride, uint16_t *dst, unsigned dst_stride)
+{
+ unsigned y;
+ static bool filter_inited = false;
+
+ if (!filter_inited)
+ {
+ unsigned i;
+ // Init lookup tables:
+ // phosphorBloom = (scaleTimes .* linspace(0, 1, 255) .^ (1/2.2)) + scaleAdd;
+ // Not exactly sure of order of operations here ...
+ for (i = 0; i < 256; i++)
+ {
+ phosphor_bloom[i] = scale_times * powf((float)i / 255.0f, 1.0f/2.2f) + scale_add;
+ scan_range[i] = scanrange_low + i * (scanrange_high - scanrange_low) / 255.0f;
+ }
+ filter_inited = true;
+ }
+
+ memset(dst, 0, height * dst_stride);
+
+ for (y = 0; y < height; y++)
+ {
+ uint16_t *out_line = (uint16_t*)(dst + y * (dst_stride) * 2); // Output in a scanlines fashion.
+ const uint16_t *in_line = (const uint16_t*)(src + y * (src_stride)); // Input
+
+ blit_linear_line_rgb565(out_line, in_line, width); // Bilinear stretch horizontally.
+ bleed_phosphors_rgb565(out_line, width << 1); // Mask 'n bleed phosphors.
+ stretch_scanline_rgb565(out_line, out_line + (dst_stride), width << 1); // Apply scanlines.
+ }
+}
+
+static void phosphor2x_work_cb_xrgb8888(void *data, void *thread_data)
+{
+ struct softfilter_thread_data *thr = (struct softfilter_thread_data*)thread_data;
+ uint32_t *input = (uint32_t*)thr->in_data;
+ uint32_t *output = (uint32_t*)thr->out_data;
+ unsigned width = thr->width;
+ unsigned height = thr->height;
+
+ phosphor2x_generic_xrgb8888(width, height,
+ thr->first, thr->last, input, thr->in_pitch / SOFTFILTER_BPP_XRGB8888, output, thr->out_pitch / SOFTFILTER_BPP_XRGB8888);
+}
+
+static void phosphor2x_work_cb_rgb565(void *data, void *thread_data)
+{
+ struct softfilter_thread_data *thr = (struct softfilter_thread_data*)thread_data;
+ uint16_t *input = (uint16_t*)thr->in_data;
+ uint16_t *output = (uint16_t*)thr->out_data;
+ unsigned width = thr->width;
+ unsigned height = thr->height;
+
+ phosphor2x_generic_rgb565(width, height,
+ thr->first, thr->last, input, thr->in_pitch / SOFTFILTER_BPP_RGB565, output, thr->out_pitch / SOFTFILTER_BPP_RGB565);
+}
+
+static void phosphor2x_generic_packets(void *data,
+ struct softfilter_work_packet *packets,
+ void *output, size_t output_stride,
+ const void *input, unsigned width, unsigned height, size_t input_stride)
+{
+ struct filter_data *filt = (struct filter_data*)data;
+ unsigned i;
+ for (i = 0; i < filt->threads; i++)
+ {
+ struct softfilter_thread_data *thr = (struct softfilter_thread_data*)&filt->workers[i];
+
+ unsigned y_start = (height * i) / filt->threads;
+ unsigned y_end = (height * (i + 1)) / filt->threads;
+ thr->out_data = (uint8_t*)output + y_start * PHOSPHOR2X_SCALE * output_stride;
+ thr->in_data = (const uint8_t*)input + y_start * input_stride;
+ thr->out_pitch = output_stride;
+ thr->in_pitch = input_stride;
+ thr->width = width;
+ thr->height = y_end - y_start;
+
+ // Workers need to know if they can access pixels outside their given buffer.
+ thr->first = y_start;
+ thr->last = y_end == height;
+
+ if (filt->in_fmt == SOFTFILTER_FMT_RGB565)
+ packets[i].work = phosphor2x_work_cb_rgb565;
+ //else if (filt->in_fmt == SOFTFILTER_FMT_RGB4444)
+ //packets[i].work = phosphor2x_work_cb_rgb4444;
+ if (filt->in_fmt == SOFTFILTER_FMT_XRGB8888)
+ packets[i].work = phosphor2x_work_cb_xrgb8888;
+ packets[i].thread_data = thr;
+ }
+}
+
+static const struct softfilter_implementation phosphor2x_generic = {
+ phosphor2x_generic_input_fmts,
+ phosphor2x_generic_output_fmts,
+
+ phosphor2x_generic_create,
+ phosphor2x_generic_destroy,
+
+ phosphor2x_generic_threads,
+ phosphor2x_generic_output,
+ phosphor2x_generic_packets,
+ "Phosphor2x",
+ SOFTFILTER_API_VERSION,
+};
+
+const struct softfilter_implementation *softfilter_get_implementation(softfilter_simd_mask_t simd)
+{
+ (void)simd;
+ return &phosphor2x_generic;
+}
+
+#ifdef RARCH_INTERNAL
+#undef softfilter_get_implementation
+#endif
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 9b5a44b067..a8a2834aab 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -481,6 +481,7 @@ FILTERS
#include "../gfx/filters/blargg_ntsc_snes_svideo.c"
#include "../gfx/filters/blargg_ntsc_snes_rgb.c"
#include "../gfx/filters/lq2x.c"
+#include "../gfx/filters/phosphor2x.c"
#include "../audio/filters/echo.c"
#ifndef _WIN32