summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/OGL/FramebufferManager.h
diff options
context:
space:
mode:
authorDolphin Bot <dolphin-emu-bot@users.noreply.github.com>2014-12-20 20:35:36 +0100
committerDolphin Bot <dolphin-emu-bot@users.noreply.github.com>2014-12-20 20:35:36 +0100
commitf978d141c83659eedb961b141f358cfbf3f78a8b (patch)
tree0477efa90871b363c19f2e25f0dbacee61096c6c /Source/Core/VideoBackends/OGL/FramebufferManager.h
parentf8bf938f376fd9f62e9f6880d7ce2810c26effc2 (diff)
parentd37b65c1176ae661210282be772101e20b0240a2 (diff)
Merge pull request #1720 from Armada651/stereo-msaa
FramebufferManager: Support resolving a multi-layered EFB
Diffstat (limited to 'Source/Core/VideoBackends/OGL/FramebufferManager.h')
-rw-r--r--Source/Core/VideoBackends/OGL/FramebufferManager.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/VideoBackends/OGL/FramebufferManager.h b/Source/Core/VideoBackends/OGL/FramebufferManager.h
index 8d42523bcc..ffc2970ee6 100644
--- a/Source/Core/VideoBackends/OGL/FramebufferManager.h
+++ b/Source/Core/VideoBackends/OGL/FramebufferManager.h
@@ -68,11 +68,11 @@ public:
static GLuint GetEFBColorTexture(const EFBRectangle& sourceRc);
static GLuint GetEFBDepthTexture(const EFBRectangle& sourceRc);
- static GLuint GetEFBFramebuffer() { return m_efbFramebuffer; }
+ static GLuint GetEFBFramebuffer() { return m_efbFramebuffer[0]; }
static GLuint GetXFBFramebuffer() { return m_xfbFramebuffer; }
// Resolved framebuffer is only used in MSAA mode.
- static GLuint GetResolvedFramebuffer() { return m_resolvedFramebuffer; }
+ static GLuint GetResolvedFramebuffer() { return m_resolvedFramebuffer[0]; }
static void SetFramebuffer(GLuint fb);
static void FramebufferTexture(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
@@ -102,14 +102,14 @@ private:
static int m_msaaSamples;
static GLenum m_textureType;
- static GLuint m_efbFramebuffer;
+ static GLuint* m_efbFramebuffer;
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, TODO: try to avoid them
- static GLuint m_resolvedFramebuffer;
+ static GLuint* m_resolvedFramebuffer;
static GLuint m_resolvedColorTexture;
static GLuint m_resolvedDepthTexture;