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_font.c evas_gl_gradient.c
evas_gl_image.c evas_gl_misc.c evas_gl_polygon.c
evas_gl_private.h evas_gl_texture.c
Log Message:
whitespace
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/gl_common/evas_gl_context.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- evas_gl_context.c 26 Feb 2004 04:27:08 -0000 1.9
+++ evas_gl_context.c 22 May 2005 02:49:49 -0000 1.10
@@ -30,7 +30,7 @@
gc->dither = 1;
gc->blend = 0;
gc->references = 1;
-
+
gc->change.size = 1;
gc->change.dither = 1;
gc->change.blend = 1;
@@ -47,7 +47,7 @@
{
gc->references--;
if (gc->references > 0) return;
-
+
if (gc == _evas_gl_common_context) _evas_gl_common_context = NULL;
free(gc);
}
@@ -59,7 +59,7 @@
if (!gc->ext.checked)
{
const GLubyte *ext;
-
+
ext = glGetString(GL_EXTENSIONS);
if (ext)
{
@@ -156,7 +156,7 @@
}
if (tex)
{
- if (((smooth) && (!tex->smooth)) ||
+ if (((smooth) && (!tex->smooth)) ||
((!smooth) && (tex->smooth)))
{
tex->smooth = smooth;
@@ -192,18 +192,18 @@
{
if (x < 0)
{
- w += x;
+ w += x;
x = 0;
}
if (y < 0)
{
- h += y;
+ h += y;
y = 0;
}
if (w < 0) w = 0;
if (h < 0) h = 0;
if (((!on) && (!gc->clip.active)) ||
- ((on) && (gc->clip.active) &&
+ ((on) && (gc->clip.active) &&
(x == gc->clip.x) && (y == gc->clip.y) &&
(w == gc->clip.w) && (h == gc->clip.h)))
return;
@@ -245,7 +245,7 @@
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
glScalef(1, -1, 1);
- glTranslatef(0, - gc->h, 0);
+ glTranslatef(0, - gc->h, 0);
gc->change.size = 0;
}
@@ -264,7 +264,7 @@
_evas_gl_common_blend_set(Evas_GL_Context *gc)
{
if (!gc->change.blend) return;
- if (gc->blend)
+ if (gc->blend)
{
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -278,7 +278,7 @@
_evas_gl_common_color_set(Evas_GL_Context *gc)
{
int r, g, b, a;
-
+
if (!gc->change.color) return;
glColor4d((double)gc->r / 255.0,
(double)gc->g / 255.0,
@@ -382,8 +382,8 @@
{
glEnable(GL_SCISSOR_TEST);
glScissor(gc->clip.x,
- gc->h - gc->clip.y - gc->clip.h,
- gc->clip.w,
+ gc->h - gc->clip.y - gc->clip.h,
+ gc->clip.w,
gc->clip.h);
}
else
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/gl_common/evas_gl_font.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas_gl_font.c 8 Apr 2004 04:04:51 -0000 1.5
+++ evas_gl_font.c 22 May 2005 02:49:49 -0000 1.6
@@ -10,10 +10,10 @@
Evas_GL_Font_Texture *ft;
DATA8 *data;
int w, h, j;
-
+
int nw;
DATA8 *ndata;
-
+
ft = calloc(1, sizeof(Evas_GL_Font_Texture));
if (!ft) return NULL;
@@ -22,7 +22,7 @@
h = fg->glyph_out->bitmap.rows;
j = fg->glyph_out->bitmap.pitch;
if (j < w) j = w;
-
+
ft->gc = gc;
/* bug bug! glTexSubImage2D need a multiple of 4 pixels horizontally! :( */
@@ -36,7 +36,7 @@
{
int x, y;
DATA8 *p1, *p2;
-
+
for (y = 0; y < h; y++)
{
p1 = data + (j * y);
@@ -49,7 +49,7 @@
}
}
}
-
+
/* where in pool texture does this live */
ft->w = w;
ft->h = h;
@@ -105,7 +105,7 @@
ft->tx2 = (double)(ft->x + ft->w) / (double)(ft->pool->w);
ft->ty2 = (double)(ft->y + ft->h) / (double)(ft->pool->h);
}
-
+
return ft;
}
@@ -116,7 +116,7 @@
{
ft->gc->font_texture = 0;
ft->gc->change.texture = 1;
- }
+ }
_evas_gl_font_texture_pool_relinquish(ft->alloc);
free(ft);
}
@@ -132,7 +132,7 @@
if (surface == 0)
{
int r, g, b, a;
-
+
a = (dc->col.col >> 24) & 0xff;
r = (dc->col.col >> 16) & 0xff;
g = (dc->col.col >> 8 ) & 0xff;
@@ -170,11 +170,11 @@
int minw = 256;
int minh = 256;
int shift;
-
+
for (l = gc->tex_pool; l; l = l->next)
{
int x, y;
-
+
fp = l->data;
if (_evas_gl_font_texture_pool_rect_find(fp, w, h, &x, &y))
{
@@ -207,7 +207,7 @@
minh = h;
shift = 1; while (minh > shift) shift = shift << 1; minh = shift;
}
-
+
fp = calloc(1, sizeof(Evas_GL_Font_Texture_Pool));
if (!fp) return NULL;
gc->tex_pool = evas_list_append(gc->tex_pool, fp);
@@ -220,7 +220,7 @@
fp->w = minw;
fp->h = minh;
if (gc->ext.nv_texture_rectangle) fp->not_power_of_two = 1;
-
+
/* we dont want this mipmapped if sgis_generate_mipmap will mipmap it */
if (gc->ext.sgis_generate_mipmap)
glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP_SGIS, GL_FALSE);
@@ -230,13 +230,13 @@
glEnable(GL_TEXTURE_RECTANGLE_NV);
glGenTextures(1, &(fp->texture));
/* FIXME check gl error */
-
+
glBindTexture(GL_TEXTURE_RECTANGLE_NV, fp->texture);
glTexParameteri(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_WRAP_S, GL_REPEAT);
glTexParameteri(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_WRAP_T, GL_REPEAT);
glTexParameteri(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_MAG_FILTER,
GL_NEAREST);
glTexParameteri(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_MIN_FILTER,
GL_NEAREST);
- glTexImage2D(GL_TEXTURE_RECTANGLE_NV, 0,
+ glTexImage2D(GL_TEXTURE_RECTANGLE_NV, 0,
GL_ALPHA4, fp->w, fp->h, 0,
GL_ALPHA, GL_UNSIGNED_BYTE, NULL);
/* FIXME check gl error */
@@ -246,18 +246,18 @@
glEnable(GL_TEXTURE_2D);
glGenTextures(1, &(fp->texture));
/* FIXME check gl error */
-
+
glBindTexture(GL_TEXTURE_2D, fp->texture);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexImage2D(GL_TEXTURE_2D, 0,
+ glTexImage2D(GL_TEXTURE_2D, 0,
GL_ALPHA4, fp->w, fp->h, 0,
GL_ALPHA, GL_UNSIGNED_BYTE, NULL);
/* FIXME check gl error */
}
-
+
/* new allocation entirely */
fa = calloc(1, sizeof(Evas_GL_Font_Texture_Pool_Allocation));
if (!fa)
@@ -293,7 +293,7 @@
fa->pool->references--;
if (fa->pool->references <= 0)
{
- fa->pool->gc->tex_pool =
+ fa->pool->gc->tex_pool =
evas_list_remove(fa->pool->gc->tex_pool, fa->pool);
glDeleteTextures(1, &(fa->pool->texture));
free(fa->pool);
@@ -302,7 +302,7 @@
}
static int
-_evas_gl_font_texture_pool_rect_find(Evas_GL_Font_Texture_Pool *fp,
+_evas_gl_font_texture_pool_rect_find(Evas_GL_Font_Texture_Pool *fp,
int w, int h,
int *x, int *y)
{
@@ -316,7 +316,7 @@
int tx, ty, tw, th;
int t1, t2;
int intersects;
-
+
fa = l->data;
t1 = t2 = 1;
if ((fa->x + fa->w + w) > fp->w) t1 = 0;
@@ -341,10 +341,10 @@
{
Evas_GL_Font_Texture_Pool_Allocation *fa2;
int rx, ry, rw, rh;
-
+
/* dont do the rect we are just using as our offset */
if (l2 == l) continue;
- fa2 = l2->data;
+ fa2 = l2->data;
rx = fa2->x;
ry = fa2->y;
rw = fa2->w;
@@ -383,7 +383,7 @@
{
Evas_GL_Font_Texture_Pool_Allocation *fa2;
int rx, ry, rw, rh;
-
+
/* dont do the rect we are just using as our offset */
if (l2 == l) continue;
/* hmmm crash here on mga... l2->data seems broken */
@@ -391,7 +391,7 @@
/* use valgrind to inspect any further due to the dri */
/* hardware stuff :( */
fa2 = l2->data;
-
+
rx = fa2->x;
ry = fa2->y;
rw = fa2->w;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/gl_common/evas_gl_gradient.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_gl_gradient.c 13 Nov 2004 05:05:24 -0000 1.2
+++ evas_gl_gradient.c 22 May 2005 02:49:49 -0000 1.3
@@ -27,7 +27,7 @@
void
evas_gl_common_gradient_draw(Evas_GL_Context *gc, RGBA_Draw_Context *dc,
Evas_GL_Gradient *gr, int x, int y, int w, int h, double angle)
-{
+{
int r, g, b, a;
if (dc->mul.use)
@@ -53,29 +53,29 @@
if (!gr->tex)
_evas_gl_common_gradient_texture_build(gc, gr);
evas_gl_common_context_texture_set(gc, gr->tex, 0, 255, 3);
-
+
evas_gl_common_context_read_buf_set(gc, GL_BACK);
evas_gl_common_context_write_buf_set(gc, GL_BACK);
{
double max, t[8];
int tw, th, i;
-
+
tw = 256;
th = 4;
-
+
t[0] = cos(((-angle + 45 + 90) * 2 * 3.141592654) / 360);
t[1] = sin(((-angle + 45 + 90) * 2 * 3.141592654) / 360);
-
+
t[2] = cos(((-angle + 45 + 180) * 2 * 3.141592654) / 360);
t[3] = sin(((-angle + 45 + 180) * 2 * 3.141592654) / 360);
-
+
t[4] = cos(((-angle + 45 + 270) * 2 * 3.141592654) / 360);
t[5] = sin(((-angle + 45 + 270) * 2 * 3.141592654) / 360);
-
+
t[6] = cos(((-angle + 45 + 0) * 2 * 3.141592654) / 360);
t[7] = sin(((-angle + 45 + 0) * 2 * 3.141592654) / 360);
max = 0;
-
+
for (i = 0; i < 8; i++)
{
if ((t[i] < 0) && (-t[i] > max)) max = -t[i];
@@ -120,7 +120,7 @@
if (im)
{
int i;
-
+
for (i = 0; i < 4; i++)
memcpy(im->image->data + (i * 256) , map, 256 * sizeof(DATA32));
im->flags |= RGBA_IMAGE_HAS_ALPHA;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/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 26 Jan 2005 07:49:56 -0000 1.5
+++ evas_gl_image.c 22 May 2005 02:49:49 -0000 1.6
@@ -6,10 +6,10 @@
Evas_GL_Image *im;
RGBA_Image *im_im;
Evas_List *l;
-
+
im_im = evas_common_load_image_from_file(file, key);
if (!im_im) return NULL;
-
+
for (l = gc->images; l; l = l->next)
{
im = l->data;
@@ -22,7 +22,7 @@
return im;
}
}
-
+
im = calloc(1, sizeof(Evas_GL_Image));
if (!im) return NULL;
im->references = 1;
@@ -44,7 +44,7 @@
{
Evas_GL_Image *im;
Evas_List *l;
-
+
for (l = gc->images; l; l = l->next)
{
im = l->data;
@@ -78,7 +78,7 @@
im->im->image->data = data;
im->im->image->no_free = 1;
im->gc = gc;
-/*
+/*
im->cached = 1;
gc->images = evas_list_prepend(gc->images, im);
*/
@@ -89,7 +89,7 @@
evas_gl_common_image_new_from_copied_data(Evas_GL_Context *gc, int w, int h,
int *data)
{
Evas_GL_Image *im;
-
+
im = calloc(1, sizeof(Evas_GL_Image));
im->references = 1;
im->im = evas_common_image_create(w, h);
@@ -108,7 +108,7 @@
evas_gl_common_image_new(Evas_GL_Context *gc, int w, int h)
{
Evas_GL_Image *im;
-
+
im = calloc(1, sizeof(Evas_GL_Image));
im->references = 1;
im->im = evas_common_image_create(w, h);
@@ -202,7 +202,7 @@
0, 0, 0, 0);
evas_gl_common_context_read_buf_set(gc, GL_BACK);
evas_gl_common_context_write_buf_set(gc, GL_BACK);
-
+
glBegin(GL_QUADS);
glTexCoord2d(tx1, ty1); glVertex2i(dx , dy );
glTexCoord2d(tx2, ty1); glVertex2i(dx + dw, dy );
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/gl_common/evas_gl_misc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_gl_misc.c 7 Sep 2003 11:24:48 -0000 1.1
+++ evas_gl_misc.c 22 May 2005 02:49:49 -0000 1.2
@@ -10,5 +10,5 @@
evas_gl_common_context_dither_set(gc, 0);
y = gc->h - y - h;
glRasterPos2i(x, gc->h - y);
- glCopyPixels(x, y, w, h, GL_COLOR);
+ glCopyPixels(x, y, w, h, GL_COLOR);
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/gl_common/evas_gl_polygon.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_gl_polygon.c 7 Sep 2003 11:24:48 -0000 1.1
+++ evas_gl_polygon.c 22 May 2005 02:49:49 -0000 1.2
@@ -24,7 +24,7 @@
while (poly->points)
{
Evas_GL_Polygon_Point *pt;
-
+
pt = poly->points->data;
poly->points = evas_list_remove(poly->points, pt);
free(pt);
@@ -33,7 +33,7 @@
return NULL;
}
-#ifdef GLU_TESS
+#ifdef GLU_TESS
static void _evas_gl_tess_begin_cb(GLenum which);
static void _evas_gl_tess_end_cb(void);
static void _evas_gl_tess_error_cb(GLenum errorcode);
@@ -61,7 +61,7 @@
_evas_gl_tess_vertex_cb(GLvoid *vertex)
{
GLdouble *v;
-
+
v = vertex;
glVertex2d(v[0], v[1]);
}
@@ -70,7 +70,7 @@
_evas_gl_tess_combine_cb(GLdouble coords[3], GLdouble *vertex_data[4], GLfloat
weight[4], GLdouble **data_out)
{
GLdouble *vertex;
-
+
vertex = (GLdouble *) malloc(6 * sizeof(GLdouble));
vertex[0] = coords[0];
vertex[1] = coords[1];
@@ -86,7 +86,7 @@
static void *tess = NULL;
GLdouble *glp = NULL;
int i, num;
-
+
a = (dc->col.col >> 24) & 0xff;
r = (dc->col.col >> 16) & 0xff;
g = (dc->col.col >> 8 ) & 0xff;
@@ -105,11 +105,11 @@
evas_gl_common_context_read_buf_set(gc, GL_BACK);
evas_gl_common_context_write_buf_set(gc, GL_BACK);
-#ifdef GLU_TESS
+#ifdef GLU_TESS
if (!tess)
{
tess = gluNewTess();
-
+
gluTessCallback(tess, GLU_TESS_BEGIN, _evas_gl_tess_begin_cb);
gluTessCallback(tess, GLU_TESS_END, _evas_gl_tess_end_cb);
gluTessCallback(tess, GLU_TESS_ERROR, _evas_gl_tess_error_cb);
@@ -127,7 +127,7 @@
for (l = poly->points; l; l = l->next)
{
Evas_GL_Polygon_Point *p;
-
+
p = l->data;
glp[i++] = p->x;
glp[i++] = p->y;
@@ -143,10 +143,10 @@
for (l = poly->points; l; l = l->next)
{
Evas_GL_Polygon_Point *p;
-
+
p = l->data;
glVertex2i(p->x, p->y);
}
glEnd();
-#endif
+#endif
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/gl_common/evas_gl_private.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas_gl_private.h 20 Apr 2005 03:22:06 -0000 1.5
+++ evas_gl_private.h 22 May 2005 02:49:49 -0000 1.6
@@ -29,13 +29,13 @@
const void *data);
void glGetBufferSubDataARB(GLenum target, int offset,
GLsizei size, void *data);
-
+
void *glMapBufferARB(GLenum target, GLenum access);
GLboolean glUnmapBufferARB(GLenum target);
-
+
void glGetBufferParameterivARB(GLenum target, GLenum pname, int *params);
void glGetBufferPointervARB(GLenum target, GLenum pname, void **params);
-
+
#define GL_ARRAY_BUFFER_ARB 0x8892
#define GL_ELEMENT_ARRAY_BUFFER_ARB 0x8893
#define GL_ARRAY_BUFFER_BINDING_ARB 0x8894
@@ -68,11 +68,11 @@
#define GL_BUFFER_MAPPED_ARB 0x88BC
#define GL_BUFFER_MAP_POINTER_ARB 0x88BD
#endif
-
-
-
+
+
+
/* evas ARGB pixel config */
#define NATIVE_PIX_FORMAT GL_BGRA
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/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 1 Feb 2004 07:18:05 -0000 1.5
+++ evas_gl_texture.c 22 May 2005 02:49:49 -0000 1.6
@@ -9,7 +9,7 @@
int tw, th;
int shift;
GLenum pixfmt, texfmt;
-
+
tex = calloc(1, sizeof(Evas_GL_Texture));
if (!tex) return NULL;
@@ -24,7 +24,7 @@
tex->references = 0;
tex->smooth = smooth;
tex->changed = 1;
-
+
glEnable(GL_TEXTURE_2D);
glEnable(GL_TEXTURE_RECTANGLE_NV);
glGenTextures(1, &(tex->texture));
@@ -39,7 +39,7 @@
glTexParameteri(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_MAG_FILTER,
GL_NEAREST);
glTexParameteri(GL_TEXTURE_RECTANGLE_NV, GL_TEXTURE_MIN_FILTER,
GL_NEAREST);
}
-
+
if (gc->texture) gc->texture->references--;
gc->texture = tex;
gc->change.texture = 1;
@@ -49,7 +49,7 @@
else texfmt = GL_RGB8;
pixfmt = NATIVE_PIX_FORMAT;
- glTexImage2D(GL_TEXTURE_RECTANGLE_NV, 0,
+ glTexImage2D(GL_TEXTURE_RECTANGLE_NV, 0,
texfmt, tex->w, tex->h, 0,
pixfmt, NATIVE_PIX_UNIT, im->image->data);
return tex;
@@ -78,7 +78,7 @@
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-
+
im_data = im->image->data;
im_w = im->image->w;
im_h = im->image->h;
@@ -86,16 +86,16 @@
if (im->flags & RGBA_IMAGE_HAS_ALPHA) texfmt = GL_RGBA8;
else texfmt = GL_RGB8;
pixfmt = NATIVE_PIX_FORMAT;
-
- glTexImage2D(GL_TEXTURE_2D, 0,
+
+ glTexImage2D(GL_TEXTURE_2D, 0,
texfmt, tw, th, 0,
pixfmt, NATIVE_PIX_UNIT, NULL);
{
int ttw, tth;
int l;
-
+
ttw = tw;
- tth = th;
+ tth = th;
l = 0;
while ((ttw > 1) || (tth > 1))
{
@@ -114,22 +114,22 @@
glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP_SGIS, GL_TRUE);
tex->have_mipmaps = 1;
}
- glTexSubImage2D(GL_TEXTURE_2D, 0,
+ glTexSubImage2D(GL_TEXTURE_2D, 0,
0, 0, im_w, im_h,
pixfmt, NATIVE_PIX_UNIT,
im_data);
if (im_w < tw)
- glTexSubImage2D(GL_TEXTURE_2D, 0,
+ glTexSubImage2D(GL_TEXTURE_2D, 0,
im_w, 0, 1, im_h,
pixfmt, NATIVE_PIX_UNIT,
im_data + im_w - 1);
if (im_h < th)
- glTexSubImage2D(GL_TEXTURE_2D, 0,
+ glTexSubImage2D(GL_TEXTURE_2D, 0,
0, im_h, im_w, 1,
pixfmt, NATIVE_PIX_UNIT,
im_data + (im_w * (im_h - 1)));
if ((im_w < tw) && (im_h < th))
- glTexSubImage2D(GL_TEXTURE_2D, 0,
+ glTexSubImage2D(GL_TEXTURE_2D, 0,
im_w, im_h, 1, 1,
pixfmt, NATIVE_PIX_UNIT,
im_data + (im_w * (im_h - 1)) + im_w - 1);
@@ -148,24 +148,24 @@
if (tex->not_power_of_two)
{
void *tmp = NULL, *data;
-
+
glEnable(GL_TEXTURE_2D);
glEnable(GL_TEXTURE_RECTANGLE_NV);
glBindTexture(GL_TEXTURE_RECTANGLE_NV, tex->texture);
data = im->image->data;
#if 0 // trying the glXAllocateMemoryNV() thing but its abysmally slow
- tmp = glXAllocateMemoryNV(tex->w * tex->h * sizeof(DATA32),
+ tmp = glXAllocateMemoryNV(tex->w * tex->h * sizeof(DATA32),
0.0, 1.0, 1.0);
if (tmp)
{
glEnableClientState(GL_WRITE_PIXEL_DATA_RANGE_NV);
- glPixelDataRangeNV(GL_WRITE_PIXEL_DATA_RANGE_NV,
+ glPixelDataRangeNV(GL_WRITE_PIXEL_DATA_RANGE_NV,
tex->w * tex->h * sizeof(DATA32),
tmp);
// evas_common_copy_pixels_rgba_to_rgba_mmx2(im->image->data, tmp,
// tex->w * tex->h);
- memcpy(tmp, im->image->data,
+ memcpy(tmp, im->image->data,
tex->w * tex->h * sizeof(DATA32));
data = tmp;
}
@@ -179,7 +179,7 @@
else texfmt = GL_RGB8;
pixfmt = NATIVE_PIX_FORMAT;
- glTexSubImage2D(GL_TEXTURE_RECTANGLE_NV, 0,
+ glTexSubImage2D(GL_TEXTURE_RECTANGLE_NV, 0,
0, 0, tex->w, tex->h,
pixfmt, NATIVE_PIX_UNIT,
data);
@@ -189,7 +189,7 @@
glFlushPixelDataRangeNV(GL_WRITE_PIXEL_DATA_RANGE_NV);
glXFreeMemoryNV(tmp);
}
-#endif
+#endif
return;
}
tw = tex->w;
@@ -209,7 +209,7 @@
glEnable(GL_TEXTURE_2D);//
target = GL_TEXTURE_2D;
}
-
+
glBindTexture(GL_TEXTURE_2D, tex->texture);
if (tex->gc->texture) tex->gc->texture->references--;
@@ -220,19 +220,19 @@
/*
if (!tex->opt)
{
- glPixelDataRangeNV(GL_WRITE_PIXEL_DATA_RANGE_NV,
- im->image->w * im->image->h * 4,
+ glPixelDataRangeNV(GL_WRITE_PIXEL_DATA_RANGE_NV,
+ im->image->w * im->image->h * 4,
im->image->data);
tex->opt = 1;
}
*/
-
+
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
tex->smooth = 0;
-
+
im_data = im->image->data;
im_w = im->image->w;
im_h = im->image->h;
@@ -246,27 +246,27 @@
glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP_SGIS, GL_TRUE);
tex->have_mipmaps = 1;
}
- glTexSubImage2D(GL_TEXTURE_2D, 0,
+ glTexSubImage2D(GL_TEXTURE_2D, 0,
0, 0, im_w, im_h,
pixfmt, NATIVE_PIX_UNIT,
im_data);
#if 1 // this is sloooow... well slower than just the above...
if (im_w < tw)
- glTexSubImage2D(GL_TEXTURE_2D, 0,
+ glTexSubImage2D(GL_TEXTURE_2D, 0,
im_w, 0, 1, im_h,
pixfmt, NATIVE_PIX_UNIT,
im_data + im_w - 1);
if (im_h < th)
- glTexSubImage2D(GL_TEXTURE_2D, 0,
+ glTexSubImage2D(GL_TEXTURE_2D, 0,
0, im_h, im_w, 1,
pixfmt, NATIVE_PIX_UNIT,
im_data + (im_w * (im_h - 1)));
if ((im_w < tw) && (im_h < th))
- glTexSubImage2D(GL_TEXTURE_2D, 0,
+ glTexSubImage2D(GL_TEXTURE_2D, 0,
im_w, im_h, 1, 1,
pixfmt, NATIVE_PIX_UNIT,
im_data + (im_w * (im_h - 1)) + im_w - 1);
-#endif
+#endif
}
void
@@ -309,7 +309,7 @@
h = im->image->h;
level = 0;
im1 = im;
-
+
if (tex->gc->texture != tex)
{
if (tex->gc->texture) tex->gc->texture->references--;
@@ -321,7 +321,7 @@
if (im->flags & RGBA_IMAGE_HAS_ALPHA) texfmt = GL_RGBA8;
else texfmt = GL_RGB8;
pixfmt = NATIVE_PIX_FORMAT;
-
+
if (tex->gc->ext.nv_texture_rectangle) glDisable(GL_TEXTURE_RECTANGLE_NV);
glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, tex->texture);
@@ -330,7 +330,7 @@
while ((w > 1) || (h > 1))
{
int pw, ph;
-
+
pw = w;
ph = h;
w /= 2;
@@ -339,40 +339,40 @@
if (h < 1) h = 1;
tw /= 2;
th /= 2;
-
+
level++;
im2 = evas_common_image_create(w, h);
#ifdef BUILD_MMX
if (mmx)
- {
+ {
evas_common_scale_rgba_mipmap_down_2x2_mmx(im1->image->data,
- im2->image->data,
+ im2->image->data,
pw, ph);
}
else
-#endif
+#endif
{
if (im->flags & RGBA_IMAGE_HAS_ALPHA)
evas_common_scale_rgba_mipmap_down_2x2_c(im1->image->data,
- im2->image->data,
+ im2->image->data,
pw, ph);
else
evas_common_scale_rgb_mipmap_down_2x2_c(im1->image->data,
- im2->image->data,
+ im2->image->data,
pw, ph);
}
if (im1 != im) evas_common_image_free(im1);
im1 = NULL;
-
+
im_data = im2->image->data;
im_w = w;
im_h = h;
- glTexSubImage2D(GL_TEXTURE_2D, level,
+ glTexSubImage2D(GL_TEXTURE_2D, level,
0, 0, im_w, im_h,
pixfmt, NATIVE_PIX_UNIT,
im_data);
if (im_w < tw)
- glTexSubImage2D(GL_TEXTURE_2D, level,
+ glTexSubImage2D(GL_TEXTURE_2D, level,
im_w, 0, 1, im_h,
pixfmt, NATIVE_PIX_UNIT,
im_data + im_w - 1);
@@ -382,7 +382,7 @@
pixfmt, NATIVE_PIX_UNIT,
im_data + (im_w * (im_h - 1)));
if ((im_w < tw) && (im_h < th))
- glTexSubImage2D(GL_TEXTURE_2D, level,
+ glTexSubImage2D(GL_TEXTURE_2D, level,
im_w, im_h, 1, 1,
pixfmt, NATIVE_PIX_UNIT,
im_data + (im_w * (im_h - 1)) + im_w - 1);
@@ -393,5 +393,5 @@
tex->have_mipmaps = 1;
#ifdef BUILD_MMX
if (mmx) evas_common_cpu_end_opt();
-#endif
+#endif
}
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
