Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/gl_common
Modified Files:
evas_gl_context.c evas_gl_texture.c
Log Message:
gl engine bugzie! fix!
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/gl_common/evas_gl_context.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas_gl_context.c 11 Sep 2003 02:30:34 -0000 1.5
+++ evas_gl_context.c 1 Feb 2004 07:18:05 -0000 1.6
@@ -283,7 +283,7 @@
{
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 @@
{
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)
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/gl_common/evas_gl_texture.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_gl_texture.c 10 Sep 2003 14:33:39 -0000 1.4
+++ evas_gl_texture.c 1 Feb 2004 07:18:05 -0000 1.5
@@ -25,7 +25,7 @@
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 @@
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 @@
{
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 @@
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);
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
