From afea848e3b967d08226aa3909fe3e602882ee5ae Mon Sep 17 00:00:00 2001 From: degasus Date: Wed, 30 Apr 2014 18:13:31 +0200 Subject: ogl: drop csaa support --- Source/Core/VideoBackends/OGL/FramebufferManager.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Source/Core/VideoBackends/OGL/FramebufferManager.h') diff --git a/Source/Core/VideoBackends/OGL/FramebufferManager.h b/Source/Core/VideoBackends/OGL/FramebufferManager.h index db63955cc4..583684b352 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,7 +99,6 @@ private: static int m_targetWidth; static int m_targetHeight; static int m_msaaSamples; - static int m_msaaCoverageSamples; static GLuint m_efbFramebuffer; static GLuint m_efbColor; // Renderbuffer in MSAA mode; Texture otherwise -- cgit v1.2.3 From c1b6fcc00baaf877401b9f70a24520c14d8c124b Mon Sep 17 00:00:00 2001 From: degasus Date: Thu, 1 May 2014 12:45:05 +0200 Subject: ogl: pixel format shader without resolving v2: Don't use std::to_string as this function is broken on android. --- Source/Core/VideoBackends/OGL/FramebufferManager.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'Source/Core/VideoBackends/OGL/FramebufferManager.h') diff --git a/Source/Core/VideoBackends/OGL/FramebufferManager.h b/Source/Core/VideoBackends/OGL/FramebufferManager.h index 583684b352..2025fc5b6b 100644 --- a/Source/Core/VideoBackends/OGL/FramebufferManager.h +++ b/Source/Core/VideoBackends/OGL/FramebufferManager.h @@ -100,17 +100,19 @@ private: static int m_targetHeight; static int m_msaaSamples; + 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]; }; -- cgit v1.2.3