- obsolete

[packages/dosbox.git] / dosbox-hq2x.patch

diff -x aclocal.m4 -x CVS -x configure -x '*.in' -x '*~' -x '*.o' -x '*.a' -x Makefile -x config.h -x config.status -x config.log -x 'stamp-h*' -x '*.Po' -x autom4te.cache -x config.guess -x '.#*' -ruN dosbox-0.61/src/gui/Makefile.am dosbox-0.61+hq2x/src/gui/Makefile.am
--- dosbox-0.61/src/gui/Makefile.am	2004-07-05 02:44:22.000000000 +0200
+++ dosbox-0.61+hq2x/src/gui/Makefile.am	2004-07-04 23:25:07.000000000 +0200
@@ -3,5 +3,6 @@
 noinst_LIBRARIES = libgui.a
 libgui_a_SOURCES = sdlmain.cpp sdl_mapper.cpp \
 	render.cpp render_scalers.cpp render_scalers.h render_templates.h \
-	midi.cpp midi_win32.h midi_oss.h midi_coreaudio.h midi_alsa.h
+	midi.cpp midi_win32.h midi_oss.h midi_coreaudio.h midi_alsa.h \
+	render_hq2x.cpp render_hq2x.h
 
diff -x aclocal.m4 -x CVS -x configure -x '*.in' -x '*~' -x '*.o' -x '*.a' -x Makefile -x config.h -x config.status -x config.log -x 'stamp-h*' -x '*.Po' -x autom4te.cache -x config.guess -x '.#*' -ruN dosbox-0.61/src/gui/render.cpp dosbox-0.61+hq2x/src/gui/render.cpp
--- dosbox-0.61/src/gui/render.cpp	2004-08-05 00:12:58.732847304 +0200
+++ dosbox-0.61+hq2x/src/gui/render.cpp	2004-08-04 23:50:12.000000000 +0200
@@ -33,6 +33,7 @@
 #include "support.h"
 
 #include "render_scalers.h"
+#include "render_hq2x.h"
 
 struct PalData {
 	struct { 
@@ -190,6 +191,9 @@
 		}
 		break;
 	}
+	if (render.op.type == OP_Hq2x) {
+		Hq2x_InitLUTs((void*)render.pal.rgb,render.pal.last,render.pal.first);
+	}
 	/* Setup pal index to startup values */
 	render.pal.first=256;
 	render.pal.last=0;
@@ -314,6 +318,7 @@
 	case OP_Interp2x:block=&Interp2x_8;break;
 	case OP_AdvInterp2x:block=&AdvInterp2x_8;break;
 	case OP_TV2x:block=&TV2x_8;break;
+	case OP_Hq2x:block=&Hq2x_8;break;
 	}
 	gfx_flags=GFX_GetBestMode(block->flags);
 	if (!gfx_flags) {
@@ -362,7 +367,7 @@
 
 extern void GFX_SetTitle(Bits cycles, Bits frameskip,bool paused);
 static void IncreaseFrameSkip(void) {
-	if (render.frameskip.max<10) render.frameskip.max++;
+	if (render.frameskip.max<25) render.frameskip.max++;
 	LOG_MSG("Frame Skip at %d",render.frameskip.max);
 	GFX_SetTitle(-1,render.frameskip.max,false);
 }
@@ -376,6 +381,12 @@
 void RENDER_Init(Section * sec) {
 	Section_prop * section=static_cast<Section_prop *>(sec);
 
+	Hq2x_colourTrigger=section->Get_int("hq2x_threshold");
+	if (Hq2x_colourTrigger > 255) Hq2x_colourTrigger = 255;
+	if (Hq2x_colourTrigger < 0) Hq2x_colourTrigger = 0;
+	Hq2x_colourTrigger_adaptive=section->Get_int("hq2x_threshold_adaptive");
+	if (Hq2x_colourTrigger_adaptive > 255) Hq2x_colourTrigger_adaptive = 255;
+	if (Hq2x_colourTrigger_adaptive <= 0) Hq2x_colourTrigger_adaptive = 75;
 	render.pal.first=256;
 	render.pal.last=0;
 	render.aspect=section->Get_bool("aspect");
@@ -398,12 +409,17 @@
 	else if (!strcasecmp(scaler,"advinterp2x")) render.op.want_type=OP_AdvInterp2x;
 	else if (!strcasecmp(scaler,"interp2x")) render.op.want_type=OP_Interp2x;
 	else if (!strcasecmp(scaler,"tv2x")) render.op.want_type=OP_TV2x;
+	else if (!strcasecmp(scaler,"hq2x")) render.op.want_type=OP_Hq2x;
 	else {
 		render.op.want_type=OP_Normal;
 		LOG_MSG("Illegal scaler type %s,falling back to normal.",scaler);
 	}
 	MAPPER_AddHandler(DecreaseFrameSkip,MK_f7,MMOD1,"decfskip","Dec Fskip");
 	MAPPER_AddHandler(IncreaseFrameSkip,MK_f8,MMOD1,"incfskip","Inc Fskip");
+	MAPPER_AddHandler(Hq2x_DecreaseThreshold,MK_f3,MMOD1|MMOD2,"dechq2xthreshold","Dec Hq2x Static Threshold");
+	MAPPER_AddHandler(Hq2x_IncreaseThreshold,MK_f4,MMOD1|MMOD2,"inchq2xthreshold","Inc Hq2x Static Threshold");
+	MAPPER_AddHandler(Hq2x_DecreaseThresholdAdaptive,MK_f5,MMOD1|MMOD2,"dechq2xadapthreshold","Dec Hq2x Adaptive Threshold");
+	MAPPER_AddHandler(Hq2x_IncreaseThresholdAdaptive,MK_f6,MMOD1|MMOD2,"inchq2xadapthreshold","Inc Hq2x Adaptive Threshold");
 	GFX_SetTitle(-1,render.frameskip.max,false);
 }
 
diff -x aclocal.m4 -x CVS -x configure -x '*.in' -x '*~' -x '*.o' -x '*.a' -x Makefile -x config.h -x config.status -x config.log -x 'stamp-h*' -x '*.Po' -x autom4te.cache -x config.guess -x '.#*' -ruN dosbox-0.61/src/gui/render_hq2x.cpp dosbox-0.61+hq2x/src/gui/render_hq2x.cpp
--- dosbox-0.61/src/gui/render_hq2x.cpp	1970-01-01 01:00:00.000000000 +0100
+++ dosbox-0.61+hq2x/src/gui/render_hq2x.cpp	2004-08-04 23:43:53.000000000 +0200
@@ -0,0 +1,799 @@
+//hq2x filter demo program
+//----------------------------------------------------------
+//Copyright (C) 2003 MaxSt ( maxst@hiend3d.com )