Merge pull request #331 from degasus/kill_csaa

OpenGL: Use a sample-able texture as EFB instead of renderbuffer.

1 files changed, 9 insertions, 8 deletions

diff --git a/Source/Core/VideoBackends/OGL/FramebufferManager.h b/Source/Core/VideoBackends/OGL/FramebufferManager.h
index db63955cc4..2025fc5b6b 100644
--- a/Source/Core/VideoBackends/OGL/FramebufferManager.h
+++ b/Source/Core/VideoBackends/OGL/FramebufferManager.h
@@ -60,7 +60,7 @@ struct XFBSource : public XFBSourceBase
 class FramebufferManager : public FramebufferManagerBase
 {
 public:
-	FramebufferManager(int targetWidth, int targetHeight, int msaaSamples, int msaaCoverageSamples);
+	FramebufferManager(int targetWidth, int targetHeight, int msaaSamples);
 	~FramebufferManager();
 
 	// To get the EFB in texture form, these functions may have to transfer
@@ -99,19 +99,20 @@ private:
 	static int m_targetWidth;
 	static int m_targetHeight;
 	static int m_msaaSamples;
-	static int m_msaaCoverageSamples;
+
+	static GLenum m_textureType;
 
 	static GLuint m_efbFramebuffer;
-	static GLuint m_efbColor; // Renderbuffer in MSAA mode; Texture otherwise
-	static GLuint m_efbDepth; // Renderbuffer in MSAA mode; Texture otherwise
+	static GLuint m_xfbFramebuffer;
+	static GLuint m_efbColor;
+	static GLuint m_efbDepth;
+	static GLuint m_efbColorSwap;// will be hot swapped with m_efbColor when reinterpreting EFB pixel formats
 
-	// Only used in MSAA mode and to convert pixel format
-	static GLuint m_resolvedFramebuffer; // will be hot swapped with m_efbColor on non-msaa pixel format change
+	// Only used in MSAA mode, TODO: try to avoid them
+	static GLuint m_resolvedFramebuffer;
 	static GLuint m_resolvedColorTexture;
 	static GLuint m_resolvedDepthTexture;
 
-	static GLuint m_xfbFramebuffer; // Only used in MSAA mode
-
 	// For pixel format draw
 	static SHADER m_pixel_format_shaders[2];
 };