piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reformat all the things. Have fun with merge conflicts.

Browse Source
This commit is contained in:
Pierre Bourdon
2016-06-24 10:43:46 +02:00
parent 2115e8a4a6
commit 3570c7f03a
1116 changed files with 187405 additions and 180344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,33 +13,32 @@
class SWOGLWindow
{
public:
static void Init(void* window_handle);
static void Shutdown();
static void Init(void* window_handle);
static void Shutdown();
// Will be printed on the *next* image
void PrintText(const std::string& text, int x, int y, u32 color);
// Will be printed on the *next* image
void PrintText(const std::string& text, int x, int y, u32 color);
// Image to show, will be swapped immediately
void ShowImage(u8* data, int stride, int width, int height, float aspect);
// Image to show, will be swapped immediately
void ShowImage(u8* data, int stride, int width, int height, float aspect);
int PeekMessages();
int PeekMessages();
static std::unique_ptr<SWOGLWindow> s_instance;
static std::unique_ptr<SWOGLWindow> s_instance;
private:
SWOGLWindow() {}
SWOGLWindow() {}
void Prepare();
void Prepare();
struct TextData
{
std::string text;
int x, y;
u32 color;
};
std::vector<TextData> m_text;
struct TextData
{
std::string text;
int x, y;
u32 color;
};
std::vector<TextData> m_text;
bool m_init{false};
bool m_init {false};
u32 m_image_program, m_image_texture, m_image_vao;
u32 m_image_program, m_image_texture, m_image_vao;
};