valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

additional scaler reset checks, mention scaler forcing in the configuration file

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2910
This commit is contained in:
Sebastian Strohhäcker 2007-07-02 20:06:59 +00:00
parent 216fb3bbe5
commit 37914fb224
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dosbox.cpp
View file

@ -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 <stdlib.h>
#include <stdarg.h>
@ -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

8
src/gui/render.cpp
View file

@ -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 <sys/types.h>
#include <dirent.h>
@ -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;