From 53660f37014dd3055a37c4e2bf7ee4b83ef3f4ca Mon Sep 17 00:00:00 2001 From: NicJA Date: Wed, 25 Apr 2018 01:09:29 +0000 Subject: [PATCH] fix remapping behavior. Remapping is only necessary if we are rendering on the workbench screen _AND_ we are using 8bit or less display. git-svn-id: https://svn.aros.org/svn/aros/trunk/contrib@55124 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- Demo/InfPlane/infplane.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/Demo/InfPlane/infplane.c b/Demo/InfPlane/infplane.c index 61a2b910f..eac5bb87b 100644 --- a/Demo/InfPlane/infplane.c +++ b/Demo/InfPlane/infplane.c @@ -444,38 +444,26 @@ static void openlibs(void) static void getvisual(void) { - if (!(scr = LockPubScreen(NULL))) - { - cleanup("Can't lock pub screen!"); - } - - if (GetBitMapAttr(scr->RastPort.BitMap, BMA_DEPTH) <= 8) - { - if (!forcewindow) - { - wbscreen = FALSE; - } - else - { - mustremap = TRUE; - } - } - - if (forcescreen) wbscreen = FALSE; - + if (forcescreen) + wbscreen = FALSE; + if (!wbscreen) { - UnlockPubScreen(NULL, scr); - wbscreen = FALSE; - scr = OpenScreenTags(NULL, SA_Width , W , SA_Height , H , SA_Depth , 8 , TAG_DONE); - if (!scr) cleanup("Can't open screen!"); + if (!scr) cleanup("Failed to open specified screen!"); + } + else if (!(scr = LockPubScreen(NULL))) + { + cleanup("Failed to lock pub screen (workbench)!"); } truecolor = (GetBitMapAttr(scr->RastPort.BitMap, BMA_DEPTH) >= 15) ? TRUE : FALSE; + + if ((!truecolor) && (wbscreen)) + mustremap = TRUE; } /***********************************************************************************/ -- 2.11.4.GIT