Nikilite/suyu
1
1
Fork 0
forked from suyu/suyu
Code Pull requests Activity

renderer_opengl: Use better naming for DrawScreens and DrawSingleScreen.

Browse source
This commit is contained in:
bunnei 2018-03-26 21:06:37 -04:00
parent d8f745382b
commit 5e343edc9e
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/video_core/renderer_opengl/renderer_opengl.cpp
View file

@ -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 // Load the framebuffer from memory, draw it to the screen, and swap buffers
LoadFBToScreenInfo(*framebuffer, screen_info); LoadFBToScreenInfo(*framebuffer, screen_info);
DrawScreens(); DrawScreen();
render_window->SwapBuffers(); render_window->SwapBuffers();
} }
@ -293,7 +293,7 @@ void RendererOpenGL::ConfigureFramebufferTexture(TextureInfo& texture,
state.Apply(); state.Apply();
} }
void RendererOpenGL::DrawSingleScreen(const ScreenInfo& screen_info, float x, float y, float w, void RendererOpenGL::DrawScreenTriangles(const ScreenInfo& screen_info, float x, float y, float w,
float h) { float h) {
const auto& texcoords = screen_info.display_texcoords; const auto& texcoords = screen_info.display_texcoords;
auto left = texcoords.left; auto left = texcoords.left;
@ -330,7 +330,7 @@ void RendererOpenGL::DrawSingleScreen(const ScreenInfo& screen_info, float x, fl
/** /**
* Draws the emulated screens to the emulator window. * Draws the emulated screens to the emulator window.
*/ */
void RendererOpenGL::DrawScreens() { void RendererOpenGL::DrawScreen() {
const auto& layout = render_window->GetFramebufferLayout(); const auto& layout = render_window->GetFramebufferLayout();
const auto& screen = layout.screen; const auto& screen = layout.screen;
@ -346,8 +346,8 @@ void RendererOpenGL::DrawScreens() {
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
glUniform1i(uniform_color_texture, 0); glUniform1i(uniform_color_texture, 0);
DrawSingleScreen(screen_info, (float)screen.left, (float)screen.top, (float)screen.GetWidth(), DrawScreenTriangles(screen_info, (float)screen.left, (float)screen.top,
(float)screen.GetHeight()); (float)screen.GetWidth(), (float)screen.GetHeight());
m_current_frame++; m_current_frame++;
} }

4
src/video_core/renderer_opengl/renderer_opengl.h
View file

@ -55,8 +55,8 @@ private:
void InitOpenGLObjects(); void InitOpenGLObjects();
void ConfigureFramebufferTexture(TextureInfo& texture, void ConfigureFramebufferTexture(TextureInfo& texture,
const Tegra::FramebufferConfig& framebuffer); const Tegra::FramebufferConfig& framebuffer);
void DrawScreens(); void DrawScreen();
void DrawSingleScreen(const ScreenInfo& screen_info, float x, float y, float w, float h); void DrawScreenTriangles(const ScreenInfo& screen_info, float x, float y, float w, float h);
void UpdateFramerate(); void UpdateFramerate();
// Loads framebuffer from emulated memory into the display information structure // Loads framebuffer from emulated memory into the display information structure