diff options
author | bunnei <bunneidev@gmail.com> | 2018-03-27 03:06:37 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2018-03-27 03:17:07 +0200 |
commit | 5e343edc9e4606ebdf2cceef7a56336e0a92f69c (patch) | |
tree | 2a9adcdcc7b3947242f3d4717302dc29425e8b0d | |
parent | graphics_surface: Remove superfluous cast. (diff) | |
download | yuzu-5e343edc9e4606ebdf2cceef7a56336e0a92f69c.tar yuzu-5e343edc9e4606ebdf2cceef7a56336e0a92f69c.tar.gz yuzu-5e343edc9e4606ebdf2cceef7a56336e0a92f69c.tar.bz2 yuzu-5e343edc9e4606ebdf2cceef7a56336e0a92f69c.tar.lz yuzu-5e343edc9e4606ebdf2cceef7a56336e0a92f69c.tar.xz yuzu-5e343edc9e4606ebdf2cceef7a56336e0a92f69c.tar.zst yuzu-5e343edc9e4606ebdf2cceef7a56336e0a92f69c.zip |
-rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.cpp | 12 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 82063df72..78b50b227 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -119,7 +119,7 @@ void RendererOpenGL::SwapBuffers(boost::optional<const Tegra::FramebufferConfig& // Load the framebuffer from memory, draw it to the screen, and swap buffers LoadFBToScreenInfo(*framebuffer, screen_info); - DrawScreens(); + DrawScreen(); render_window->SwapBuffers(); } @@ -293,8 +293,8 @@ void RendererOpenGL::ConfigureFramebufferTexture(TextureInfo& texture, state.Apply(); } -void RendererOpenGL::DrawSingleScreen(const ScreenInfo& screen_info, float x, float y, float w, - float h) { +void RendererOpenGL::DrawScreenTriangles(const ScreenInfo& screen_info, float x, float y, float w, + float h) { const auto& texcoords = screen_info.display_texcoords; auto left = texcoords.left; auto right = texcoords.right; @@ -330,7 +330,7 @@ void RendererOpenGL::DrawSingleScreen(const ScreenInfo& screen_info, float x, fl /** * Draws the emulated screens to the emulator window. */ -void RendererOpenGL::DrawScreens() { +void RendererOpenGL::DrawScreen() { const auto& layout = render_window->GetFramebufferLayout(); const auto& screen = layout.screen; @@ -346,8 +346,8 @@ void RendererOpenGL::DrawScreens() { glActiveTexture(GL_TEXTURE0); glUniform1i(uniform_color_texture, 0); - DrawSingleScreen(screen_info, (float)screen.left, (float)screen.top, (float)screen.GetWidth(), - (float)screen.GetHeight()); + DrawScreenTriangles(screen_info, (float)screen.left, (float)screen.top, + (float)screen.GetWidth(), (float)screen.GetHeight()); m_current_frame++; } diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h index 29516baf4..fffd0f9f4 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.h +++ b/src/video_core/renderer_opengl/renderer_opengl.h @@ -55,8 +55,8 @@ private: void InitOpenGLObjects(); void ConfigureFramebufferTexture(TextureInfo& texture, const Tegra::FramebufferConfig& framebuffer); - void DrawScreens(); - void DrawSingleScreen(const ScreenInfo& screen_info, float x, float y, float w, float h); + void DrawScreen(); + void DrawScreenTriangles(const ScreenInfo& screen_info, float x, float y, float w, float h); void UpdateFramerate(); // Loads framebuffer from emulated memory into the display information structure |