diff --git a/desmume/ChangeLog b/desmume/ChangeLog
index 27ff030cf..a2fbe328d 100644
--- a/desmume/ChangeLog
+++ b/desmume/ChangeLog
@@ -32,9 +32,11 @@ Graphics:
   
 Windows:
  bug: improve map view tool to support more modes
- enh: added 2x resizing filters (hq2x, 2xsai, supereagle, scanlines)
+ enh: added 2x resizing filters (hq2x, hq2xs, lq2x, lq2xs, 2xsai, supereagle)
+                                (scanlines, nearest, bilinear)
  enh: soundview can now mute channels
  enh: multicore optimization for filters, rotation, OSD
+ enh: new ioregview
 
 Linux:
  enh: alsa microphone support
diff --git a/desmume/src/windows/DeSmuME_2005.vcproj b/desmume/src/windows/DeSmuME_2005.vcproj
index a0b2333b7..e4d68aab5 100644
--- a/desmume/src/windows/DeSmuME_2005.vcproj
+++ b/desmume/src/windows/DeSmuME_2005.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="shift_jis"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
@@ -922,6 +922,22 @@
 					RelativePath=".\filter\hq2x.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\filter\hq2x.h"
+					>
+				</File>
+				<File
+					RelativePath=".\filter\interp.h"
+					>
+				</File>
+				<File
+					RelativePath=".\filter\lq2x.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\filter\lq2x.h"
+					>
+				</File>
 				<File
 					RelativePath=".\filter\scanline.cpp"
 					>
diff --git a/desmume/src/windows/DeSmuME_2008.vcproj b/desmume/src/windows/DeSmuME_2008.vcproj
index 6248b6a6f..f14b2f1f7 100644
--- a/desmume/src/windows/DeSmuME_2008.vcproj
+++ b/desmume/src/windows/DeSmuME_2008.vcproj
@@ -1243,6 +1243,10 @@
 					RelativePath=".\filter\hq2x.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\filter\lq2x.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\filter\scanline.cpp"
 					>
diff --git a/desmume/src/windows/IORegView.cpp b/desmume/src/windows/IORegView.cpp
index b05be383b..ae90adf60 100644
--- a/desmume/src/windows/IORegView.cpp
+++ b/desmume/src/windows/IORegView.cpp
@@ -27,6 +27,12 @@
 #include "../MMU.h"
 #include "../armcpu.h"
 
+//this message is only supported in vista so folks sdk might not have it.
+//therefore we shall declare it here
+#ifndef RB_SETBANDWIDTH
+#define RB_SETBANDWIDTH     (WM_USER + 44)   // set width for docked band
+#endif
+
 /*--------------------------------------------------------------------------*/
 
 enum EIORegType
diff --git a/desmume/src/windows/filter/filter.h b/desmume/src/windows/filter/filter.h
index ac5914004..8cc9fbfc1 100644
--- a/desmume/src/windows/filter/filter.h
+++ b/desmume/src/windows/filter/filter.h
@@ -15,17 +15,20 @@
     You should have received a copy of the GNU General Public License
     along with DeSmuME; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
