From f31a50670892f2ff128d72e20207fbdd1d3dc3dc Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sun, 1 Feb 2004 07:18:05 +0000 Subject: [PATCH] gl engine bugzie! fix! SVN revision: 8739 --- legacy/evas/src/lib/engines/gl_common/evas_gl_context.c | 6 +++--- legacy/evas/src/lib/engines/gl_common/evas_gl_texture.c | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/legacy/evas/src/lib/engines/gl_common/evas_gl_context.c b/legacy/evas/src/lib/engines/gl_common/evas_gl_context.c index f40374afce..a1322470bf 100644 --- a/legacy/evas/src/lib/engines/gl_common/evas_gl_context.c +++ b/legacy/evas/src/lib/engines/gl_common/evas_gl_context.c @@ -283,7 +283,7 @@ _evas_gl_common_texture_set(Evas_GL_Context *gc) { if (gc->font_texture_not_power_of_two) { -// glEnable(GL_TEXTURE_2D); + glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_RECTANGLE_NV); glBindTexture(GL_TEXTURE_RECTANGLE_NV, gc->font_texture); } @@ -299,14 +299,14 @@ _evas_gl_common_texture_set(Evas_GL_Context *gc) { if (gc->texture->not_power_of_two) { -// glEnable(GL_TEXTURE_2D); + glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_RECTANGLE_NV); glBindTexture(GL_TEXTURE_RECTANGLE_NV, gc->texture->texture); } else { if (gc->ext.nv_texture_rectangle) glDisable(GL_TEXTURE_RECTANGLE_NV); -// glEnable(GL_TEXTURE_2D); + glEnable(GL_TEXTURE_2D); glBindTexture(GL_TEXTURE_2D, gc->texture->texture); } if (gc->texture->not_power_of_two) diff --git a/legacy/evas/src/lib/engines/gl_common/evas_gl_texture.c b/legacy/evas/src/lib/engines/gl_common/evas_gl_texture.c index 245313a591..dc3cae1b22 100644 --- a/legacy/evas/src/lib/engines/gl_common/evas_gl_texture.c +++ b/legacy/evas/src/lib/engines/gl_common/evas_gl_texture.c @@ -25,7 +25,7 @@ evas_gl_common_texture_new(Evas_GL_Context *gc, RGBA_Image *im, int smooth) tex->smooth = smooth; tex->changed = 1; -// glEnable(GL_TEXTURE_2D); + glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_RECTANGLE_NV); glGenTextures(1, &(tex->texture)); glBindTexture(GL_TEXTURE_RECTANGLE_NV, tex->texture); @@ -65,7 +65,6 @@ evas_gl_common_texture_new(Evas_GL_Context *gc, RGBA_Image *im, int smooth) tex->references = 0; tex->smooth = 0; tex->changed = 1; - if (gc->ext.nv_texture_rectangle) glDisable(GL_TEXTURE_RECTANGLE_NV); glEnable(GL_TEXTURE_2D); glGenTextures(1, &(tex->texture)); glBindTexture(GL_TEXTURE_2D, tex->texture); @@ -150,7 +149,7 @@ evas_gl_common_texture_update(Evas_GL_Texture *tex, RGBA_Image *im, int smooth) { void *tmp = NULL, *data; -// glEnable(GL_TEXTURE_2D); + glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_RECTANGLE_NV); glBindTexture(GL_TEXTURE_RECTANGLE_NV, tex->texture); @@ -197,8 +196,8 @@ evas_gl_common_texture_update(Evas_GL_Texture *tex, RGBA_Image *im, int smooth) th = tex->h; tex->changed = 1; tex->have_mipmaps = 0; - if (tex->gc->ext.nv_texture_rectangle) glDisable(GL_TEXTURE_RECTANGLE_NV); -// glEnable(GL_TEXTURE_2D); + if (tex->gc->ext.nv_texture_rectangle) glDisable(GL_TEXTURE_RECTANGLE_NV); + glEnable(GL_TEXTURE_2D); if (tex->not_power_of_two) { glEnable(GL_TEXTURE_RECTANGLE_NV);