From 37914fb224a9d6d5ed62ce67c599d965446a1c55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Strohh=C3=A4cker?= Date: Mon, 2 Jul 2007 20:06:59 +0000 Subject: [PATCH] additional scaler reset checks, mention scaler forcing in the configuration file Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2910 --- src/dosbox.cpp | 4 +++- src/gui/render.cpp | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/dosbox.cpp b/src/dosbox.cpp index 4ef0f46f..9ecfb523 100644 --- a/src/dosbox.cpp +++ b/src/dosbox.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: dosbox.cpp,v 1.117 2007-06-27 14:51:30 qbix79 Exp $ */ +/* $Id: dosbox.cpp,v 1.118 2007-07-02 20:06:59 c2woody Exp $ */ #include #include @@ -303,6 +303,8 @@ void DOSBOX_Init(void) { " Supported are none,normal2x,normal3x,advmame2x,advmame3x,hq2x,hq3x,\n" " 2xsai,super2xsai,supereagle,advinterp2x,advinterp3x,\n" " tv2x,tv3x,rgb2x,rgb3x,scan2x,scan3x.\n" + " If forced is appended (like scaler=hq2x forced), the scaler will be used\n" + " even if the result might not be desired.\n" ); secprop=control->AddSection_prop("cpu",&CPU_Init,true);//done diff --git a/src/gui/render.cpp b/src/gui/render.cpp index eefcb800..62b31d9c 100644 --- a/src/gui/render.cpp +++ b/src/gui/render.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: render.cpp,v 1.52 2007-06-30 19:53:41 c2woody Exp $ */ +/* $Id: render.cpp,v 1.53 2007-07-02 20:06:59 c2woody Exp $ */ #include #include @@ -548,6 +548,8 @@ void RENDER_Init(Section * sec) { //For restarting the renderer. static bool running = false; bool aspect = render.aspect; + Bitu scalersize = render.scale.size; + bool scalerforced = render.scale.forced; scalerOperation_t scaleOp = render.scale.op; render.pal.first=256; @@ -600,7 +602,9 @@ void RENDER_Init(Section * sec) { } //If something changed that needs a ReInit - if(running && (render.aspect != aspect || render.scale.op != scaleOp)) + if(running &&((render.aspect != aspect) || (render.scale.op != scaleOp) || + (render.scale.size != scalersize) || (render.scale.forced != scalerforced) || + render.scale.forced)) RENDER_CallBack( GFX_CallBackReset ); if(!running) render.updating=true;