diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 8 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.h | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.cpp | 2 |
3 files changed, 5 insertions, 9 deletions
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 | ||
| 103 | RasterizerOpenGL::RasterizerOpenGL(Core::Frontend::EmuWindow& window, Core::System& system, | 103 | RasterizerOpenGL::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 | ||
| 51 | class RasterizerOpenGL : public VideoCore::RasterizerInterface { | 51 | class RasterizerOpenGL : public VideoCore::RasterizerInterface { |
| 52 | public: | 52 | public: |
| 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 | ||
| 272 | void RendererOpenGL::ConfigureFramebufferTexture(TextureInfo& texture, | 272 | void RendererOpenGL::ConfigureFramebufferTexture(TextureInfo& texture, |