ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4232 from lioncash/sw 

SWOGLWindow: Minor changes
This commit is contained in:
Markus Wick 2016-09-22 10:15:31 +02:00 committed by GitHub
parent 023eb34247 fc41e982e9
commit d0e7f30ab5
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/VideoBackends/Software/SWOGLWindow.cpp
View File

@ -86,11 +86,10 @@ void SWOGLWindow::Prepare()
void SWOGLWindow::PrintText(const std::string& text, int x, int y, u32 color) void SWOGLWindow::PrintText(const std::string& text, int x, int y, u32 color)
{ {
TextData data{text, x, y, color}; m_text.push_back({text, x, y, color});
m_text.emplace_back(data);
} }
void SWOGLWindow::ShowImage(u8* data, int stride, int width, int height, float aspect) void SWOGLWindow::ShowImage(const u8* data, int stride, int width, int height, float aspect)
{ {
GLInterface->MakeCurrent(); GLInterface->MakeCurrent();
GLInterface->Update(); GLInterface->Update();

2
Source/Core/VideoBackends/Software/SWOGLWindow.h
View File

@ -20,7 +20,7 @@ public:
void PrintText(const std::string& text, int x, int y, u32 color); void PrintText(const std::string& text, int x, int y, u32 color);
// Image to show, will be swapped immediately // Image to show, will be swapped immediately
void ShowImage(u8* data, int stride, int width, int height, float aspect); void ShowImage(const u8* data, int stride, int width, int height, float aspect);
int PeekMessages(); int PeekMessages();