-*/
-
-struct SSurface {
-	unsigned char *Surface;
-
-	unsigned int Pitch;
+*/
+
+struct SSurface {
+	unsigned char *Surface;
+
+	unsigned int Pitch;
 	unsigned int Width, Height;
 };
 
 void RenderNearest2X (SSurface Src, SSurface Dst);
+void RenderLQ2X (SSurface Src, SSurface Dst);
+void RenderLQ2XS (SSurface Src, SSurface Dst);
 void RenderHQ2X (SSurface Src, SSurface Dst);
+void RenderHQ2XS (SSurface Src, SSurface Dst);
 void Render2xSaI (SSurface Src, SSurface Dst);
 void RenderSuper2xSaI (SSurface Src, SSurface Dst);
 void RenderSuperEagle (SSurface Src, SSurface Dst);
diff --git a/desmume/src/windows/filter/hq2x.cpp b/desmume/src/windows/filter/hq2x.cpp
index 7687bc55b..2c8f94300 100644
--- a/desmume/src/windows/filter/hq2x.cpp
+++ b/desmume/src/windows/filter/hq2x.cpp
@@ -273,21 +273,33 @@ static void hq2xS_16_def(u16* dst0, u16* dst1, const u16* src0, const u16* src1,
   unsigned i;
 
   for(i=0;i<count;++i) {
-    unsigned char mask;
+	unsigned char mask;
 
-    u16 c[9];
+	u16 c[9];
 
-    c[1] = src0[0];
-    c[4] = src1[0];
-    c[7] = src2[0];
+	c[1] = src0[0];
+	c[4] = src1[0];
+	c[7] = src2[0];
 
-    c[0] = src0[-1];
-    c[3] = src1[-1];
-    c[6] = src2[-1];
+	if (i>0) {
+	 c[0] = src0[-1];
+	 c[3] = src1[-1];
+	 c[6] = src2[-1];
+	} else {
+	 c[0] = c[1];
+	 c[3] = c[4];
+	 c[6] = c[7];
+	}
 
-    c[2] = src0[1];
-    c[5] = src1[1];
-    c[8] = src2[1];
+	if (i<count-1) {
+	 c[2] = src0[1];
+	 c[5] = src1[1];
+	 c[8] = src2[1];
+	} else {
+	 c[2] = c[1];
+	 c[5] = c[4];
+	 c[8] = c[7];
+	}
 
 	mask = 0;
 
@@ -400,25 +412,36 @@ static void hq2xS_32_def(u32* dst0, u32* dst1, const u32* src0, const u32* src1,
 {
   unsigned i;
 
-  for(i=0;i<count;++i) {
-    unsigned char mask;
+   for(i=0;i<count;++i) {
+      unsigned char mask;
 
-    u32 c[9];
+      u32 c[9];
 
-    c[1] = src0[0];
-    c[4] = src1[0];
-    c[7] = src2[0];
+      c[1] = src0[0];
+      c[4] = src1[0];
+      c[7] = src2[0];
 
-    c[0] = src0[-1];
-    c[3] = src1[-1];
-    c[6] = src2[-1];
+      if (i>0) {
+         c[0] = src0[-1];
+         c[3] = src1[-1];
+         c[6] = src2[-1];
+      } else {
+         c[0] = src0[0];
+         c[3] = src1[0];
+         c[6] = src2[0];
+      }
 
-    c[2] = src0[1];
-    c[5] = src1[1];
-    c[8] = src2[1];
+      if (i<count-1) {
+         c[2] = src0[1];
+         c[5] = src1[1];
+         c[8] = src2[1];
+      } else {
+         c[2] = src0[0];
+         c[5] = src1[0];
+         c[8] = src2[0];
+      }
 
 	mask = 0;
-
 	// hq2xS dynamic edge detection:
 	// simply comparing the center color against its surroundings will give bad results in many cases,
 	// so, instead, compare the center color relative to the max difference in brightness of this 3x3 block
@@ -458,7 +481,6 @@ static void hq2xS_32_def(u32* dst0, u32* dst1, const u32* src0, const u32* src1,
 		if(ABS(brightArray[8] - centerBright) > diffBright)
 			mask |= 1 << 7;
 	}
-
 #define P0 dst0[0]
 #define P1 dst0[1]
 #define P2 dst1[0]
@@ -648,3 +670,16 @@ void RenderHQ2X (SSurface Src, SSurface Dst)
                 lpSrc,
                 lpDst, Dst.Pitch*2 , Src.Width, Src.Height);
 }
+
+void RenderHQ2XS (SSurface Src, SSurface Dst)
+{
+
+    unsigned char *lpSrc, *lpDst;
+
+    lpSrc = Src.Surface;
+    lpDst = Dst.Surface;
+
+    hq2xS32 (lpSrc, Src.Pitch*2,
+                lpSrc,
+                lpDst, Dst.Pitch*2 , Src.Width, Src.Height);
+}
diff --git a/desmume/src/windows/filter/lq2x.cpp b/desmume/src/windows/filter/lq2x.cpp
new file mode 100644
index 000000000..f1bdfd918
--- /dev/null
+++ b/desmume/src/windows/filter/lq2x.cpp
@@ -0,0 +1,667 @@
+/*
+ * This file is part of the Advance project.
+ *
+ * Copyright (C) 2003 Andrea Mazzoleni
+ *
+ * This program 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 Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * In addition, as a special exception, Andrea Mazzoleni
+ * gives permission to link the code of this program with
+ * the MAME library (or with modified versions of MAME that use the
+ * same license as MAME), and distribute linked combinations including
+ * the two.  You must obey the GNU General Public License in all
+ * respects for all of the code used other than MAME.  If you modify
+ * this file, you may extend this exception to your version of the
+ * file, but you are not obligated to do so.  If you do not wish to
+ * do so, delete this exception statement from your version.
+ */
+
+#include "filter.h"
+#include "interp.h"
+
+static void lq2x_16_def(u16* dst0, u16* dst1, const u16* src0, const u16* src1, const u16* src2, unsigned count)
+{
+	unsigned i;
+
+	for(i=0;i<count;++i) {
+		unsigned char mask;
+
+		u16 c[9];
+
+		c[1] = src0[0];
+		c[4] = src1[0];
+		c[7] = src2[0];
+
+		if (i>0) {
+			c[0] = src0[-1];
+			c[3] = src1[-1];
+			c[6] = src2[-1];
+		} else {
+			c[0] = c[1];
+			c[3] = c[4];
+			c[6] = c[7];
+		}
+
+		if (i<count-1) {
+			c[2] = src0[1];
+			c[5] = src1[1];
+			c[8] = src2[1];
+		} else {
+			c[2] = c[1];
+			c[5] = c[4];
+			c[8] = c[7];
+		}
+
+		mask = 0;
+
+		if (c[0] != c[4])
+			mask |= 1 << 0;
+		if (c[1] != c[4])
+			mask |= 1 << 1;
+		if (c[2] != c[4])
+			mask |= 1 << 2;
+		if (c[3] != c[4])
+			mask |= 1 << 3;
+		if (c[5] != c[4])
+			mask |= 1 << 4;
+		if (c[6] != c[4])
+			mask |= 1 << 5;
+		if (c[7] != c[4])
+			mask |= 1 << 6;
+		if (c[8] != c[4])
+			mask |= 1 << 7;
+
+#define P0 dst0[0]
+#define P1 dst0[1]
+#define P2 dst1[0]
+#define P3 dst1[1]
+#define MUR (c[1] != c[5])
+#define MDR (c[5] != c[7])
+#define MDL (c[7] != c[3])
+#define MUL (c[3] != c[1])
+#define IC(p0) c[p0]
+#define I11(p0,p1) interp_16_11(c[p0], c[p1])
+#define I211(p0,p1,p2) interp_16_211(c[p0], c[p1], c[p2])
+#define I31(p0,p1) interp_16_31(c[p0], c[p1])
+#define I332(p0,p1,p2) interp_16_332(c[p0], c[p1], c[p2])
+#define I431(p0,p1,p2) interp_16_431(c[p0], c[p1], c[p2])
+#define I521(p0,p1,p2) interp_16_521(c[p0], c[p1], c[p2])
+#define I53(p0,p1) interp_16_53(c[p0], c[p1])
+#define I611(p0,p1,p2) interp_16_611(c[p0], c[p1], c[p2])
+#define I71(p0,p1) interp_16_71(c[p0], c[p1])
+#define I772(p0,p1,p2) interp_16_772(c[p0], c[p1], c[p2])
+#define I97(p0,p1) interp_16_97(c[p0], c[p1])
+#define I1411(p0,p1,p2) interp_16_1411(c[p0], c[p1], c[p2])
+#define I151(p0,p1) interp_16_151(c[p0], c[p1])
+
+		switch (mask) {
+#include "lq2x.h"
+		}
+
+#undef P0
+#undef P1
+#undef P2
+#undef P3
+#undef MUR
+#undef MDR
+#undef MDL
+#undef MUL
+#undef IC
+#undef I11
+#undef I211
+#undef I31
+#undef I332
+#undef I431
+#undef I521
+#undef I53
+#undef I611
+#undef I71
+#undef I772
+#undef I97
+#undef I1411
+#undef I151
+
+		src0 += 1;
+		src1 += 1;
+		src2 += 1;
+		dst0 += 2;
+		dst1 += 2;
+	}
+}
+
+static void lq2xS_16_def(u16* dst0, u16* dst1, const u16* src0, const u16* src1, const u16* src2, unsigned count)
+{
+   unsigned i;
+
+   for(i=0;i<count;++i) {
+      unsigned char mask;
+
+      u16 c[9];
+
+      c[1] = src0[0];
+      c[4] = src1[0];
+      c[7] = src2[0];
+
+      if (i>0) {
+         c[0] = src0[-1];
+         c[3] = src1[-1];
+         c[6] = src2[-1];
+      } else {
+         c[0] = c[1];
+         c[3] = c[4];
+         c[6] = c[7];
+      }
+
+      if (i<count-1) {
+         c[2] = src0[1];
+         c[5] = src1[1];
+         c[8] = src2[1];
+      } else {
+         c[2] = c[1];
+         c[5] = c[4];
+         c[8] = c[7];
+      }
+
+    // lq2xS dynamic edge detection:
+	// simply comparing the center color against its surroundings will give bad results in many cases,
+	// so, instead, compare the center color relative to the max difference in brightness of this 3x3 block
+	int brightArray[9];
+	int maxBright = 0, minBright = 999999;
+	for(int j = 0 ; j < 9 ; j++)
+	{
+		const int b = (int)((c[j] & 0xF8));
+		const int g = (int)((c[j] & 0xF800)) >> 8;
+		const int r = (int)((c[j] & 0xF80000)) >> 16;
+		const int bright = r+r+r + g+g+g + b+b;
+		if(bright > maxBright) maxBright = bright;
+		if(bright < minBright) minBright = bright;
+
+		brightArray[j] = bright;
+	}
+	int diffBright = ((maxBright - minBright) * 7) >> 4;
+	if(diffBright > 7)
+	{
+		#define ABS(x) ((x) < 0 ? -(x) : (x))
+
+		const int centerBright = brightArray[4];
+		if(ABS(brightArray[0] - centerBright) > diffBright)
+			mask |= 1 << 0;
+		if(ABS(brightArray[1] - centerBright) > diffBright)
+			mask |= 1 << 1;
+		if(ABS(brightArray[2] - centerBright) > diffBright)
+			mask |= 1 << 2;
+		if(ABS(brightArray[3] - centerBright) > diffBright)
+			mask |= 1 << 3;
+		if(ABS(brightArray[5] - centerBright) > diffBright)
+			mask |= 1 << 4;
+		if(ABS(brightArray[6] - centerBright) > diffBright)
+			mask |= 1 << 5;
+		if(ABS(brightArray[7] - centerBright) > diffBright)
+			mask |= 1 << 6;
+		if(ABS(brightArray[8] - centerBright) > diffBright)
+			mask |= 1 << 7;
+	}
+
+#define P0 dst0[0]
+#define P1 dst0[1]
+#define P2 dst1[0]
+#define P3 dst1[1]
+#define MUR false
+#define MDR false
+#define MDL false
+#define MUL false
+#define IC(p0) c[p0]
+#define I11(p0,p1) interp_16_11(c[p0], c[p1])
+#define I211(p0,p1,p2) interp_16_211(c[p0], c[p1], c[p2])
+#define I31(p0,p1) interp_16_31(c[p0], c[p1])
+#define I332(p0,p1,p2) interp_16_332(c[p0], c[p1], c[p2])
+#define I431(p0,p1,p2) interp_16_431(c[p0], c[p1], c[p2])
+#define I521(p0,p1,p2) interp_16_521(c[p0], c[p1], c[p2])
+#define I53(p0,p1) interp_16_53(c[p0], c[p1])
+#define I611(p0,p1,p2) interp_16_611(c[p0], c[p1], c[p2])
+#define I71(p0,p1) interp_16_71(c[p0], c[p1])
+#define I772(p0,p1,p2) interp_16_772(c[p0], c[p1], c[p2])
+#define I97(p0,p1) interp_16_97(c[p0], c[p1])
+#define I1411(p0,p1,p2) interp_16_1411(c[p0], c[p1], c[p2])
+#define I151(p0,p1) interp_16_151(c[p0], c[p1])
+
+      switch (mask) {
+#include "lq2x.h"
+      }
+
+#undef P0
+#undef P1
+#undef P2
+#undef P3
+#undef MUR
+#undef MDR
+#undef MDL
+#undef MUL
+#undef IC
+#undef I11
+#undef I211
+#undef I31
+#undef I332
+#undef I431
+#undef I521
+#undef I53
+#undef I611
+#undef I71
+#undef I772
+#undef I97
+#undef I1411
+#undef I151
+
+      src0 += 1;
+      src1 += 1;
+      src2 += 1;
+      dst0 += 2;
+      dst1 += 2;
+   }
+}
+
+static void lq2x_32_def(u32* dst0, u32* dst1, const u32* src0, const u32* src1, const u32* src2, unsigned count)
+{
+	unsigned i;
+
+	for(i=0;i<count;++i) {
+		unsigned char mask;
+
+		u32 c[9];
+
+		c[1] = src0[0];
+		c[4] = src1[0];
+		c[7] = src2[0];
+
+		if (i>0) {
+			c[0] = src0[-1];
+			c[3] = src1[-1];
+			c[6] = src2[-1];
+		} else {
+			c[0] = c[1];
+			c[3] = c[4];
+			c[6] = c[7];
+		}
+
+		if (i<count-1) {
+			c[2] = src0[1];
+			c[5] = src1[1];
+			c[8] = src2[1];
+		} else {
+			c[2] = c[1];
+			c[5] = c[4];
+			c[8] = c[7];
+		}
+
+		mask = 0;
+
+		if (c[0] != c[4])
+			mask |= 1 << 0;
+		if (c[1] != c[4])
+			mask |= 1 << 1;
+		if (c[2] != c[4])
+			mask |= 1 << 2;
+		if (c[3] != c[4])
+			mask |= 1 << 3;
+		if (c[5] != c[4])
+			mask |= 1 << 4;
+		if (c[6] != c[4])
+			mask |= 1 << 5;
+		if (c[7] != c[4])
+			mask |= 1 << 6;
+		if (c[8] != c[4])
+			mask |= 1 << 7;
+
+#define P0 dst0[0]
+#define P1 dst0[1]
+#define P2 dst1[0]
+#define P3 dst1[1]
+#define MUR (c[1] != c[5])
+#define MDR (c[5] != c[7])
+#define MDL (c[7] != c[3])
+#define MUL (c[3] != c[1])
+#define IC(p0) c[p0]
+#define I11(p0,p1) interp_32_11(c[p0], c[p1])
+#define I211(p0,p1,p2) interp_32_211(c[p0], c[p1], c[p2])
+#define I31(p0,p1) interp_32_31(c[p0], c[p1])
+#define I332(p0,p1,p2) interp_32_332(c[p0], c[p1], c[p2])
+#define I431(p0,p1,p2) interp_32_431(c[p0], c[p1], c[p2])
+#define I521(p0,p1,p2) interp_32_521(c[p0], c[p1], c[p2])
+#define I53(p0,p1) interp_32_53(c[p0], c[p1])
+#define I611(p0,p1,p2) interp_32_611(c[p0], c[p1], c[p2])
+#define I71(p0,p1) interp_32_71(c[p0], c[p1])
+#define I772(p0,p1,p2) interp_32_772(c[p0], c[p1], c[p2])
+#define I97(p0,p1) interp_32_97(c[p0], c[p1])
+#define I1411(p0,p1,p2) interp_32_1411(c[p0], c[p1], c[p2])
+#define I151(p0,p1) interp_32_151(c[p0], c[p1])
+
+		switch (mask) {
+#include "lq2x.h"
+		}
+
+#undef P0
+#undef P1
+#undef P2
+#undef P3
+#undef MUR
+#undef MDR
+#undef MDL
+#undef MUL
+#undef IC
+#undef I11
+#undef I211
+#undef I31
+#undef I332
+#undef I431
+#undef I521
+#undef I53
+#undef I611
+#undef I71
+#undef I772
+#undef I97
+#undef I1411
+#undef I151
+
+		src0 += 1;
+		src1 += 1;
+		src2 += 1;
+		dst0 += 2;
+		dst1 += 2;
+	}
+}
+
+static void lq2xS_32_def(u32* dst0, u32* dst1, const u32* src0, const u32* src1, const u32* src2, unsigned count)
+{
+   unsigned i;
+
+   for(i=0;i<count;++i) {
+      unsigned char mask;
+
+      u32 c[9];
+
+      c[1] = src0[0];
+      c[4] = src1[0];
+      c[7] = src2[0];
+
+      if (i>0) {
+         c[0] = src0[-1];
+         c[3] = src1[-1];
+         c[6] = src2[-1];
+      } else {
+         c[0] = c[1];
+         c[3] = c[4];
+         c[6] = c[7];
+      }
+
+      if (i<count-1) {
+         c[2] = src0[1];
+         c[5] = src1[1];
+         c[8] = src2[1];
+      } else {
+         c[2] = c[1];
+         c[5] = c[4];
+         c[8] = c[7];
+      }
+
+       // lq2xS dynamic edge detection:
+	// simply comparing the center color against its surroundings will give bad results in many cases,
+	// so, instead, compare the center color relative to the max difference in brightness of this 3x3 block
+	int brightArray[9];
+	int maxBright = 0, minBright = 999999;
+	for(int j = 0 ; j < 9 ; j++)
+	{
+		const int b = (int)((c[j] & 0xF8));
+		const int g = (int)((c[j] & 0xF800)) >> 8;
+		const int r = (int)((c[j] & 0xF80000)) >> 16;
+		const int bright = r+r+r + g+g+g + b+b;
+		if(bright > maxBright) maxBright = bright;
+		if(bright < minBright) minBright = bright;
+
+		brightArray[j] = bright;
+	}
+	int diffBright = ((maxBright - minBright) * 7) >> 4;
+	if(diffBright > 7)
+	{
+		#define ABS(x) ((x) < 0 ? -(x) : (x))
+
+		const int centerBright = brightArray[4];
+		if(ABS(brightArray[0] - centerBright) > diffBright)
+			mask |= 1 << 0;
+		if(ABS(brightArray[1] - centerBright) > diffBright)
+			mask |= 1 << 1;
+		if(ABS(brightArray[2] - centerBright) > diffBright)
+			mask |= 1 << 2;
+		if(ABS(brightArray[3] - centerBright) > diffBright)
+			mask |= 1 << 3;
+		if(ABS(brightArray[5] - centerBright) > diffBright)
+			mask |= 1 << 4;
+		if(ABS(brightArray[6] - centerBright) > diffBright)
+			mask |= 1 << 5;
+		if(ABS(brightArray[7] - centerBright) > diffBright)
+			mask |= 1 << 6;
+		if(ABS(brightArray[8] - centerBright) > diffBright)
+			mask |= 1 << 7;
+	}
+
+#define P0 dst0[0]
+#define P1 dst0[1]
+#define P2 dst1[0]
+#define P3 dst1[1]
+#define MUR false
+#define MDR false
+#define MDL false
+#define MUL false
+#define IC(p0) c[p0]
+#define I11(p0,p1) interp_32_11(c[p0], c[p1])
+#define I211(p0,p1,p2) interp_32_211(c[p0], c[p1], c[p2])
+#define I31(p0,p1) interp_32_31(c[p0], c[p1])
+#define I332(p0,p1,p2) interp_32_332(c[p0], c[p1], c[p2])
+#define I431(p0,p1,p2) interp_32_431(c[p0], c[p1], c[p2])
+#define I521(p0,p1,p2) interp_32_521(c[p0], c[p1], c[p2])
+#define I53(p0,p1) interp_32_53(c[p0], c[p1])
+#define I611(p0,p1,p2) interp_32_611(c[p0], c[p1], c[p2])
+#define I71(p0,p1) interp_32_71(c[p0], c[p1])
+#define I772(p0,p1,p2) interp_32_772(c[p0], c[p1], c[p2])
+#define I97(p0,p1) interp_32_97(c[p0], c[p1])
+#define I1411(p0,p1,p2) interp_32_1411(c[p0], c[p1], c[p2])
+#define I151(p0,p1) interp_32_151(c[p0], c[p1])
+
+      switch (mask) {
+#include "lq2x.h"
+      }
+
+#undef P0
+#undef P1
+#undef P2
+#undef P3
+#undef MUR
+#undef MDR
+#undef MDL
+#undef MUL
+#undef IC
+#undef I11
+#undef I211
+#undef I31
+#undef I332
+#undef I431
+#undef I521
+#undef I53
+#undef I611
+#undef I71
+#undef I772
+#undef I97
+#undef I1411
+#undef I151
+
+      src0 += 1;
+      src1 += 1;
+      src2 += 1;
+      dst0 += 2;
+      dst1 += 2;
+   }
+}
+void lq2x16(u8 *srcPtr, u32 srcPitch, u8 * /* deltaPtr */,
+			u8 *dstPtr, u32 dstPitch, int width, int height)
+{
+	u16 *dst0 = (u16 *)dstPtr;
+	u16 *dst1 = dst0 + (dstPitch >> 1);
+
+	u16 *src0 = (u16 *)srcPtr;
+	u16 *src1 = src0 + (srcPitch >> 1);
+	u16 *src2 = src1 + (srcPitch >> 1);
+
+	lq2x_16_def(dst0, dst1, src0, src0, src1, width);
+	if( height == 1 ) return;
+
+	int count = height;
+
+	count -= 2;
+	while(count>0) {
+		dst0 += dstPitch;
+		dst1 += dstPitch;
+		lq2x_16_def(dst0, dst1, src0, src1, src2, width);
+		src0 = src1;
+		src1 = src2;
+		src2 += srcPitch >> 1;
+		--count;
+	}
+	dst0 += dstPitch;
+	dst1 += dstPitch;
+	lq2x_16_def(dst0, dst1, src0, src1, src1, width);
+}
+
+void lq2xS16(u8 *srcPtr, u32 srcPitch, u8 * /* deltaPtr */,
+			 u8 *dstPtr, u32 dstPitch, int width, int height)
+{
+   u16 *dst0 = (u16 *)dstPtr;
+   u16 *dst1 = dst0 + (dstPitch >> 1);
+
+   u16 *src0 = (u16 *)srcPtr;
+   u16 *src1 = src0 + (srcPitch >> 1);
+   u16 *src2 = src1 + (srcPitch >> 1);
+
+        int count;
+
+   lq2xS_16_def(dst0, dst1, src0, src0, src1, width);
+   if( height == 1 ) return;
+
+   count = height;
+
+   count -= 2;
+   while(count>0) {
+      dst0 += dstPitch;
+      dst1 += dstPitch;
+      lq2x_16_def(dst0, dst1, src0, src1, src2, width);
+      src0 = src1;
+      src1 = src2;
+      src2 += srcPitch >> 1;
+      --count;
+   }
+   dst0 += dstPitch;
+   dst1 += dstPitch;
+   lq2xS_16_def(dst0, dst1, src0, src1, src1, width);
+}
+
+void lq2x32(u8 *srcPtr, u32 srcPitch, u8 * /* deltaPtr */,
+			u8 *dstPtr, u32 dstPitch, int width, int height)
+{
+	u32 *dst0 = (u32 *)dstPtr;
+	u32 *dst1 = dst0 + (dstPitch >> 2);
+
+	u32 *src0 = (u32 *)srcPtr;
+	u32 *src1 = src0 + (srcPitch >> 2);
+	u32 *src2 = src1 + (srcPitch >> 2);
+	lq2x_32_def(dst0, dst1, src0, src0, src1, width);
+	if( height == 1 ) return;
+
+	int count = height;
+
+	count -= 2;
+	while(count>0) {
+		dst0 += dstPitch >> 1;
+		dst1 += dstPitch >> 1;
+		lq2x_32_def(dst0, dst1, src0, src1, src2, width);
+		src0 = src1;
+		src1 = src2;
+		src2 += srcPitch >> 2;
+		--count;
+	}
+	dst0 += dstPitch >> 1;
+	dst1 += dstPitch >> 1;
+	lq2x_32_def(dst0, dst1, src0, src1, src1, width);
+}
+
+void lq2xS32(u8 *srcPtr, u32 srcPitch, u8 * /* deltaPtr */,
+			 u8 *dstPtr, u32 dstPitch, int width, int height)
+{
+   u32 *dst0 = (u32 *)dstPtr;
+   u32 *dst1 = dst0 + (dstPitch >> 2);
+
+   u32 *src0 = (u32 *)srcPtr;
+   u32 *src1 = src0 + (srcPitch >> 2);
+   u32 *src2 = src1 + (srcPitch >> 2);
+
+        int count;
+
+   lq2xS_32_def(dst0, dst1, src0, src0, src1, width);
+   if( height == 1 ) return;
+
+   count = height;
+
+   count -= 2;
+   while(count>0) {
+      dst0 += dstPitch >> 1;
+      dst1 += dstPitch >> 1;
+      lq2x_32_def(dst0, dst1, src0, src1, src2, width);
+      src0 = src1;
+      src1 = src2;
+      src2 += srcPitch >> 2;
+      --count;
+   }
+   dst0 += dstPitch >> 1;
+   dst1 += dstPitch >> 1;
+   lq2xS_32_def(dst0, dst1, src0, src1, src1, width);
+}
+
+void lq2x_init(unsigned bits_per_pixel)
+{
+	interp_set(bits_per_pixel);
+}
+
+void RenderLQ2X (SSurface Src, SSurface Dst)
+{
+
+    unsigned char *lpSrc, *lpDst;
+
+    lpSrc = Src.Surface;
+    lpDst = Dst.Surface;
+
+    lq2x32 (lpSrc, Src.Pitch*2,
+                lpSrc,
+                lpDst, Dst.Pitch*2 , Src.Width, Src.Height);
+}
+
+void RenderLQ2XS (SSurface Src, SSurface Dst)
+{
+
+    unsigned char *lpSrc, *lpDst;
+
+    lpSrc = Src.Surface;
+    lpDst = Dst.Surface;
+
+    lq2xS32 (lpSrc, Src.Pitch*2,
+                lpSrc,
+                lpDst, Dst.Pitch*2 , Src.Width, Src.Height);
+}
diff --git a/desmume/src/windows/filter/lq2x.h b/desmume/src/windows/filter/lq2x.h
new file mode 100644
index 000000000..7656d18f7
--- /dev/null
+++ b/desmume/src/windows/filter/lq2x.h
@@ -0,0 +1,1284 @@
+case 0 : 
+case 2 : 
+case 4 : 
+case 6 : 
+case 8 : 
+case 12 : 
+case 16 : 
+case 20 : 
+case 24 : 
+case 28 : 
+case 32 : 
+case 34 : 
+case 36 : 
+case 38 : 
+case 40 : 
+case 44 : 
+case 48 : 
+case 52 : 
+case 56 : 
+case 60 : 
+case 64 : 
+case 66 : 
+case 68 : 
+case 70 : 
+case 96 : 
+case 98 : 
+case 100 : 
+case 102 : 
+case 128 : 
+case 130 : 
+case 132 : 
+case 134 : 
+case 136 : 
+case 140 : 
+case 144 : 
+case 148 : 
+case 152 : 
+case 156 : 
+case 160 : 
+case 162 : 
+case 164 : 
+case 166 : 
+case 168 : 
+case 172 : 
+case 176 : 
+case 180 : 
+case 184 : 
+case 188 : 
+case 192 : 
+case 194 : 
+case 196 : 
+case 198 : 
+case 224 : 
+case 226 : 
+case 228 : 
+case 230 : 
+{
+  P0 = IC(0);
+  P1 = IC(0);
+  P2 = IC(0);
+  P3 = IC(0);
+} break;
+case 1 : 
+case 5 : 
+case 9 : 
+case 13 : 
+case 17 : 
+case 21 : 
+case 25 : 
+case 29 : 
+case 33 : 
+case 37 : 
+case 41 : 
+case 45 : 
+case 49 : 
+case 53 : 
+case 57 : 
+case 61 : 
+case 65 : 
+case 69 : 
+case 97 : 
+case 101 : 
+case 129 : 
+case 133 : 
+case 137 : 
+case 141 : 
+case 145 : 
+case 149 : 
+case 153 : 
+case 157 : 
+case 161 : 
+case 165 : 
+case 169 : 
+case 173 : 
+case 177 : 
+case 181 : 
+case 185 : 
+case 189 : 
+case 193 : 
+case 197 : 
+case 225 : 
+case 229 : 
+{
+  P0 = IC(1);
+  P1 = IC(1);
+  P2 = IC(1);
+  P3 = IC(1);
+} break;
+case 3 : 
+case 35 : 
+case 67 : 
+case 99 : 
+case 131 : 
+case 163 : 
+case 195 : 
+case 227 : 
+{
+  P0 = IC(2);
+  P1 = IC(2);
+  P2 = IC(2);
+  P3 = IC(2);
+} break;
+case 7 : 
+case 39 : 
+case 71 : 
+case 103 : 
+case 135 : 
+case 167 : 
+case 199 : 
+case 231 : 
+{
+  P0 = IC(3);
+  P1 = IC(3);
+  P2 = IC(3);
+  P3 = IC(3);
+} break;
+case 10 : 
+case 138 : 
+{
+  P1 = IC(0);
+  P2 = IC(0);
+  P3 = IC(0);
+  if (MUL) {
+    P0 = IC(0);
+  } else {
+    P0 = I211(0, 1, 3);
+  }
+} break;
+case 11 : 
+case 27 : 
+case 75 : 
+case 139 : 
+case 155 : 
+case 203 : 
+{
+  P1 = IC(2);
+  P2 = IC(2);
+  P3 = IC(2);
+  if (MUL) {
+    P0 = IC(2);
+  } else {
+    P0 = I211(2, 1, 3);
+  }
+} break;
+case 14 : 
+case 142 : 
+{
+  P2 = IC(0);
+  P3 = IC(0);
+  if (MUL) {
+    P0 = IC(0);
+    P1 = IC(0);
+  } else {
+    P0 = I332(1, 3, 0);
+    P1 = I31(0, 1);
+  }
+} break;
+case 15 : 
+case 143 : 
+case 207 : 
+{
+  P2 = IC(4);
+  P3 = IC(4);
+  if (MUL) {
+    P0 = IC(4);
+    P1 = IC(4);
+  } else {
+    P0 = I332(1, 3, 4);
+    P1 = I31(4, 1);
+  }
+} break;
+case 18 : 
+case 22 : 
+case 30 : 
+case 50 : 
+case 54 : 
+case 62 : 
+case 86 : 
+case 118 : 
+{
+  P0 = IC(0);
+  P2 = IC(0);
+  P3 = IC(0);
+  if (MUR) {
+    P1 = IC(0);
+  } else {
+    P1 = I211(0, 1, 5);
+  }
+} break;
+case 19 : 
+case 51 : 
+{
+  P2 = IC(2);
+  P3 = IC(2);
+  if (MUR) {
+    P0 = IC(2);
+    P1 = IC(2);
+  } else {
+    P0 = I31(2, 1);
+    P1 = I332(1, 5, 2);
+  }
+} break;
+case 23 : 
+case 55 : 
+case 119 : 
+{
+  P2 = IC(3);
+  P3 = IC(3);
+  if (MUR) {
+    P0 = IC(3);
+    P1 = IC(3);
+  } else {
+    P0 = I31(3, 1);
+    P1 = I332(1, 5, 3);
+  }
+} break;
+case 26 : 
+{
+  P2 = IC(0);
+  P3 = IC(0);
+  if (MUL) {
+    P0 = IC(0);
+  } else {
+    P0 = I211(0, 1, 3);
+  }
+  if (MUR) {
+    P1 = IC(0);
+  } else {
+    P1 = I211(0, 1, 5);
+  }
+} break;
+case 31 : 
+case 95 : 
+{
+  P2 = IC(4);
+  P3 = IC(4);
+  if (MUL) {
+    P0 = IC(4);
+  } else {
+    P0 = I211(4, 1, 3);
+  }
+  if (MUR) {
+    P1 = IC(4);
+  } else {
+    P1 = I211(4, 1, 5);
+  }
+} break;
+case 42 : 
+case 170 : 
+{
+  P1 = IC(0);
+  P3 = IC(0);
+  if (MUL) {
+    P0 = IC(0);
+    P2 = IC(0);
+  } else {
+    P0 = I332(1, 3, 0);
+    P2 = I31(0, 3);
+  }
+} break;
+case 43 : 
+case 171 : 
+case 187 : 
+{
+  P1 = IC(2);
+  P3 = IC(2);
+  if (MUL) {
+    P0 = IC(2);
+    P2 = IC(2);
+  } else {
+    P0 = I332(1, 3, 2);
+    P2 = I31(2, 3);
+  }
+} break;
+case 46 : 
+case 174 : 
+{
+  P1 = IC(0);
+  P2 = IC(0);
+  P3 = IC(0);
+  if (MUL) {
+    P0 = IC(0);
+  } else {
+    P0 = I611(0, 1, 3);
+  }
+} break;
+case 47 : 
+case 175 : 
+{
+  P1 = IC(4);
+  P2 = IC(4);
+  P3 = IC(4);
+  if (MUL) {
+    P0 = IC(4);
+  } else {
+    P0 = I1411(4, 1, 3);
+  }
+} break;
+case 58 : 
+case 154 : 
+case 186 : 
+{
+  P2 = IC(0);
+  P3 = IC(0);
+  if (MUL) {
+    P0 = IC(0);
+  } else {
+    P0 = I611(0, 1, 3);
+  }
+  if (MUR) {
+    P1 = IC(0);
+  } else {
+    P1 = I611(0, 1, 5);
+  }
+} break;
+case 59 : 
+{
+  P2 = IC(2);
+  P3 = IC(2);
+  if (MUL) {
+    P0 = IC(2);
+  } else {
+    P0 = I211(2, 1, 3);
+  }
+  if (MUR) {
+    P1 = IC(2);
+  } else {
+    P1 = I611(2, 1, 5);
+  }
+} break;
+case 63 : 
+{
+  P2 = IC(4);
+  P3 = IC(4);
+  if (MUL) {
+    P0 = IC(4);
+  } else {
+    P0 = I1411(4, 1, 3);
+  }
+  if (MUR) {
+    P1 = IC(4);
+  } else {
+    P1 = I211(4, 1, 5);
+  }
+} break;
+case 72 : 
+case 76 : 
+case 104 : 
+case 106 : 
+case 108 : 
+case 110 : 
+case 120 : 
+case 124 : 
+{
+  P0 = IC(0);
+  P1 = IC(0);
+  P3 = IC(0);
+  if (MDL) {
+    P2 = IC(0);
+  } else {
+    P2 = I211(0, 3, 7);
+  }
+} break;
+case 73 : 
+case 77 : 
+case 105 : 
+case 109 : 
+case 125 : 
+{
+  P1 = IC(1);
+  P3 = IC(1);
+  if (MDL) {
+    P0 = IC(1);
+    P2 = IC(1);
+  } else {
+    P0 = I31(1, 3);
+    P2 = I332(3, 7, 1);
+  }
+} break;
+case 74 : 
+{
+  P1 = IC(0);
+  P3 = IC(0);
+  if (MDL) {
+    P2 = IC(0);
+  } else {
+    P2 = I211(0, 3, 7);
+  }
+  if (MUL) {
+    P0 = IC(0);
+  } else {
+    P0 = I211(0, 1, 3);
+  }
+} break;
+case 78 : 
+case 202 : 
+case 206 : 
+{
+  P1 = IC(0);
+  P3 = IC(0);
+  if (MDL) {
+    P2 = IC(0);
+  } else {
+    P2 = I611(0, 3, 7);
+  }
+  if (MUL) {
+    P0 = IC(0);
+  } else {
+    P0 = I611(0, 1, 3);
+  }
+} break;
+case 79 : 
+{
+  P1 = IC(4);
+  P3 = IC(4);
+  if (MDL) {
+    P2 = IC(4);
+  } else {
+    P2 = I611(4, 3, 7);
+  }
+  if (MUL) {
+    P0 = IC(4);
+  } else {
+    P0 = I211(4, 1, 3);
+  }
+} break;
+case 80 : 
+case 208 : 
+case 210 : 
+case 216 : 
+{
+  P0 = IC(0);
+  P1 = IC(0);
+  P2 = IC(0);
+  if (MDR) {
+    P3 = IC(0);
+  } else {
+    P3 = I211(0, 5, 7);
+  }
+} break;
+case 81 : 
+case 209 : 
+case 217 : 
+{
+  P0 = IC(1);
+  P1 = IC(1);
+  P2 = IC(1);
+  if (MDR) {
+    P3 = IC(1);
+  } else {
+    P3 = I211(1, 5, 7);
+  }
+} break;
+case 82 : 
+case 214 : 
+case 222 : 
+{
+  P0 = IC(0);
+  P2 = IC(0);
+  if (MDR) {
+    P3 = IC(0);
+  } else {
+    P3 = I211(0, 5, 7);
+  }
+  if (MUR) {
+    P1 = IC(0);
+  } else {
+    P1 = I211(0, 1, 5);
+  }
+} break;
+case 83 : 
+case 115 : 
+{
+  P0 = IC(2);
+  P2 = IC(2);
+  if (MDR) {
+    P3 = IC(2);
+  } else {
+    P3 = I611(2, 5, 7);
+  }
+  if (MUR) {
+    P1 = IC(2);
+  } else {
+    P1 = I611(2, 1, 5);
+  }
+} break;
+case 84 : 
+case 212 : 
+{
+  P0 = IC(0);
+  P2 = IC(0);
+  if (MDR) {
+    P1 = IC(0);
+    P3 = IC(0);
+  } else {
+    P1 = I31(0, 5);
+    P3 = I332(5, 7, 0);
+  }
+} break;
+case 85 : 
+case 213 : 
+case 221 : 
+{
+  P0 = IC(1);
+  P2 = IC(1);
+  if (MDR) {
+    P1 = IC(1);
+    P3 = IC(1);
+  } else {
+    P1 = I31(1, 5);
+    P3 = I332(5, 7, 1);
+  }
+} break;
+case 87 : 
+{
+  P0 = IC(3);
+  P2 = IC(3);
+  if (MDR) {
+    P3 = IC(3);
+  } else {
+    P3 = I611(3, 5, 7);
+  }
+  if (MUR) {
+    P1 = IC(3);
+  } else {
+    P1 = I211(3, 1, 5);
+  }
+} break;
+case 88 : 
+case 248 : 
+case 250 : 
+{
+  P0 = IC(0);
+  P1 = IC(0);
+  if (MDL) {
+    P2 = IC(0);
+  } else {
+    P2 = I211(0, 3, 7);
+  }
+  if (MDR) {
+    P3 = IC(0);
+  } else {
+    P3 = I211(0, 5, 7);
+  }
+} break;
+case 89 : 
+case 93 : 
+{
+  P0 = IC(1);
+  P1 = IC(1);
+  if (MDL) {
+    P2 = IC(1);
+  } else {
+    P2 = I611(1, 3, 7);
+  }
+  if (MDR) {
+    P3 = IC(1);
+  } else {
+    P3 = I611(1, 5, 7);
+  }
+} break;
+case 90 : 
+{
+  if (MDL) {
+    P2 = IC(0);
+  } else {
+    P2 = I611(0, 3, 7);
+  }
+  if (MDR) {
+    P3 = IC(0);
+  } else {
+    P3 = I611(0, 5, 7);
+  }
+  if (MUL) {
+    P0 = IC(0);
+  } else {
+    P0 = I611(0, 1, 3);
+  }
+  if (MUR) {
+    P1 = IC(0);
+  } else {
+    P1 = I611(0, 1, 5);
+  }
+} break;
+case 91 : 
+{
+  if (MDL) {
+    P2 = IC(2);
+  } else {
+    P2 = I611(2, 3, 7);
+  }
+  if (MDR) {
+    P3 = IC(2);
+  } else {
+    P3 = I611(2, 5, 7);
+  }
+  if (MUL) {
+    P0 = IC(2);
+  } else {
+    P0 = I211(2, 1, 3);
+  }
+  if (MUR) {
+    P1 = IC(2);
+  } else {
+    P1 = I611(2, 1, 5);
+  }
+} break;
+case 92 : 
+{
+  P0 = IC(0);
+  P1 = IC(0);
+  if (MDL) {
+    P2 = IC(0);
+  } else {
+    P2 = I611(0, 3, 7);
+  }
+  if (MDR) {
+    P3 = IC(0);
+  } else {
+    P3 = I611(0, 5, 7);
+  }
+} break;
+case 94 : 
+{
+  if (MDL) {
+    P2 = IC(0);
+  } else {
+    P2 = I611(0, 3, 7);
+  }
+  if (MDR) {
+    P3 = IC(0);
+  } else {
+    P3 = I611(0, 5, 7);
+  }
+  if (MUL) {
+    P0 = IC(0);
+  } else {
+    P0 = I611(0, 1, 3);
+  }
+  if (MUR) {
+    P1 = IC(0);
+  } else {
+    P1 = I211(0, 1, 5);
+  }
+} break;
+case 107 : 
+case 123 : 
+{
+  P1 = IC(2);
+  P3 = IC(2);
+  if (MDL) {
+    P2 = IC(2);
+  } else {
+    P2 = I211(2, 3, 7);
+  }
+  if (MUL) {
+    P0 = IC(2);
+  } else {
+    P0 = I211(2, 1, 3);
+  }
+} break;
+case 111 : 
+{
+  P1 = IC(4);
+  P3 = IC(4);
+  if (MDL) {
+    P2 = IC(4);
+  } else {
+    P2 = I211(4, 3, 7);
+  }
+  if (MUL) {
+    P0 = IC(4);
+  } else {
+    P0 = I1411(4, 1, 3);
+  }
+} break;
+case 112 : 
+case 240 : 
+{
+  P0 = IC(0);
+  P1 = IC(0);
+  if (MDR) {
+    P2 = IC(0);
+    P3 = IC(0);
+  } else {
+    P2 = I31(0, 7);
+    P3 = I332(5, 7, 0);
+  }
+} break;
+case 113 : 
+case 241 : 
+{
+  P0 = IC(1);
+  P1 = IC(1);
+  if (MDR) {
+    P2 = IC(1);
+    P3 = IC(1);
+  } else {
+    P2 = I31(1, 7);
+    P3 = I332(5, 7, 1);
+  }
+} break;
+case 114 : 
+{
+  P0 = IC(0);
+  P2 = IC(0);
+  if (MDR) {
+    P3 = IC(0);
+  } else {
+    P3 = I611(0, 5, 7);
+  }
+  if (MUR) {
+    P1 = IC(0);
+  } else {
+    P1 = I611(0, 1, 5);
+  }
+} break;
+case 116 : 
+{
+  P0 = IC(0);
+  P1 = IC(0);
+  P2 = IC(0);
+  if (MDR) {
+    P3 = IC(0);
+  } else {
+    P3 = I611(0, 5, 7);
+  }
+} break;
+case 117 : 
+{
+  P0 = IC(1);
+  P1 = IC(1);
+  P2 = IC(1);
+  if (MDR) {
+    P3 = IC(1);
+  } else {
+    P3 = I611(1, 5, 7);
+  }
+} break;
+case 121 : 
+{
+  P0 = IC(1);
+  P1 = IC(1);
+  if (MDL) {
+    P2 = IC(1);
+  } else {
+    P2 = I211(1, 3, 7);
+  }
+  if (MDR) {
+    P3 = IC(1);
+  } else {
+    P3 = I611(1, 5, 7);
+  }
+} break;
+case 122 : 
+{
+  if (MDL) {
+    P2 = IC(0);
+  } else {
+    P2 = I211(0, 3, 7);
+  }
+  if (MDR) {
+    P3 = IC(0);
+  } else {
+    P3 = I611(0, 5, 7);
+  }
+  if (MUL) {
+    P0 = IC(0);
+  } else {
+    P0 = I611(0, 1, 3);
+  }
+  if (MUR) {
+    P1 = IC(0);
+  } else {
+    P1 = I611(0, 1, 5);
+  }
+} break;
+case 126 : 
+{
+  P0 = IC(0);
+  P3 = IC(0);
+  if (MDL) {
+    P2 = IC(0);
+  } else {
+    P2 = I211(0, 3, 7);
+  }
+  if (MUR) {
+    P1 = IC(0);
+  } else {
+    P1 = I211(0, 1, 5);
+  }
+} break;
+case 127 : 
+{
+  P3 = IC(4);
+  if (MDL) {
+    P2 = IC(4);
+  } else {
+    P2 = I211(4, 3, 7);
+  }
+  if (MUL) {
+    P0 = IC(4);
+  } else {
+    P0 = I1411(4, 1, 3);
+  }
+  if (MUR) {
+    P1 = IC(4);
+  } else {
+    P1 = I211(4, 1, 5);
+  }
+} break;
+case 146 : 
+case 150 : 
+case 178 : 
+case 182 : 
+case 190 : 
+{
+  P0 = IC(0);
+  P2 = IC(0);
+  if (MUR) {
+    P1 = IC(0);
+    P3 = IC(0);
+  } else {
+    P1 = I332(1, 5, 0);
+    P3 = I31(0, 5);
+  }
+} break;
+case 147 : 
+case 179 : 
+{
+  P0 = IC(2);
+  P2 = IC(2);
+  P3 = IC(2);
+  if (MUR) {
+    P1 = IC(2);
+  } else {
+    P1 = I611(2, 1, 5);
+  }
+} break;
+case 151 : 
+case 183 : 
+{
+  P0 = IC(3);
+  P2 = IC(3);
+  P3 = IC(3);
+  if (MUR) {
+    P1 = IC(3);
+  } else {
+    P1 = I1411(3, 1, 5);
+  }
+} break;
+case 158 : 
+{
+  P2 = IC(0);
+  P3 = IC(0);
+  if (MUL) {
+    P0 = IC(0);
+  } else {
+    P0 = I611(0, 1, 3);
+  }
+  if (MUR) {
+    P1 = IC(0);
+  } else {
+    P1 = I211(0, 1, 5);
+  }
+} break;
+case 159 : 
+{
+  P2 = IC(4);
+  P3 = IC(4);
+  if (MUL) {
+    P0 = IC(4);
+  } else {
+    P0 = I211(4, 1, 3);
+  }
+  if (MUR) {
+    P1 = IC(4);
+  } else {
+    P1 = I1411(4, 1, 5);
+  }
+} break;
+case 191 : 
+{
+  P2 = IC(4);
+  P3 = IC(4);
+  if (MUL) {
+    P0 = IC(4);
+  } else {
+    P0 = I1411(4, 1, 3);
+  }
+  if (MUR) {
+    P1 = IC(4);
+  } else {
+    P1 = I1411(4, 1, 5);
+  }
+} break;
+case 200 : 
+case 204 : 
+case 232 : 
+case 236 : 
+case 238 : 
+{
+  P0 = IC(0);
+  P1 = IC(0);
+  if (MDL) {
+    P2 = IC(0);
+    P3 = IC(0);
+  } else {
+    P2 = I332(3, 7, 0);
+    P3 = I31(0, 7);
+  }
+} break;
+case 201 : 
+case 205 : 
+{
+  P0 = IC(1);
+  P1 = IC(1);
+  P3 = IC(1);
+  if (MDL) {
+    P2 = IC(1);
+  } else {
+    P2 = I611(1, 3, 7);
+  }
+} break;
+case 211 : 
+{
+  P0 = IC(2);
+  P1 = IC(2);
+  P2 = IC(2);
+  if (MDR) {
+    P3 = IC(2);
+  } else {
+    P3 = I211(2, 5, 7);
+  }
+} break;
+case 215 : 
+{
+  P0 = IC(3);
+  P2 = IC(3);
+  if (MDR) {
+    P3 = IC(3);
+  } else {
+    P3 = I211(3, 5, 7);
+  }
+  if (MUR) {
+    P1 = IC(3);
+  } else {
+    P1 = I1411(3, 1, 5);
+  }
+} break;
+case 218 : 
+{
+  if (MDL) {
+    P2 = IC(0);
+  } else {
+    P2 = I611(0, 3, 7);
+  }
+  if (MDR) {
+    P3 = IC(0);
+  } else {
+    P3 = I211(0, 5, 7);
+  }
+  if (MUL) {
+    P0 = IC(0);
+  } else {
+    P0 = I611(0, 1, 3);
+  }
+  if (MUR) {
+    P1 = IC(0);
+  } else {
+    P1 = I611(0, 1, 5);
+  }
+} break;
+case 219 : 
+{
+  P1 = IC(2);
+  P2 = IC(2);
+  if (MDR) {
+    P3 = IC(2);
+  } else {
+    P3 = I211(2, 5, 7);
+  }
+  if (MUL) {
+    P0 = IC(2);
+  } else {
+    P0 = I211(2, 1, 3);
+  }
+} break;
+case 220 : 
+{
+  P0 = IC(0);
+  P1 = IC(0);
+  if (MDL) {
+    P2 = IC(0);
+  } else {
+    P2 = I611(0, 3, 7);
+  }
+  if (MDR) {
+    P3 = IC(0);
+  } else {
+    P3 = I211(0, 5, 7);
+  }
+} break;
+case 223 : 
+{
+  P2 = IC(4);
+  if (MDR) {
+    P3 = IC(4);
+  } else {
+    P3 = I211(4, 5, 7);
+  }
+  if (MUL) {
+    P0 = IC(4);
+  } else {
+    P0 = I211(4, 1, 3);
+  }
+  if (MUR) {
+    P1 = IC(4);
+  } else {
+    P1 = I1411(4, 1, 5);
+  }
+} break;
+case 233 : 
+case 237 : 
+{
+  P0 = IC(1);
+  P1 = IC(1);
+  P3 = IC(1);
+  if (MDL) {
+    P2 = IC(1);
+  } else {
+    P2 = I1411(1, 3, 7);
+  }
+} break;
+case 234 : 
+{
+  P1 = IC(0);
+  P3 = IC(0);
+  if (MDL) {
+    P2 = IC(0);
+  } else {
+    P2 = I211(0, 3, 7);
+  }
+  if (MUL) {
+    P0 = IC(0);
+  } else {
+    P0 = I611(0, 1, 3);
+  }
+} break;
+case 235 : 
+{
+  P1 = IC(2);
+  P3 = IC(2);
+  if (MDL) {
+    P2 = IC(2);
+  } else {
+    P2 = I1411(2, 3, 7);
+  }
+  if (MUL) {
+    P0 = IC(2);
+  } else {
+    P0 = I211(2, 1, 3);
+  }
+} break;
+case 239 : 
+{
+  P1 = IC(4);
+  P3 = IC(4);
+  if (MDL) {
+    P2 = IC(4);
+  } else {
+    P2 = I1411(4, 3, 7);
+  }
+  if (MUL) {
+    P0 = IC(4);
+  } else {
+    P0 = I1411(4, 1, 3);
+  }
+} break;
+case 242 : 
+{
+  P0 = IC(0);
+  P2 = IC(0);
+  if (MDR) {
+    P3 = IC(0);
+  } else {
+    P3 = I211(0, 5, 7);
+  }
+  if (MUR) {
+    P1 = IC(0);
+  } else {
+    P1 = I611(0, 1, 5);
+  }
+} break;
+case 243 : 
+{
+  P0 = IC(2);
+  P1 = IC(2);
+  if (MDR) {
+    P2 = IC(2);
+    P3 = IC(2);
+  } else {
+    P2 = I31(2, 7);
+    P3 = I332(5, 7, 2);
+  }
+} break;
+case 244 : 
+{
+  P0 = IC(0);
+  P1 = IC(0);
+  P2 = IC(0);
+  if (MDR) {
+    P3 = IC(0);
+  } else {
+    P3 = I1411(0, 5, 7);
+  }
+} break;
+case 245 : 
+{
+  P0 = IC(1);
+  P1 = IC(1);
+  P2 = IC(1);
+  if (MDR) {
+    P3 = IC(1);
+  } else {
+    P3 = I1411(1, 5, 7);
+  }
+} break;
+case 246 : 
+{
+  P0 = IC(0);
+  P2 = IC(0);
+  if (MDR) {
+    P3 = IC(0);
+  } else {
+    P3 = I1411(0, 5, 7);
+  }
+  if (MUR) {
+    P1 = IC(0);
+  } else {
+    P1 = I211(0, 1, 5);
+  }
+} break;
+case 247 : 
+{
+  P0 = IC(3);
+  P2 = IC(3);
+  if (MDR) {
+    P3 = IC(3);
+  } else {
+    P3 = I1411(3, 5, 7);
+  }
+  if (MUR) {
+    P1 = IC(3);
+  } else {
+    P1 = I1411(3, 1, 5);
+  }
+} break;
+case 249 : 
+{
+  P0 = IC(1);
+  P1 = IC(1);
+  if (MDL) {
+    P2 = IC(1);
+  } else {
+    P2 = I1411(1, 3, 7);
+  }
+  if (MDR) {
+    P3 = IC(1);
+  } else {
+    P3 = I211(1, 5, 7);
+  }
+} break;
+case 251 : 
+{
+  P1 = IC(2);
+  if (MDL) {
+    P2 = IC(2);
+  } else {
+    P2 = I1411(2, 3, 7);
+  }
+  if (MDR) {
+    P3 = IC(2);
+  } else {
+    P3 = I211(2, 5, 7);
+  }
+  if (MUL) {
+    P0 = IC(2);
+  } else {
+    P0 = I211(2, 1, 3);
+  }
+} break;
+case 252 : 
+{
+  P0 = IC(0);
+  P1 = IC(0);
+  if (MDL) {
+    P2 = IC(0);
+  } else {
+    P2 = I211(0, 3, 7);
+  }
+  if (MDR) {
+    P3 = IC(0);
+  } else {
+    P3 = I1411(0, 5, 7);
+  }
+} break;
+case 253 : 
+{
+  P0 = IC(1);
+  P1 = IC(1);
+  if (MDL) {
+    P2 = IC(1);
+  } else {
+    P2 = I1411(1, 3, 7);
+  }
+  if (MDR) {
+    P3 = IC(1);
+  } else {
+    P3 = I1411(1, 5, 7);
+  }
+} break;
+case 254 : 
+{
+  P0 = IC(0);
+  if (MDL) {
+    P2 = IC(0);
+  } else {
+    P2 = I211(0, 3, 7);
+  }
+  if (MDR) {
+    P3 = IC(0);
+  } else {
+    P3 = I1411(0, 5, 7);
+  }
+  if (MUR) {
+    P1 = IC(0);
+  } else {
+    P1 = I211(0, 1, 5);
+  }
+} break;
+case 255 : 
+{
+  if (MDL) {
+    P2 = IC(4);
+  } else {
+    P2 = I1411(4, 3, 7);
+  }
+  if (MDR) {
+    P3 = IC(4);
+  } else {
+    P3 = I1411(4, 5, 7);
+  }
+  if (MUL) {
+    P0 = IC(4);
+  } else {
+    P0 = I1411(4, 1, 3);
+  }
+  if (MUR) {
+    P1 = IC(4);
+  } else {
+    P1 = I1411(4, 1, 5);
+  }
+} break;
diff --git a/desmume/src/windows/filter/scanline.cpp b/desmume/src/windows/filter/scanline.cpp
index 38ee8bbab..b14055f37 100644
--- a/desmume/src/windows/filter/scanline.cpp
+++ b/desmume/src/windows/filter/scanline.cpp
@@ -15,10 +15,10 @@
     You should have received a copy of the GNU General Public License
     along with DeSmuME; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
-*/
-
-#include "filter.h"
-#include "types.h"
+*/
+
+#include "filter.h"
+#include "types.h"
 #include <stdio.h>
 #include <string.h>
 
@@ -41,8 +41,8 @@ FORCEINLINE void ScanLine16_2( uint16 *lpDst, uint16 *lpSrc, unsigned int Width)
 		*lpDst++ = fadeOutColors[scanline_filter_a][(*lpSrc)];
 		*lpDst++ = fadeOutColors[scanline_filter_b][(*lpSrc++)];
 	}
-}
-
+}
+
 FORCEINLINE void ScanLine32( uint32 *lpDst, uint32 *lpSrc, unsigned int Width){
 	while(Width--){
 		*lpDst++ = *lpSrc;
@@ -72,16 +72,16 @@ FORCEINLINE void ScanLine32_2( uint32 *lpDst, uint32 *lpSrc, unsigned int Width)
 		lpDst+=2; 
 		lpSrc++;
 	}
-}
-
-
-FORCEINLINE void DoubleLine32( uint32 *lpDst, uint32 *lpSrc, unsigned int Width){
-	while(Width--){
-		*lpDst++ = *lpSrc;
-		*lpDst++ = *lpSrc++;
-	}
-}
-
+}
+
+
+FORCEINLINE void DoubleLine32( uint32 *lpDst, uint32 *lpSrc, unsigned int Width){
+	while(Width--){
+		*lpDst++ = *lpSrc;
+		*lpDst++ = *lpSrc++;
+	}
+}
+
 void RenderScanline( SSurface Src, SSurface Dst)
 {
 	fac_a = (16-scanline_filter_a);
@@ -101,19 +101,19 @@ void RenderScanline( SSurface Src, SSurface Dst)
 		//memset (lpDst, 0, 512*2), lpDst += dstPitch;
 }
 
-void RenderNearest2X (SSurface Src, SSurface Dst)
-{
-	uint32 *lpSrc;
-	unsigned int H;
-
-	const uint32 srcHeight = Src.Height;
-
-	const unsigned int srcPitch = Src.Pitch >> 1;
-	lpSrc = reinterpret_cast<uint32 *>(Src.Surface);
-
-	const unsigned int dstPitch = Dst.Pitch >> 1;
-	uint32 *lpDst = (uint32*)Dst.Surface;
-	for (H = 0; H < srcHeight; H++, lpSrc += srcPitch)
-		DoubleLine32 (lpDst, lpSrc, Src.Width), lpDst += dstPitch,
-		DoubleLine32 (lpDst, lpSrc, Src.Width), lpDst += dstPitch;
-}
+void RenderNearest2X (SSurface Src, SSurface Dst)
+{
+	uint32 *lpSrc;
+	unsigned int H;
+
+	const uint32 srcHeight = Src.Height;
+
+	const unsigned int srcPitch = Src.Pitch >> 1;
+	lpSrc = reinterpret_cast<uint32 *>(Src.Surface);
+
+	const unsigned int dstPitch = Dst.Pitch >> 1;
+	uint32 *lpDst = (uint32*)Dst.Surface;
+	for (H = 0; H < srcHeight; H++, lpSrc += srcPitch)
+		DoubleLine32 (lpDst, lpSrc, Src.Width), lpDst += dstPitch,
+		DoubleLine32 (lpDst, lpSrc, Src.Width), lpDst += dstPitch;
+}
diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp
index 5d634b5d5..7cdbf3ce6 100644
--- a/desmume/src/windows/main.cpp
+++ b/desmume/src/windows/main.cpp
@@ -3102,7 +3102,10 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
 
 			//Filters
 			MainWindow->checkMenu(IDM_RENDER_NORMAL, video.currentfilter == video.NONE );
+			MainWindow->checkMenu(IDM_RENDER_LQ2X, video.currentfilter == video.LQ2X );
+			MainWindow->checkMenu(IDM_RENDER_LQ2XS, video.currentfilter == video.LQ2XS );
 			MainWindow->checkMenu(IDM_RENDER_HQ2X, video.currentfilter == video.HQ2X );
+			MainWindow->checkMenu(IDM_RENDER_HQ2XS, video.currentfilter == video.HQ2XS );
 			MainWindow->checkMenu(IDM_RENDER_2XSAI, video.currentfilter == video._2XSAI );
 			MainWindow->checkMenu(IDM_RENDER_SUPER2XSAI, video.currentfilter == video.SUPER2XSAI );
 			MainWindow->checkMenu(IDM_RENDER_SUPEREAGLE, video.currentfilter == video.SUPEREAGLE );
@@ -3597,6 +3600,20 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
 				FilterUpdate(hwnd);
 			}
 			break;
