Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-10-31 13:50:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1643 from MerryMage/make_unique

Browse source 
Common: Remove Common::make_unique, use std::make_unique
This commit is contained in:
Mathew Maidment 2016-04-05 20:10:11 -04:00
commit aa6380e5bc
24 changed files with 46 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/video_core/renderer_base.cpp
View file

@ -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();

3
src/video_core/renderer_opengl/gl_rasterizer.cpp
View file

@ -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);

5
src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
View file

@ -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;

1
src/video_core/shader/shader.cpp
View file

@ -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"

3
src/video_core/video_core.cpp
View file

@ -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");