X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fgpu.h;h=ef9c71838442e975727a1618c0140e9f9c8f6f5f;hb=979b861b31ef1f5033db5bd4433b842944300a3e;hp=63a5572034d10e58dabe036cefb140ed1df3a1df;hpb=c2502333b2e56e520bb9ecc2f931a639eee415d7;p=pcsx_rearmed.git

diff --git a/libpcsxcore/gpu.h b/libpcsxcore/gpu.h
index 63a55720..ef9c7183 100644
--- a/libpcsxcore/gpu.h
+++ b/libpcsxcore/gpu.h
@@ -21,20 +21,34 @@
  *    that GPU plugin doesn't.
  */
 
-#define PSXGPU_LCF     (1<<31)
-#define PSXGPU_nBUSY   (1<<26)
-#define PSXGPU_ILACE   (1<<22)
-#define PSXGPU_DHEIGHT (1<<19)
+#ifndef __GPU_H__
+#define __GPU_H__
+
+#define PSXGPU_LCF     (1u<<31)
+#define PSXGPU_nBUSY   (1u<<26)
+#define PSXGPU_ILACE   (1u<<22)
+#define PSXGPU_DHEIGHT (1u<<19)
+#define PSXGPU_FIELD   (1u<<13)
 
 // both must be set for interlace to work
-#define PSXGPU_ILACE_BITS (PSXGPU_ILACE | PSXGPU_DHEIGHT)
+#define PSXGPU_ILACE_BITS (PSXGPU_ILACE | PSXGPU_DHEIGHT | PSXGPU_FIELD)
 
 #define HW_GPU_STATUS psxHu32ref(0x1814)
 
 // TODO: handle com too
-#define PSXGPU_TIMING_BITS (PSXGPU_LCF | PSXGPU_nBUSY)
+#define PSXGPU_TIMING_BITS (PSXGPU_LCF | PSXGPU_nBUSY | PSXGPU_FIELD)
 
 #define gpuSyncPluginSR() { \
-	HW_GPU_STATUS &= PSXGPU_TIMING_BITS; \
-	HW_GPU_STATUS |= GPU_readStatus() & ~PSXGPU_TIMING_BITS; \
+	HW_GPU_STATUS &= SWAP32(PSXGPU_TIMING_BITS); \
+	HW_GPU_STATUS |= SWAP32(GPU_readStatus() & ~PSXGPU_TIMING_BITS); \
 }
+
+enum psx_gpu_state {
+  PGS_VRAM_TRANSFER_START,
+  PGS_VRAM_TRANSFER_END,
+  PGS_PRIMITIVE_START, // for non-dma only
+};
+
+void gpu_state_change(int what);
+
+#endif /* __GPU_H__ */