+		case IDM_RENDER_LQ2X:
+			{
+				Lock lock (win_backbuffer_sync);
+				video.setfilter(video.LQ2X);
+				FilterUpdate(hwnd);
+			}
+			break;
+		case IDM_RENDER_LQ2XS:
+			{
+				Lock lock (win_backbuffer_sync);
+				video.setfilter(video.LQ2XS);
+				FilterUpdate(hwnd);
+			}
+			break;
 		case IDM_RENDER_HQ2X:
 			{
 				Lock lock (win_backbuffer_sync);
@@ -3604,6 +3621,13 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
 				FilterUpdate(hwnd);
 			}
 			break;
+		case IDM_RENDER_HQ2XS:
+			{
+				Lock lock (win_backbuffer_sync);
+				video.setfilter(video.HQ2XS);
+				FilterUpdate(hwnd);
+			}
+			break;
 		case IDM_RENDER_2XSAI:
 			{
 				Lock lock (win_backbuffer_sync);
diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h
index b8303ea43..05a2b9a54 100644
--- a/desmume/src/windows/resource.h
+++ b/desmume/src/windows/resource.h
@@ -783,6 +783,10 @@
 #define IDM_HOTKEY_CONFIG               60079
 #define IDC_FASTFETCHEXECUTE            60080
 
+#define IDM_RENDER_HQ2XS				60081
+#define IDM_RENDER_LQ2X					60082
+#define IDM_RENDER_LQ2XS				60083
+
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc
index a700daf81..01838e6c3 100644
Binary files a/desmume/src/windows/resources.rc and b/desmume/src/windows/resources.rc differ
diff --git a/desmume/src/windows/video.h b/desmume/src/windows/video.h
index 1e7725939..4160839ce 100644
--- a/desmume/src/windows/video.h
+++ b/desmume/src/windows/video.h
@@ -24,7 +24,10 @@ public:
 		SUPEREAGLE,
 		SCANLINE,
 		BILINEAR,
-		NEAREST2X
+		NEAREST2X,
+		HQ2XS,
+		LQ2X,
+		LQ2XS,
 	};
 
 
@@ -76,9 +79,18 @@ public:
 		{
 			case NONE:
 				break;
+			case LQ2X:
+				RenderLQ2X(src, dst);
+				break;
+			case LQ2XS:
+				RenderLQ2XS(src, dst);
+				break;
 			case HQ2X:
 				RenderHQ2X(src, dst);
 				break;
+			case HQ2XS:
+				RenderHQ2XS(src, dst);
+				break;
 			case _2XSAI:
 				Render2xSaI (src, dst);
 				break;