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

Check texture params before updateing them

Browse Source 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
This commit is contained in:
degasus
2012-12-12 16:57:00 +01:00
committed by Ryan Houdek
parent 61836f8c51
commit 09274e2483
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp
View File

@ -17,8 +17,6 @@
#include "GLUtil.h"
#include <string.h>
#include "RasterFont.h"
// globals
@ -150,7 +148,6 @@ static const char *s_fragment_shader =
RasterFont::RasterFont()
{
// generate the texture
glEnable(GL_TEXTURE_RECTANGLE);
glGenTextures(1, &texture);
glBindTexture(GL_TEXTURE_RECTANGLE, texture);
u32* texture_data = new u32[char_width*char_count*char_height];
@ -281,7 +278,6 @@ void RasterFont::printMultilineText(const char *text, double start_x, double sta
glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO);
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_RECTANGLE, texture);
glEnable(GL_TEXTURE_RECTANGLE);
glDrawArrays(GL_TRIANGLES, 0, usage/4);
glUseProgram(0);