diff options
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/renderer_base.cpp | 6 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 3 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 5 | ||||
| -rw-r--r-- | src/video_core/shader/shader.cpp | 1 | ||||
| -rw-r--r-- | src/video_core/video_core.cpp | 3 |
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 @@ | |||
| 4 | 4 | ||
| 5 | #include <memory> | 5 | #include <memory> |
| 6 | 6 | ||
| 7 | #include "common/make_unique.h" | ||
| 8 | |||
| 9 | #include "core/settings.h" | 7 | #include "core/settings.h" |
| 10 | 8 | ||
| 11 | #include "video_core/renderer_base.h" | 9 | #include "video_core/renderer_base.h" |
| @@ -19,9 +17,9 @@ void RendererBase::RefreshRasterizerSetting() { | |||
| 19 | opengl_rasterizer_active = hw_renderer_enabled; | 17 | opengl_rasterizer_active = hw_renderer_enabled; |
| 20 | 18 | ||
| 21 | if (hw_renderer_enabled) { | 19 | if (hw_renderer_enabled) { |
| 22 | rasterizer = Common::make_unique<RasterizerOpenGL>(); | 20 | rasterizer = std::make_unique<RasterizerOpenGL>(); |
| 23 | } else { | 21 | } else { |
| 24 | rasterizer = Common::make_unique<VideoCore::SWRasterizer>(); | 22 | rasterizer = std::make_unique<VideoCore::SWRasterizer>(); |
| 25 | } | 23 | } |
| 26 | rasterizer->InitObjects(); | 24 | rasterizer->InitObjects(); |
| 27 | rasterizer->Reset(); | 25 | rasterizer->Reset(); |
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 @@ | |||
| 9 | 9 | ||
| 10 | #include "common/color.h" | 10 | #include "common/color.h" |
| 11 | #include "common/file_util.h" | 11 | #include "common/file_util.h" |
| 12 | #include "common/make_unique.h" | ||
| 13 | #include "common/math_util.h" | 12 | #include "common/math_util.h" |
| 14 | #include "common/microprofile.h" | 13 | #include "common/microprofile.h" |
| 15 | #include "common/profiler.h" | 14 | #include "common/profiler.h" |
| @@ -677,7 +676,7 @@ void RasterizerOpenGL::ReconfigureDepthTexture(DepthTextureInfo& texture, Pica:: | |||
| 677 | 676 | ||
| 678 | void RasterizerOpenGL::SetShader() { | 677 | void RasterizerOpenGL::SetShader() { |
| 679 | PicaShaderConfig config = PicaShaderConfig::CurrentConfig(); | 678 | PicaShaderConfig config = PicaShaderConfig::CurrentConfig(); |
| 680 | std::unique_ptr<PicaShader> shader = Common::make_unique<PicaShader>(); | 679 | std::unique_ptr<PicaShader> shader = std::make_unique<PicaShader>(); |
| 681 | 680 | ||
| 682 | // Find (or generate) the GLSL shader for the current TEV state | 681 | // Find (or generate) the GLSL shader for the current TEV state |
| 683 | auto cached_shader = shader_cache.find(config); | 682 | 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 @@ | |||
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include <memory> | ||
| 6 | |||
| 5 | #include "common/hash.h" | 7 | #include "common/hash.h" |
| 6 | #include "common/make_unique.h" | ||
| 7 | #include "common/math_util.h" | 8 | #include "common/math_util.h" |
| 8 | #include "common/microprofile.h" | 9 | #include "common/microprofile.h" |
| 9 | #include "common/vector_math.h" | 10 | #include "common/vector_math.h" |
| @@ -29,7 +30,7 @@ void RasterizerCacheOpenGL::LoadAndBindTexture(OpenGLState &state, unsigned text | |||
| 29 | } else { | 30 | } else { |
| 30 | MICROPROFILE_SCOPE(OpenGL_TextureUpload); | 31 | MICROPROFILE_SCOPE(OpenGL_TextureUpload); |
| 31 | 32 | ||
| 32 | std::unique_ptr<CachedTexture> new_texture = Common::make_unique<CachedTexture>(); | 33 | std::unique_ptr<CachedTexture> new_texture = std::make_unique<CachedTexture>(); |
| 33 | 34 | ||
| 34 | new_texture->texture.Create(); | 35 | new_texture->texture.Create(); |
| 35 | state.texture_units[texture_unit].texture_2d = new_texture->texture.handle; | 36 | 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 eb1db0778..78d295c76 100644 --- a/src/video_core/shader/shader.cpp +++ b/src/video_core/shader/shader.cpp | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #include <boost/range/algorithm/fill.hpp> | 8 | #include <boost/range/algorithm/fill.hpp> |
| 9 | 9 | ||
| 10 | #include "common/hash.h" | 10 | #include "common/hash.h" |
| 11 | #include "common/make_unique.h" | ||
| 12 | #include "common/microprofile.h" | 11 | #include "common/microprofile.h" |
| 13 | #include "common/profiler.h" | 12 | #include "common/profiler.h" |
| 14 | 13 | ||
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 @@ | |||
| 5 | #include <memory> | 5 | #include <memory> |
| 6 | 6 | ||
| 7 | #include "common/emu_window.h" | 7 | #include "common/emu_window.h" |
| 8 | #include "common/make_unique.h" | ||
| 9 | #include "common/logging/log.h" | 8 | #include "common/logging/log.h" |
| 10 | 9 | ||
| 11 | #include "core/core.h" | 10 | #include "core/core.h" |
| @@ -32,7 +31,7 @@ bool Init(EmuWindow* emu_window) { | |||
| 32 | Pica::Init(); | 31 | Pica::Init(); |
| 33 | 32 | ||
| 34 | g_emu_window = emu_window; | 33 | g_emu_window = emu_window; |
| 35 | g_renderer = Common::make_unique<RendererOpenGL>(); | 34 | g_renderer = std::make_unique<RendererOpenGL>(); |
| 36 | g_renderer->SetWindow(g_emu_window); | 35 | g_renderer->SetWindow(g_emu_window); |
| 37 | if (g_renderer->Init()) { | 36 | if (g_renderer->Init()) { |
| 38 | LOG_DEBUG(Render, "initialized OK"); | 37 | LOG_DEBUG(Render, "initialized OK"); |