diff options
| author |  Fernando Sahmkow | 2019-04-05 19:48:16 -0400 |
|---|---|---|
| committer | FernandoS27 | 2019-04-08 11:35:22 -0400 |
| commit | 797e351bf816f86f689ee2704eb95c63411d4002 (patch) | |
| tree | 79f5d827cf5d039d5f433c23184ff5ff76939a96 /src | |
| parent | Fix TMML (diff) | |
| download | yuzu-797e351bf816f86f689ee2704eb95c63411d4002.tar.gz yuzu-797e351bf816f86f689ee2704eb95c63411d4002.tar.xz yuzu-797e351bf816f86f689ee2704eb95c63411d4002.zip | |
Fix bad rebase
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 30cad484a..ed1e97a73 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -99,8 +99,7 @@ struct FramebufferCacheKey { | |||
| 99 | } | 99 | } |
| 100 | }; | 100 | }; |
| 101 | 101 | ||
| 102 | RasterizerOpenGL::RasterizerOpenGL(Core::Frontend::EmuWindow& window, Core::System& system, | 102 | RasterizerOpenGL::RasterizerOpenGL(Core::System& system, ScreenInfo& info) |
| 103 | ScreenInfo& info) | ||
| 104 | : res_cache{*this}, shader_cache{*this, system}, global_cache{*this}, system{system}, | 103 | : res_cache{*this}, shader_cache{*this, system}, global_cache{*this}, system{system}, |
| 105 | screen_info{info}, buffer_cache(*this, STREAM_BUFFER_SIZE) { | 104 | screen_info{info}, buffer_cache(*this, STREAM_BUFFER_SIZE) { |
| 106 | // Create sampler objects | 105 | // Create sampler objects |