From 64f60f718997c90617d8e72b2454781e7e39cb9a Mon Sep 17 00:00:00 2001
From: Luke Usher <luke.usher@outlook.com>
Date: Mon, 2 Apr 2018 19:59:37 +0100
Subject: [PATCH] More Tweaks

---
 src/devices/video/EmuNV2A_PGRAPH.cpp | 2 --
 src/devices/video/EmuNV2A_PVIDEO.cpp | 4 ++--
 src/devices/video/nv2a.cpp           | 2 ++
 src/devices/video/nv2a.h             | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/devices/video/EmuNV2A_PGRAPH.cpp b/src/devices/video/EmuNV2A_PGRAPH.cpp
index 5b97fdffb..2f686af7b 100644
--- a/src/devices/video/EmuNV2A_PGRAPH.cpp
+++ b/src/devices/video/EmuNV2A_PGRAPH.cpp
@@ -467,8 +467,6 @@ DEVICE_WRITE32(PGRAPH)
 				% GET_MASK(d->pgraph.regs[NV_PGRAPH_SURFACE],
 					NV_PGRAPH_SURFACE_MODULO_3D));
 			qemu_cond_broadcast(&d->pgraph.flip_3d);
-
-			NV2ADevice::SwapBuffers(d);
 		}
 		break;
 	case NV_PGRAPH_FIFO:
diff --git a/src/devices/video/EmuNV2A_PVIDEO.cpp b/src/devices/video/EmuNV2A_PVIDEO.cpp
index 250b77866..dfe9f4938 100644
--- a/src/devices/video/EmuNV2A_PVIDEO.cpp
+++ b/src/devices/video/EmuNV2A_PVIDEO.cpp
@@ -28,12 +28,12 @@ DEVICE_WRITE32(PVIDEO)
 	switch (addr) {
 	case NV_PVIDEO_BUFFER:
 		d->pvideo.regs[addr] = value;
-		// TODO : d->vga.enable_overlay = true;
+		d->enable_overlay = true;
 		pvideo_vga_invalidate(d);
 		break;
 	case NV_PVIDEO_STOP:
 		d->pvideo.regs[NV_PVIDEO_BUFFER] = 0;
-		// TODO : d->vga.enable_overlay = false;
+		d->enable_overlay = false;
 		pvideo_vga_invalidate(d);
 		break;
 	default:
diff --git a/src/devices/video/nv2a.cpp b/src/devices/video/nv2a.cpp
index 63bc30d9f..826a64bda 100644
--- a/src/devices/video/nv2a.cpp
+++ b/src/devices/video/nv2a.cpp
@@ -450,6 +450,8 @@ static void nv2a_vblank_thread(NV2AState *d)
 			d->pcrtc.pending_interrupts |= NV_PCRTC_INTR_0_VBLANK;
 			update_irq(d);
 			nextVBlankTime = GetNextVBlankTime();
+
+			NV2ADevice::SwapBuffers(d);
 		}
 	}
 }
diff --git a/src/devices/video/nv2a.h b/src/devices/video/nv2a.h
index dba4b3463..4eb3212bb 100644
--- a/src/devices/video/nv2a.h
+++ b/src/devices/video/nv2a.h
@@ -495,6 +495,7 @@ typedef struct NV2AState {
     // PCIDevice dev;
     // qemu_irq irq;
     bool exiting;
+	bool enable_overlay = false;
 
     // VGACommonState vga;
     // GraphicHwOps hw_ops;