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

Small bit of clean up in GLES-software.

Browse Source
This commit is contained in:
Ryan Houdek
2012-12-24 09:37:12 -06:00
parent f6ef6fa0d9
commit 296b9b1c16
4 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
View File

@ -29,19 +29,7 @@ static GLint attr_pos = -1, attr_tex = -1;
static GLint uni_tex = -1;
static GLuint program;
#ifdef USE_GLES
#define PREC "highp"
#define TEX2D GL_TEXTURE_2D
#define TEXTYPE "sampler2D"
#define TEXFUNC "texture2D"
#else
#define PREC
#define TEX2D GL_TEXTURE_RECTANGLE_ARB
#define TEXTYPE "sampler2DRect"
#define TEXFUNC "texture2DRect"
#endif
// Rasterfont isn't compatible with GLES
#ifndef USE_GLES
RasterFont* s_pfont = NULL;
#endif
@ -104,9 +92,9 @@ void SWRenderer::Prepare()
void SWRenderer::RenderText(const char* pstr, int left, int top, u32 color)
{
#ifndef USE_GLES
int nBackbufferWidth = (int)GLInterface->GetBackBufferWidth();
int nBackbufferHeight = (int)GLInterface->GetBackBufferHeight();
#ifndef USE_GLES
glColor4f(((color>>16) & 0xff)/255.0f, ((color>> 8) & 0xff)/255.0f,
((color>> 0) & 0xff)/255.0f, ((color>>24) & 0xFF)/255.0f);
s_pfont->printMultilineText(pstr,