Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/gl_common
Modified Files:
Makefile.am evas_gl_context.c evas_gl_texture.c
Log Message:
Cleanup some headers.
Remove duplicate typedefs and declerations.
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/gl_common/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- Makefile.am 22 Oct 2004 02:38:31 -0000 1.9
+++ Makefile.am 18 Jun 2005 01:00:31 -0000 1.10
@@ -5,10 +5,10 @@
# A list of all the files in the current directory which can be regenerated
MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = @freetype_cflags@ @gl_cflags@ \
- -I. \
+INCLUDES = -I. \
-I$(top_srcdir)/src/lib \
- -I$(top_srcdir)/src/lib/include
+ -I$(top_srcdir)/src/lib/include \
+ @freetype_cflags@ @gl_cflags@
if BUILD_ENGINE_GL_COMMON
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/gl_common/evas_gl_context.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- evas_gl_context.c 22 May 2005 02:49:49 -0000 1.10
+++ evas_gl_context.c 18 Jun 2005 01:00:31 -0000 1.11
@@ -277,8 +277,6 @@
static void
_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,
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/gl_common/evas_gl_texture.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- evas_gl_texture.c 22 May 2005 02:49:49 -0000 1.6
+++ evas_gl_texture.c 18 Jun 2005 01:00:31 -0000 1.7
@@ -142,12 +142,11 @@
int *im_data;
int im_w, im_h;
int tw, th;
- int shift;
GLenum pixfmt, texfmt, target;
if (tex->not_power_of_two)
{
- void *tmp = NULL, *data;
+ void *data;
glEnable(GL_TEXTURE_2D);
glEnable(GL_TEXTURE_RECTANGLE_NV);
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs