Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/gl_common
Modified Files:
evas_gl_context.c evas_gl_image.c evas_gl_texture.c
Log Message:
colorspace work mostly. not complete.
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/gl_common/evas_gl_context.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- evas_gl_context.c 19 Dec 2006 14:12:40 -0000 1.6
+++ evas_gl_context.c 29 Dec 2006 03:32:45 -0000 1.7
@@ -97,7 +97,7 @@
void
evas_gl_common_context_resize(Evas_GL_Context *gc, int w, int h)
{
- if ((gc->w == w) && (gc->h == h)) return;
+ //if ((gc->w == w) && (gc->h == h)) return;
gc->change.size = 1;
gc->w = w;
gc->h = h;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/gl_common/evas_gl_image.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas_gl_image.c 19 Dec 2006 14:12:40 -0000 1.5
+++ evas_gl_image.c 29 Dec 2006 03:32:45 -0000 1.6
@@ -140,6 +140,7 @@
im->im->image->data = NULL;
if (im->tex) evas_gl_common_texture_free(im->tex);
im->tex = NULL;
+ im->cs.no_free = 0;
im->cs.data = calloc(1, im->im->image->h * sizeof(unsigned char *) *
2);
if ((data) && (im->cs.data))
memcpy(im->cs.data, data, im->im->image->h * sizeof(unsigned char *)
* 2);
@@ -254,10 +255,20 @@
if (!im->tex) return;
ow = (dw * im->tex->tw) / sw;
oh = (dh * im->tex->th) / sh;
- tx1 = (double)(sx ) / (double)(im->tex->w);
- ty1 = (double)(sy ) / (double)(im->tex->h);
- tx2 = (double)(sx + sw) / (double)(im->tex->w);
- ty2 = (double)(sy + sh) / (double)(im->tex->h);
+ if (im->tex->rectangle)
+ {
+ tx1 = sx;
+ ty1 = sy;
+ tx2 = sx + sw;
+ ty2 = sy + sh;
+ }
+ else
+ {
+ tx1 = (double)(sx ) / (double)(im->tex->w);
+ ty1 = (double)(sy ) / (double)(im->tex->h);
+ tx2 = (double)(sx + sw) / (double)(im->tex->w);
+ ty2 = (double)(sy + sh) / (double)(im->tex->h);
+ }
evas_gl_common_context_texture_set(gc, im->tex, smooth, ow, oh);
break;
default:
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/modules/engines/gl_common/evas_gl_texture.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas_gl_texture.c 19 Dec 2006 14:12:40 -0000 1.5
+++ evas_gl_texture.c 29 Dec 2006 03:32:45 -0000 1.6
@@ -419,8 +419,9 @@
int im_w, im_h, tw, th, y;
GLenum texfmt;
GLhandleARB fshad;
-
- if (!gc->ext.arb_texture_non_power_of_two) return NULL;
+
+// on an nv 6600gt this is fast - but on a 5500fx its DEAD SLOW!!!!!
+// if (!gc->ext.arb_texture_non_power_of_two) return NULL;
tex = calloc(1, sizeof(Evas_GL_Texture));
if (!tex) return NULL;
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
