From d1e4e9384ff03ba24490dbad2eb8ea64a2c3783f Mon Sep 17 00:00:00 2001 From: martin-s Date: Sun, 4 Mar 2012 16:35:26 +0000 Subject: [PATCH] Fix:graphics_opengl:Fixed gles2 text rendering git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4963 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/navit/graphics/opengl/graphics_opengl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/navit/navit/graphics/opengl/graphics_opengl.c b/navit/navit/graphics/opengl/graphics_opengl.c index e79965c..1958a75 100644 --- a/navit/navit/graphics/opengl/graphics_opengl.c +++ b/navit/navit/graphics/opengl/graphics_opengl.c @@ -95,7 +95,6 @@ typedef GLfixed GLf; #define glScalef glScalex #define glColor4f glColor4x #endif -#define glTexParameteri glTexParameterx #define SCREEN_WIDTH 700 #define SCREEN_HEIGHT 700 @@ -1356,12 +1355,11 @@ get_data(struct graphics_priv *this, char *type) glGenTextures(1, &textures); glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, textures); -#ifndef USE_OPENGLES2 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - +#ifndef USE_OPENGLES2 glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); #endif #endif -- 2.7.4