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

Fix Non-GLES run path in videosoftware for the previous commit.

This commit is contained in:
Ryan Houdek 2013-09-02 01:44:46 -05:00
parent 831963616f
commit 679957dc98
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,26 +129,14 @@ void SWRenderer::DrawButton(int texID, float *coords)
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
//Texture rectangle uses pixel coordinates
#ifndef USE_GLES
GLfloat u_max = (GLfloat)width;
GLfloat v_max = (GLfloat)height;
static const GLfloat texverts[4][2] = {
{0, v_max},
{0, 0},
{u_max, 0},
{u_max, v_max}
};
#else
static const GLfloat texverts[4][2] = { static const GLfloat texverts[4][2] = {
{0, 1}, {0, 1},
{0, 0}, {0, 0},
{1, 0}, {1, 0},
{1, 1} {1, 1}
}; };
#endif
glBindTexture(TEX2D, texID); glBindTexture(GL_TEXTURE_2D, texID);
glVertexAttribPointer(attr_pos, 2, GL_FLOAT, GL_FALSE, 0, coords); glVertexAttribPointer(attr_pos, 2, GL_FLOAT, GL_FALSE, 0, coords);
glVertexAttribPointer(attr_tex, 2, GL_FLOAT, GL_FALSE, 0, texverts); glVertexAttribPointer(attr_tex, 2, GL_FLOAT, GL_FALSE, 0, texverts);
@ -160,7 +148,7 @@ void SWRenderer::DrawButton(int texID, float *coords)
glDisableVertexAttribArray(attr_pos); glDisableVertexAttribArray(attr_pos);
glDisableVertexAttribArray(attr_tex); glDisableVertexAttribArray(attr_tex);
glBindTexture(TEX2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
glDisable(GL_BLEND); glDisable(GL_BLEND);
} }