Merge branch 'master' into mii_selector

include/services/gsp_gpu.hpp

@@ -40,6 +40,26 @@ class GPUService {
 	MAKE_LOG_FUNCTION(log, gspGPULogger)
 	void processCommandBuffer();
 
+	struct FramebufferInfo {
+		u32 activeFb;
+		u32 leftFramebufferVaddr;
+		u32 rightFramebufferVaddr;
+		u32 stride;
+		u32 format;
+		u32 displayFb;
+		u32 attribute;
+	};
+	static_assert(sizeof(FramebufferInfo) == 28, "GSP::GPU::FramebufferInfo has the wrong size");
+
+	struct FramebufferUpdate {
+		u8 index;
+		u8 dirtyFlag;
+		u16 pad0;
+		std::array<FramebufferInfo, 2> framebufferInfo;
+		u32 pad1;
+	};
+	static_assert(sizeof(FramebufferUpdate) == 64, "GSP::GPU::FramebufferUpdate has the wrong size");
+
 	// Service commands
 	void acquireRight(u32 messagePointer);
 	void flushDataCache(u32 messagePointer);
@@ -47,6 +67,7 @@ class GPUService {
 	void registerInterruptRelayQueue(u32 messagePointer);
 	void saveVramSysArea(u32 messagePointer);
 	void setAxiConfigQoSMode(u32 messagePointer);
+	void setBufferSwap(u32 messagePointer);
 	void setInternalPriorities(u32 messagePointer);
 	void setLCDForceBlack(u32 messagePointer);
 	void storeDataCache(u32 messagePointer);
@@ -62,6 +83,8 @@ class GPUService {
 	void triggerTextureCopy(u32* cmd);
 	void flushCacheRegions(u32* cmd);
 
+	void setBufferSwapImpl(u32 screen_id, const FramebufferInfo& info);
+
 public:
 	GPUService(Memory& mem, GPU& gpu, Kernel& kernel, u32& currentPID) : mem(mem), gpu(gpu),
 		kernel(kernel), currentPID(currentPID) {}
@@ -74,4 +97,4 @@ public:
 			std::memset(ptr, 0, 0x1000);
 		}
 	}
-};
+};