From 81d9242514b4e8e3fe97cf7063a15680f610bf2f Mon Sep 17 00:00:00 2001
From: XaviDCR92 <xavi.dcr@gmail.com>
Date: Wed, 7 Feb 2018 18:15:07 +0100
Subject: * I think GameGraphics() can be executed as long as GPU has received
 all DMA blocks. Remove if something goes wrong.

---
 Source/Exe/AIRPORT.elf | Bin 330656 -> 330572 bytes
 Source/Exe/AIRPORT.iso | Bin 1480704 -> 1480704 bytes
 Source/Game.c          |   4 +---
 Source/Gfx.c           |   2 +-
 Source/Makefile        |   2 +-
 5 files changed, 3 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 Source/Exe/AIRPORT.elf

(limited to 'Source')

diff --git a/Source/Exe/AIRPORT.elf b/Source/Exe/AIRPORT.elf
old mode 100644
new mode 100755
index 074d649..72a9f0f
Binary files a/Source/Exe/AIRPORT.elf and b/Source/Exe/AIRPORT.elf differ
diff --git a/Source/Exe/AIRPORT.iso b/Source/Exe/AIRPORT.iso
index 77a91f2..dc164f6 100644
Binary files a/Source/Exe/AIRPORT.iso and b/Source/Exe/AIRPORT.iso differ
diff --git a/Source/Game.c b/Source/Game.c
index f3fd11a..0263933 100644
--- a/Source/Game.c
+++ b/Source/Game.c
@@ -1062,7 +1062,7 @@ void GameGraphics(void)
 
 	SystemAcknowledgeFrame();
 
-	while ( (SystemRefreshNeeded() == false) || (GfxIsGPUBusy() != false) );
+	while ( (SystemRefreshNeeded() == false) || (GfxReadyForDMATransfer() == false) );
 
 	if (TwoPlayersActive != false)
 	{
@@ -1075,8 +1075,6 @@ void GameGraphics(void)
 		GfxIncreaseGlobalLuminance(1);
 	}
 
-	while (GsIsDrawing());
-
 	for (i = 0; i < MAX_PLAYERS ; i++)
 	{
 		TYPE_PLAYER* ptrPlayer = &PlayerData[i];
diff --git a/Source/Gfx.c b/Source/Gfx.c
index 879ec37..d4de561 100644
--- a/Source/Gfx.c
+++ b/Source/Gfx.c
@@ -263,7 +263,7 @@ void GfxDrawScene_Fast(void)
  * **********************************************************************/
 bool GfxReadyForDMATransfer(void)
 {
-	return ( (GPUSTAT & 1<<28) && !(D2_CHCR & 1<<24) );
+	return (!(D2_CHCR & 1<<24));
 }
 
 /* **********************************************************************
diff --git a/Source/Makefile b/Source/Makefile
index e47a3da..7de5746 100644
--- a/Source/Makefile
+++ b/Source/Makefile
@@ -27,7 +27,7 @@ CDROM_ROOT=$(PROJECT_DIR)/cdimg
 BIN_TARGET_PATH = $(PROJECT_DIR)/Bin
 
 #Uncomment this DEFINE below to use Airport together with OpenSend + QPSXSerial toolchain.
-DEFINE +=  -DSERIAL_INTERFACE
+#DEFINE +=  -DSERIAL_INTERFACE
 
 # PSXSDK tools definitions
 # ELF2EXE:
-- 
cgit v1.2.3