From 7d2fff001274e5870ec65f90f2e4158cc2595249 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 27 Sep 2003 21:20:00 +0000
Subject: added hq2x scaler

svn-id: r10439
---
 README                  |  3 ++-
 backends/sdl/sdl.cpp    | 12 ++++++++----
 backends/sdl/sdl_gl.cpp | 12 ++++++++----
 base/gameDetector.cpp   |  6 ++++--
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/README b/README
index 1cd8e26599..d179050bdb 100644
--- a/README
+++ b/README
@@ -435,6 +435,7 @@ They are:
         supereagle - Less blurry than 2xsai, but slower. Also 640x400
         advmame2x  - 640x400 scaling. Doesn't rely on blurring like 2xSAI.
         advmame3x  - 960x600 scaling. Doesn't rely on blurring like 2xSAI.
+        hq2x       - 640x400 scaling. Doesn't rely on blurring like 2xSAI.
         hq3x       - 960x600 scaling. Doesn't rely on blurring like 2xSAI.
         tv2x       - 640x400 scaling. Horizontal scanlines.
         dotmatrix  - 640x400 scaling. Dot matrix effect.
@@ -806,7 +807,7 @@ The following keywords are recognized:
         aspect_ratio    bool     Enable aspect ratio correction
         gfx_mode        string   Graphics mode (normal, 2x, 3x, 2xsai,
                                  super2xsai, supereagle, advmame2x, advmame3x,
-                                 hq3x, tv2x, dotmatrix)
+                                 hq2x, hq3x, tv2x, dotmatrix)
 
         cdrom           int      Number of CD-ROM unit to use for audio. If
                                  negative, don't even try to access the CD-ROM.
diff --git a/backends/sdl/sdl.cpp b/backends/sdl/sdl.cpp
index 83490d95d8..9118830a39 100644
--- a/backends/sdl/sdl.cpp
+++ b/backends/sdl/sdl.cpp
@@ -82,6 +82,14 @@ void OSystem_SDL::load_gfx_mode() {
 		_scaleFactor = 3;
 		_scaler_proc = AdvMame3x;
 		break;
+	case GFX_HQ2X:
+		_scaleFactor = 2;
+		_scaler_proc = HQ2x;
+		break;
+	case GFX_HQ3X:
+		_scaleFactor = 3;
+		_scaler_proc = HQ3x;
+		break;
 	case GFX_TV2X:
 		_scaleFactor = 2;
 		_scaler_proc = TV2x;
@@ -90,10 +98,6 @@ void OSystem_SDL::load_gfx_mode() {
 		_scaleFactor = 2;
 		_scaler_proc = DotMatrix;
 		break;
-	case GFX_HQ3X:
-		_scaleFactor = 3;
-		_scaler_proc = HQ3x;
-		break;
 
 	case GFX_BILINEAR:
 	case GFX_DOUBLESIZE:
diff --git a/backends/sdl/sdl_gl.cpp b/backends/sdl/sdl_gl.cpp
index 652ecb6a93..4fab4f0f5a 100644
--- a/backends/sdl/sdl_gl.cpp
+++ b/backends/sdl/sdl_gl.cpp
@@ -139,6 +139,14 @@ void OSystem_SDL_OpenGL::load_gfx_mode() {
 		_scaleFactor = 3;
 		_scaler_proc = AdvMame3x;
 		break;
+	case GFX_HQ2X:
+		_scaleFactor = 2;
+		_scaler_proc = HQ2x;
+		break;
+	case GFX_HQ3X:
+		_scaleFactor = 3;
+		_scaler_proc = HQ3x;
+		break;
 	case GFX_TV2X:
 		_scaleFactor = 2;
 		_scaler_proc = TV2x;
@@ -147,10 +155,6 @@ void OSystem_SDL_OpenGL::load_gfx_mode() {
 		_scaleFactor = 2;
 		_scaler_proc = DotMatrix;
 		break;
-	case GFX_HQ3X:
-		_scaleFactor = 3;
-		_scaler_proc = HQ3x;
-		break;
 
 	default:
 		error("unknown gfx mode %d", _mode);
diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp
index 0a7e392a60..096804e22d 100644
--- a/base/gameDetector.cpp
+++ b/base/gameDetector.cpp
@@ -57,7 +57,8 @@ static const char USAGE_STRING[] =
 	"\t-x[<num>]      - Load this savegame (default: 0 - autosave)\n"
 	"\t-f             - Full-screen mode (-F forces window mode.)\n"
 	"\t-g<mode>       - Graphics mode (normal,2x,3x,2xsai,super2xsai,\n"
-	"\t                 supereagle,advmame2x, advmame3x,tv2x,dotmatrix)\n"
+	"\t                 supereagle,advmame2x,advmame3x,hq2x,hq3x,\n"
+	"\t                 tv2x,dotmatrix)\n"
 	"\t-e<mode>       - Set music engine (see README for details)\n"
 	"\t-q<lang>       - Specify language (en,de,fr,it,pt,es,jp,zh,kr,se,\n"
 	"\t                 gb,hb)\n"
@@ -113,9 +114,10 @@ static const struct GraphicsMode gfx_modes[] = {
 	{"supereagle", "SuperEagle", GFX_SUPEREAGLE},
 	{"advmame2x", "AdvMAME2x", GFX_ADVMAME2X},
 	{"advmame3x", "AdvMAME3x", GFX_ADVMAME3X},
+	{"hq2x", "HQ2x", GFX_HQ2X},
+	{"hq3x", "HQ3x", GFX_HQ3X},
 	{"tv2x", "TV2x", GFX_TV2X},
 	{"dotmatrix", "DotMatrix", GFX_DOTMATRIX},
-	{"hq3x", "HQ3x", GFX_HQ3X},
 	{"opengl", "OpenGL", GFX_BILINEAR},
 #else
 	{"flipping", "Page Flipping", GFX_FLIPPING},
-- 
cgit v1.2.3