summaryrefslogtreecommitdiffstats
path: root/src/video_core/renderer_opengl
diff options
context:
space:
mode:
authorMathew Maidment <mathew1800@gmail.com>2016-04-06 02:10:11 +0200
committerMathew Maidment <mathew1800@gmail.com>2016-04-06 02:10:11 +0200
commitaa6380e5bc9c3b40e53c001e76838819d61ca62a (patch)
tree22d8a5dc94874820d5bd7a8964485153db234672 /src/video_core/renderer_opengl
parentMerge pull request #1620 from LFsWang/path (diff)
parentCommon: Remove Common::make_unique, use std::make_unique (diff)
downloadyuzu-aa6380e5bc9c3b40e53c001e76838819d61ca62a.tar
yuzu-aa6380e5bc9c3b40e53c001e76838819d61ca62a.tar.gz
yuzu-aa6380e5bc9c3b40e53c001e76838819d61ca62a.tar.bz2
yuzu-aa6380e5bc9c3b40e53c001e76838819d61ca62a.tar.lz
yuzu-aa6380e5bc9c3b40e53c001e76838819d61ca62a.tar.xz
yuzu-aa6380e5bc9c3b40e53c001e76838819d61ca62a.tar.zst
yuzu-aa6380e5bc9c3b40e53c001e76838819d61ca62a.zip
Diffstat (limited to 'src/video_core/renderer_opengl')
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp3
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer_cache.cpp5
2 files changed, 4 insertions, 4 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index 21ad9ee77..cc6b3aeab 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"
@@ -677,7 +676,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;