summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/video_core/gpu_thread.cpp4
-rw-r--r--src/video_core/gpu_thread.h3
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp8
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.h4
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.cpp2
5 files changed, 7 insertions, 14 deletions
diff --git a/src/video_core/gpu_thread.cpp b/src/video_core/gpu_thread.cpp
index 086b2f625..c5dc199c5 100644
--- a/src/video_core/gpu_thread.cpp
+++ b/src/video_core/gpu_thread.cpp
@@ -52,8 +52,8 @@ static void RunThread(VideoCore::RendererBase& renderer, Tegra::DmaPusher& dma_p
52} 52}
53 53
54ThreadManager::ThreadManager(VideoCore::RendererBase& renderer, Tegra::DmaPusher& dma_pusher) 54ThreadManager::ThreadManager(VideoCore::RendererBase& renderer, Tegra::DmaPusher& dma_pusher)
55 : renderer{renderer}, dma_pusher{dma_pusher}, thread{RunThread, std::ref(renderer), 55 : renderer{renderer}, thread{RunThread, std::ref(renderer), std::ref(dma_pusher),
56 std::ref(dma_pusher), std::ref(state)} {} 56 std::ref(state)} {}
57 57
58ThreadManager::~ThreadManager() { 58ThreadManager::~ThreadManager() {
59 // Notify GPU thread that a shutdown is pending 59 // Notify GPU thread that a shutdown is pending
diff --git a/src/video_core/gpu_thread.h b/src/video_core/gpu_thread.h
index 8cd7db1c6..6ab7142f8 100644
--- a/src/video_core/gpu_thread.h
+++ b/src/video_core/gpu_thread.h
@@ -4,10 +4,8 @@
4 4
5#pragma once 5#pragma once
6 6
7#include <array>
8#include <atomic> 7#include <atomic>
9#include <condition_variable> 8#include <condition_variable>
10#include <memory>
11#include <mutex> 9#include <mutex>
12#include <optional> 10#include <optional>
13#include <thread> 11#include <thread>
@@ -177,7 +175,6 @@ private:
177private: 175private:
178 SynchState state; 176 SynchState state;
179 VideoCore::RendererBase& renderer; 177 VideoCore::RendererBase& renderer;
180 Tegra::DmaPusher& dma_pusher;
181 std::thread thread; 178 std::thread thread;
182 std::thread::id thread_id; 179 std::thread::id thread_id;
183}; 180};
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index e06dfe43f..046fc935b 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -100,11 +100,9 @@ struct FramebufferCacheKey {
100 } 100 }
101}; 101};
102 102
103RasterizerOpenGL::RasterizerOpenGL(Core::Frontend::EmuWindow& window, Core::System& system, 103RasterizerOpenGL::RasterizerOpenGL(Core::System& system, ScreenInfo& info)
104 ScreenInfo& info) 104 : res_cache{*this}, shader_cache{*this, system}, global_cache{*this}, system{system},
105 : res_cache{*this}, shader_cache{*this, system}, global_cache{*this}, 105 screen_info{info}, buffer_cache(*this, STREAM_BUFFER_SIZE) {
106 emu_window{window}, system{system}, screen_info{info},
107 buffer_cache(*this, STREAM_BUFFER_SIZE) {
108 // Create sampler objects 106 // Create sampler objects
109 for (std::size_t i = 0; i < texture_samplers.size(); ++i) { 107 for (std::size_t i = 0; i < texture_samplers.size(); ++i) {
110 texture_samplers[i].Create(); 108 texture_samplers[i].Create();
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h
index 30f3e8acb..4de565321 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.h
+++ b/src/video_core/renderer_opengl/gl_rasterizer.h
@@ -50,8 +50,7 @@ struct FramebufferCacheKey;
50 50
51class RasterizerOpenGL : public VideoCore::RasterizerInterface { 51class RasterizerOpenGL : public VideoCore::RasterizerInterface {
52public: 52public:
53 explicit RasterizerOpenGL(Core::Frontend::EmuWindow& window, Core::System& system, 53 explicit RasterizerOpenGL(Core::System& system, ScreenInfo& info);
54 ScreenInfo& info);
55 ~RasterizerOpenGL() override; 54 ~RasterizerOpenGL() override;
56 55
57 void DrawArrays() override; 56 void DrawArrays() override;
@@ -214,7 +213,6 @@ private:
214 ShaderCacheOpenGL shader_cache; 213 ShaderCacheOpenGL shader_cache;
215 GlobalRegionCacheOpenGL global_cache; 214 GlobalRegionCacheOpenGL global_cache;
216 215
217 Core::Frontend::EmuWindow& emu_window;
218 Core::System& system; 216 Core::System& system;
219 217
220 ScreenInfo& screen_info; 218 ScreenInfo& screen_info;
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
index 5e3d862c6..a01efeb05 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
@@ -266,7 +266,7 @@ void RendererOpenGL::CreateRasterizer() {
266 } 266 }
267 // Initialize sRGB Usage 267 // Initialize sRGB Usage
268 OpenGLState::ClearsRGBUsed(); 268 OpenGLState::ClearsRGBUsed();
269 rasterizer = std::make_unique<RasterizerOpenGL>(render_window, system, screen_info); 269 rasterizer = std::make_unique<RasterizerOpenGL>(system, screen_info);
270} 270}
271 271
272void RendererOpenGL::ConfigureFramebufferTexture(TextureInfo& texture, 272void RendererOpenGL::ConfigureFramebufferTexture(TextureInfo& texture,