summaryrefslogtreecommitdiffstats
path: root/src/video_core
diff options
context:
space:
mode:
authorMerryMage <MerryMage@users.noreply.github.com>2016-04-05 14:29:55 +0200
committerMerryMage <MerryMage@users.noreply.github.com>2016-04-05 14:31:17 +0200
commita06dcfeb61d6769c562d6d50cfa3c0024176ae82 (patch)
treee1f81e5faebce62810ac079b8a6e616182c34959 /src/video_core
parentMerge pull request #1302 from Subv/save_fix (diff)
downloadyuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar
yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar.gz
yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar.bz2
yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar.lz
yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar.xz
yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.tar.zst
yuzu-a06dcfeb61d6769c562d6d50cfa3c0024176ae82.zip
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/renderer_base.cpp6
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp3
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer_cache.cpp5
-rw-r--r--src/video_core/shader/shader.cpp1
-rw-r--r--src/video_core/video_core.cpp3
5 files changed, 7 insertions, 11 deletions
diff --git a/src/video_core/renderer_base.cpp b/src/video_core/renderer_base.cpp
index 6467ff723..101f84eb9 100644
--- a/src/video_core/renderer_base.cpp
+++ b/src/video_core/renderer_base.cpp
@@ -4,8 +4,6 @@
#include <memory>
-#include "common/make_unique.h"
-
#include "core/settings.h"
#include "video_core/renderer_base.h"
@@ -19,9 +17,9 @@ void RendererBase::RefreshRasterizerSetting() {
opengl_rasterizer_active = hw_renderer_enabled;
if (hw_renderer_enabled) {
- rasterizer = Common::make_unique<RasterizerOpenGL>();
+ rasterizer = std::make_unique<RasterizerOpenGL>();
} else {
- rasterizer = Common::make_unique<VideoCore::SWRasterizer>();
+ rasterizer = std::make_unique<VideoCore::SWRasterizer>();
}
rasterizer->InitObjects();
rasterizer->Reset();
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index b3dc6aa19..5d91aac00 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -9,7 +9,6 @@
#include "common/color.h"
#include "common/file_util.h"
-#include "common/make_unique.h"
#include "common/math_util.h"
#include "common/microprofile.h"
#include "common/profiler.h"
@@ -674,7 +673,7 @@ void RasterizerOpenGL::ReconfigureDepthTexture(DepthTextureInfo& texture, Pica::
void RasterizerOpenGL::SetShader() {
PicaShaderConfig config = PicaShaderConfig::CurrentConfig();
- std::unique_ptr<PicaShader> shader = Common::make_unique<PicaShader>();
+ std::unique_ptr<PicaShader> shader = std::make_unique<PicaShader>();
// Find (or generate) the GLSL shader for the current TEV state
auto cached_shader = shader_cache.find(config);
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
index a9ad46fe0..1323c12e4 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
@@ -2,8 +2,9 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <memory>
+
#include "common/hash.h"
-#include "common/make_unique.h"
#include "common/math_util.h"
#include "common/microprofile.h"
#include "common/vector_math.h"
@@ -29,7 +30,7 @@ void RasterizerCacheOpenGL::LoadAndBindTexture(OpenGLState &state, unsigned text
} else {
MICROPROFILE_SCOPE(OpenGL_TextureUpload);
- std::unique_ptr<CachedTexture> new_texture = Common::make_unique<CachedTexture>();
+ std::unique_ptr<CachedTexture> new_texture = std::make_unique<CachedTexture>();
new_texture->texture.Create();
state.texture_units[texture_unit].texture_2d = new_texture->texture.handle;
diff --git a/src/video_core/shader/shader.cpp b/src/video_core/shader/shader.cpp
index 509558fc0..045e7d5bd 100644
--- a/src/video_core/shader/shader.cpp
+++ b/src/video_core/shader/shader.cpp
@@ -8,7 +8,6 @@
#include <boost/range/algorithm/fill.hpp>
#include "common/hash.h"
-#include "common/make_unique.h"
#include "common/microprofile.h"
#include "common/profiler.h"
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp
index ee5e50df1..256899c89 100644
--- a/src/video_core/video_core.cpp
+++ b/src/video_core/video_core.cpp
@@ -5,7 +5,6 @@
#include <memory>
#include "common/emu_window.h"
-#include "common/make_unique.h"
#include "common/logging/log.h"
#include "core/core.h"
@@ -32,7 +31,7 @@ bool Init(EmuWindow* emu_window) {
Pica::Init();
g_emu_window = emu_window;
- g_renderer = Common::make_unique<RendererOpenGL>();
+ g_renderer = std::make_unique<RendererOpenGL>();
g_renderer->SetWindow(g_emu_window);
if (g_renderer->Init()) {
LOG_DEBUG(Render, "initialized OK");