From c40b8a3304b32961bdb74e0f7db2a8e88098076f Mon Sep 17 00:00:00 2001 From: beeanyew Date: Thu, 19 Aug 2021 14:44:25 +0200 Subject: [PATCH] Some RTG driver stuff * Do not explicitly set INDISPLAYCHAIN flag, let P96 handle this through the tooltypes. * Remove 030 card file, was identical to 020 version. * Remove 020i card file, currently not working. * Update build script, remove build of 030 card file and disable building 020i card file. --- platforms/amiga/rtg/rtg_driver_amiga/build.sh | 3 +-- .../amiga/rtg/rtg_driver_amiga/pigfx-2.c | 2 +- .../amiga/rtg/rtg_driver_amiga/pigfx020.card | Bin 5220 -> 5572 bytes .../amiga/rtg/rtg_driver_amiga/pigfx020i.card | Bin 4380 -> 0 bytes .../amiga/rtg/rtg_driver_amiga/pigfx030.card | Bin 5220 -> 0 bytes 5 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 platforms/amiga/rtg/rtg_driver_amiga/pigfx020i.card delete mode 100644 platforms/amiga/rtg/rtg_driver_amiga/pigfx030.card diff --git a/platforms/amiga/rtg/rtg_driver_amiga/build.sh b/platforms/amiga/rtg/rtg_driver_amiga/build.sh index 8ae6895..767433c 100644 --- a/platforms/amiga/rtg/rtg_driver_amiga/build.sh +++ b/platforms/amiga/rtg/rtg_driver_amiga/build.sh @@ -1,3 +1,2 @@ m68k-amigaos-gcc pigfx-2.c -m68020 -O2 -o pigfx020.card -noixemul -Wall -Wextra -Wno-unused-parameter -fomit-frame-pointer -nostartfiles -lamiga -m68k-amigaos-gcc pigfx-2.c -m68030 -O2 -o pigfx030.card -noixemul -Wall -Wextra -Wno-unused-parameter -fomit-frame-pointer -nostartfiles -lamiga -m68k-amigaos-gcc pigfx-2.c -m68020 -O2 -o pigfx020i.card -noixemul -Wall -Wextra -Wno-unused-parameter -fomit-frame-pointer -nostartfiles -lamiga -DIRTG +#m68k-amigaos-gcc pigfx-2.c -m68020 -O2 -o pigfx020i.card -noixemul -Wall -Wextra -Wno-unused-parameter -fomit-frame-pointer -nostartfiles -lamiga -DIRTG diff --git a/platforms/amiga/rtg/rtg_driver_amiga/pigfx-2.c b/platforms/amiga/rtg/rtg_driver_amiga/pigfx-2.c index 6ac9229..f5143a2 100644 --- a/platforms/amiga/rtg/rtg_driver_amiga/pigfx-2.c +++ b/platforms/amiga/rtg/rtg_driver_amiga/pigfx-2.c @@ -259,7 +259,7 @@ int __attribute__((used)) InitCard(__REGA0(struct BoardInfo* b)) { b->PaletteChipType = PCT_S3ViRGE; b->GraphicsControllerType = GCT_S3ViRGE; - b->Flags = BIF_INDISPLAYCHAIN | BIF_GRANTDIRECTACCESS | BIF_HARDWARESPRITE | BIF_FLICKERFIXER; + b->Flags |= BIF_GRANTDIRECTACCESS | BIF_HARDWARESPRITE | BIF_FLICKERFIXER; b->RGBFormats = 1 | 2 | 512 | 1024 | 2048; b->SoftSpriteFlags = 0; b->BitsPerCannon = 8; diff --git a/platforms/amiga/rtg/rtg_driver_amiga/pigfx020.card b/platforms/amiga/rtg/rtg_driver_amiga/pigfx020.card index 2e04d1181a7939009c6e4be96bde8c3d7e8ee3c7..3a4973885306a70a7c235a5b6a5104a6f2df8707 100644 GIT binary patch delta 2378 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 GkpBSsv-ds# diff --git a/platforms/amiga/rtg/rtg_driver_amiga/pigfx020i.card b/platforms/amiga/rtg/rtg_driver_amiga/pigfx020i.card deleted file mode 100644 index 0e70d1a87a3b41503af5266c79fe66e8ca983c86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4380 zcmbVQe{37|6@Pa=Cr&V)lSWlGI(l)u$W1-laiXY%EVa*R>YDV(;s900aIeY5b?eyH z`CJkdG225>wrt|perQ9JhS0Pj6r!rC*o078RTD6_b!oiR4S-G}+dK7nT}+mqNFoV*%;$xg zT1u=!#S0iJZ*5xBzK*C#8OtQiyfGt>Pwb@5WhUzUh$N6BYH2)2vKXL$lS_7~rTE*j zClnw#8S$!LiIA*R6On1ZBY=}!X|Fdx9#6tQOOm=+laz9(o7_splL&WH>!Zu3E8qrX zarEr4WbNct6WBfNq5wI_rIannXW2z5tEEh?P%;Bk`r*u^PWo&?%M~;ETp*j-Z)nCG zP34R0<4n#hWz4IkbnC_1>&z=}+&NeKeF09Vot7oHUL;v9`R7<1qL*qvQYx|#yGTxT z@$ztj(g~#;yHtBvUHte=qMUx2&%RfmJ%)$|XQ@;<5+g3TSw5~4m%kI-PpJZ3}WF1R`(^pxT3h|;2a zkeV<%+A%M=-2(lpXWnI_7nB3^e9t^${A}zzy|m*zU51`Lyed=gyiDZaxRv8ghTuJs zEKi^7n79Ay4Wdiz6x;p67dTxOZsc^2;Nf(y(8cL-p_@@DAOtuygfORvg?>)&5e7J2 z5QaE?LQpt;N*LkvX(7SsqM&lRB#d)=VPi?_IaV(t){4nFA)Zq*TIm^p_ZRryDv?Fe=Y8NlTRE9+o{n ziJ|AnZU~P=LV{ZAT_pkXee5=Dlb2RMem;GdQtczLLR72ygfrD=tNBrn^2d|0e{7LO zfrbuuHZ3_iys88w-(tyvACZXNe4BV;=w>NGdrv4Qrq)fz>>b6*)!{;0o1RmY6liW9qP)lM9+0*k6zpxS+bj%8Y zLAD}(A{eCr%UrDno5DN(gQ}bG^e#9GwWUg$=z5*N>i^U$web&>5elTChthO~Vj)v{|@@m(t`{o80T3Of|!WgBXh1iy#nrAvvn zHg1p7z)EByqEth%KJqw5#dhNUxw@kr$Vx{&D?P{xyl9uZaqsH)wFOyeL000k62%XZ z6y*7^;;%l!yh-?xui22ama##VlU+qH7_gWr52S8d4EEj(AZ@LYYT zo-3UC8FRI*o~wa+uCn!9xvt99_1DPNCr`XOR|Ck^r=>hsxP6~P)#LtJb;N5ZN)A+p z8~wzFe!^~r7(Ord_Z|?pk+k7}{UB`uK15&i`0TljKKnr>;`Z4OosP8GR+>eHY9~%Q zZRFnHx2NLeS?EFs+Ftv08T$!Ak=NHm=Sl3l3Fos8jJGx3qMN(Wm&X2&HJ0tH8@DLb z(Gnw1ON2V%LyKC%<{m%*z@7vV?w9BduDy@tJh|l{wRsf0)gO{Y?`A*V5AnBy1HL@@ zpcg7ME>-or64ms0`!f_Ygrn7T{PTGVl7P3ZxKvFK@R^8iYlF0)j_Z?bPw5(L}viZqFY^{Vi;p|;-X*9DR zW85O>-l1j8+i`kkQp+aia+6>}_ZUO$oZA^MX~H+oe+k&m<5e&+raqQ0@-KEKa~$Nd ztLz@m7?w-;CWK5(&FC|e1?EW8#M->5GoPDg`8-uLHG|Db2G~=n)Rbmw3{r*;Ke&@T z=C;(1*+MCo)-6})DD)*}S1g~+8&Sj1c)V=O;M;gC>(PbUg*DwfmQ!&k$;!^?l9Xhub^ql1&tG|XT^{dR8dT~rQ#`AY`eJQ}@%zqX?HP0+#rI*DG zfJpifh}Cb#ymAJsUw)_7OOK?dm@>=HxUNmHvbJI-vAl8JF)f$NDT3-dkDR!hn9j5I_Oo zsrMV}=Wr^g%~)Yz_NG!=AMZCz?;Dqa#1u@d>(q0rv%A0)(BrTMm#4Viw|GCdr|NrW zrcelm6;bHoKMA}x*4AUn9v+XsVbEE(O-xOdW@a+H-8sN#y)I|f4zd0LJNFlhSMDiT S&`Hh}6|Km8Il>rh-~R$?@+tlR diff --git a/platforms/amiga/rtg/rtg_driver_amiga/pigfx030.card b/platforms/amiga/rtg/rtg_driver_amiga/pigfx030.card deleted file mode 100644 index bfa07e55f7deedcd914b1668ba81cc875cec1871..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5220 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