diff options
| author | 2018-03-26 21:06:37 -0400 | |
|---|---|---|
| committer | 2018-03-26 21:17:07 -0400 | |
| commit | 5e343edc9e4606ebdf2cceef7a56336e0a92f69c (patch) | |
| tree | 2a9adcdcc7b3947242f3d4717302dc29425e8b0d /src | |
| parent | graphics_surface: Remove superfluous cast. (diff) | |
| download | yuzu-5e343edc9e4606ebdf2cceef7a56336e0a92f69c.tar.gz yuzu-5e343edc9e4606ebdf2cceef7a56336e0a92f69c.tar.xz yuzu-5e343edc9e4606ebdf2cceef7a56336e0a92f69c.zip | |
renderer_opengl: Use better naming for DrawScreens and DrawSingleScreen.
Diffstat (limited to 'src')
| -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& | |||
| 119 | 119 | ||
| 120 | // Load the framebuffer from memory, draw it to the screen, and swap buffers | 120 | // Load the framebuffer from memory, draw it to the screen, and swap buffers |
| 121 | LoadFBToScreenInfo(*framebuffer, screen_info); | 121 | LoadFBToScreenInfo(*framebuffer, screen_info); |
| 122 | DrawScreens(); | 122 | DrawScreen(); |
| 123 | render_window->SwapBuffers(); | 123 | render_window->SwapBuffers(); |
| 124 | } | 124 | } |
| 125 | 125 | ||
| @@ -293,8 +293,8 @@ void RendererOpenGL::ConfigureFramebufferTexture(TextureInfo& texture, | |||
| 293 | state.Apply(); | 293 | state.Apply(); |
| 294 | } | 294 | } |
| 295 | 295 | ||
| 296 | void RendererOpenGL::DrawSingleScreen(const ScreenInfo& screen_info, float x, float y, float w, | 296 | void RendererOpenGL::DrawScreenTriangles(const ScreenInfo& screen_info, float x, float y, float w, |
| 297 | float h) { | 297 | float h) { |
| 298 | const auto& texcoords = screen_info.display_texcoords; | 298 | const auto& texcoords = screen_info.display_texcoords; |
| 299 | auto left = texcoords.left; | 299 | auto left = texcoords.left; |
| 300 | auto right = texcoords.right; | 300 | auto right = texcoords.right; |
| @@ -330,7 +330,7 @@ void RendererOpenGL::DrawSingleScreen(const ScreenInfo& screen_info, float x, fl | |||
| 330 | /** | 330 | /** |
| 331 | * Draws the emulated screens to the emulator window. | 331 | * Draws the emulated screens to the emulator window. |
| 332 | */ | 332 | */ |
| 333 | void RendererOpenGL::DrawScreens() { | 333 | void RendererOpenGL::DrawScreen() { |
| 334 | const auto& layout = render_window->GetFramebufferLayout(); | 334 | const auto& layout = render_window->GetFramebufferLayout(); |
| 335 | const auto& screen = layout.screen; | 335 | const auto& screen = layout.screen; |
| 336 | 336 | ||
| @@ -346,8 +346,8 @@ void RendererOpenGL::DrawScreens() { | |||
| 346 | glActiveTexture(GL_TEXTURE0); | 346 | glActiveTexture(GL_TEXTURE0); |
| 347 | glUniform1i(uniform_color_texture, 0); | 347 | glUniform1i(uniform_color_texture, 0); |
| 348 | 348 | ||
| 349 | DrawSingleScreen(screen_info, (float)screen.left, (float)screen.top, (float)screen.GetWidth(), | 349 | DrawScreenTriangles(screen_info, (float)screen.left, (float)screen.top, |
| 350 | (float)screen.GetHeight()); | 350 | (float)screen.GetWidth(), (float)screen.GetHeight()); |
| 351 | 351 | ||
| 352 | m_current_frame++; | 352 | m_current_frame++; |
| 353 | } | 353 | } |
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: | |||
| 55 | void InitOpenGLObjects(); | 55 | void InitOpenGLObjects(); |
| 56 | void ConfigureFramebufferTexture(TextureInfo& texture, | 56 | void ConfigureFramebufferTexture(TextureInfo& texture, |
| 57 | const Tegra::FramebufferConfig& framebuffer); | 57 | const Tegra::FramebufferConfig& framebuffer); |
| 58 | void DrawScreens(); | 58 | void DrawScreen(); |
| 59 | void DrawSingleScreen(const ScreenInfo& screen_info, float x, float y, float w, float h); | 59 | void DrawScreenTriangles(const ScreenInfo& screen_info, float x, float y, float w, float h); |
| 60 | void UpdateFramerate(); | 60 | void UpdateFramerate(); |
| 61 | 61 | ||
| 62 | // Loads framebuffer from emulated memory into the display information structure | 62 | // Loads framebuffer from emulated memory into the display information structure |