diff options
| author | Scott Mansell <phiren@gmail.com> | 2015-12-23 12:16:28 +1300 |
|---|---|---|
| committer | Scott Mansell <phiren@gmail.com> | 2015-12-23 12:16:28 +1300 |
| commit | 14e976a5f1293f53c23609a71d2b6c0190d239a1 (patch) | |
| tree | bfc22773961c16c191c704e8873621ec175d7082 /Source/Core/VideoBackends/OGL/FramebufferManager.h | |
| parent | 1b69743ba14ebca7c51862b7df8da6751eb213f0 (diff) | |
| parent | e422af9cce63307fb441fefd1a450f275c6f15a5 (diff) | |
Merge pull request #3380 from lioncash/fb
FramebufferManager: Get rid of raw new and delete
Diffstat (limited to 'Source/Core/VideoBackends/OGL/FramebufferManager.h')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/FramebufferManager.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/Core/VideoBackends/OGL/FramebufferManager.h b/Source/Core/VideoBackends/OGL/FramebufferManager.h index 0aeffeb680..cd81830834 100644 --- a/Source/Core/VideoBackends/OGL/FramebufferManager.h +++ b/Source/Core/VideoBackends/OGL/FramebufferManager.h @@ -5,6 +5,7 @@ #pragma once #include <memory> +#include <vector> #include "Common/GL/GLUtil.h" #include "VideoBackends/OGL/ProgramShaderCache.h" @@ -69,7 +70,7 @@ public: static GLuint GetEFBColorTexture(const EFBRectangle& sourceRc); static GLuint GetEFBDepthTexture(const EFBRectangle& sourceRc); - static GLuint GetEFBFramebuffer(unsigned int layer = 0) { return (layer < m_EFBLayers) ? m_efbFramebuffer[layer] : m_efbFramebuffer[m_EFBLayers - 1]; } + static GLuint GetEFBFramebuffer(unsigned int layer = 0) { return (layer < m_EFBLayers) ? m_efbFramebuffer[layer] : m_efbFramebuffer.back(); } static GLuint GetXFBFramebuffer() { return m_xfbFramebuffer; } // Resolved framebuffer is only used in MSAA mode. @@ -105,14 +106,14 @@ private: static int m_msaaSamples; static GLenum m_textureType; - static GLuint* m_efbFramebuffer; + static std::vector<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 std::vector<GLuint> m_resolvedFramebuffer; static GLuint m_resolvedColorTexture; static GLuint m_resolvedDepthTexture; |