summaryrefslogtreecommitdiff
path: root/src/video_core
diff options
context:
space:
mode:
authorGravatar bunnei2014-04-27 18:29:51 -0400
committerGravatar bunnei2014-04-27 18:29:51 -0400
commita48c6b947d5314ab804f375cca22af159cc3b77b (patch)
tree5f49ac6edc39d37c9b49514217957b47e73505f2 /src/video_core
parentfixed weird spacing (diff)
downloadyuzu-a48c6b947d5314ab804f375cca22af159cc3b77b.tar.gz
yuzu-a48c6b947d5314ab804f375cca22af159cc3b77b.tar.xz
yuzu-a48c6b947d5314ab804f375cca22af159cc3b77b.zip
removed DISALLOW_COPY_AND_ASSIGN in favor of NonCopyable class
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/renderer_base.h4
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.h1
2 files changed, 1 insertions, 4 deletions
diff --git a/src/video_core/renderer_base.h b/src/video_core/renderer_base.h
index bc65bf0ce..2650620b4 100644
--- a/src/video_core/renderer_base.h
+++ b/src/video_core/renderer_base.h
@@ -6,7 +6,7 @@
6 6
7#include "common/common.h" 7#include "common/common.h"
8 8
9class RendererBase { 9class RendererBase : NonCopyable {
10public: 10public:
11 11
12 /// Used to reference a framebuffer 12 /// Used to reference a framebuffer
@@ -52,6 +52,4 @@ protected:
52 f32 m_current_fps; ///< Current framerate, should be set by the renderer 52 f32 m_current_fps; ///< Current framerate, should be set by the renderer
53 int m_current_frame; ///< Current frame, should be set by the renderer 53 int m_current_frame; ///< Current frame, should be set by the renderer
54 54
55private:
56 DISALLOW_COPY_AND_ASSIGN(RendererBase);
57}; 55};
diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h
index 676a0ea02..4c0b6e59d 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.h
+++ b/src/video_core/renderer_opengl/renderer_opengl.h
@@ -87,5 +87,4 @@ private:
87 u8 m_xfb_top_flipped[VideoCore::kScreenTopWidth * VideoCore::kScreenTopWidth * 4]; 87 u8 m_xfb_top_flipped[VideoCore::kScreenTopWidth * VideoCore::kScreenTopWidth * 4];
88 u8 m_xfb_bottom_flipped[VideoCore::kScreenTopWidth * VideoCore::kScreenTopWidth * 4]; 88 u8 m_xfb_bottom_flipped[VideoCore::kScreenTopWidth * VideoCore::kScreenTopWidth * 4];
89 89
90 DISALLOW_COPY_AND_ASSIGN(RendererOpenGL);
91}; \ No newline at end of file 90}; \ No newline at end of file