Fix bad rebase

This commit is contained in:
Fernando Sahmkow 2019-04-05 19:48:16 -04:00 committed by FernandoS27
parent c60b0b8432
commit 797e351bf8

View file

@ -99,8 +99,7 @@ struct FramebufferCacheKey {
}
};
RasterizerOpenGL::RasterizerOpenGL(Core::Frontend::EmuWindow& window, Core::System& system,
ScreenInfo& info)
RasterizerOpenGL::RasterizerOpenGL(Core::System& system, ScreenInfo& info)
: res_cache{*this}, shader_cache{*this, system}, global_cache{*this}, system{system},
screen_info{info}, buffer_cache(*this, STREAM_BUFFER_SIZE) {
// Create sampler objects