Enlightenment CVS committal
Author : kwo
Project : e16
Module : epplets
Dir : e16/epplets/api
Modified Files:
Makefile.am epplet.c
Added Files:
epplet_glx.c
Log Message:
Move glx stuff to separate library.
===================================================================
RCS file: /cvs/e/e16/epplets/api/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- Makefile.am 11 Nov 2007 17:51:14 -0000 1.13
+++ Makefile.am 17 Nov 2007 16:16:09 -0000 1.14
@@ -1,15 +1,25 @@
-# $Id: Makefile.am,v 1.13 2007/11/11 17:51:14 kwo Exp $
+# $Id: Makefile.am,v 1.14 2007/11/17 16:16:09 kwo Exp $
if BUILD_SNPRINTF
SRCS_SNPRINTF = snprintf.c
endif
-lib_LTLIBRARIES = libepplet.la
+if BUILD_GLX
+EPPLET_LIB_GLX = libepplet_glx.la
+endif
+
+lib_LTLIBRARIES = libepplet.la $(EPPLET_LIB_GLX)
include_HEADERS = epplet.h
+
libepplet_la_SOURCES = epplet.c $(SRCS_SNPRINTF)
libepplet_la_CPPFLAGS = -I$(top_srcdir) $(IMLIB2_CFLAGS) $(X_CFLAGS) -D
ENLIGHTENMENT_ROOT=\"$(datadir)/e16\"
-libepplet_la_LIBADD = $(IMLIB2_LIBS) $(GLX_LIBS) $(X_LIBS) -lXext -lX11
-libepplet_la_LDFLAGS = -version-info 2:0:0
+libepplet_la_LIBADD = $(IMLIB2_LIBS) $(X_LIBS) -lXext -lX11
+libepplet_la_LDFLAGS = -version-info 3:0:0
+
+libepplet_glx_la_SOURCES = epplet_glx.c
+libepplet_glx_la_CPPFLAGS = -I$(top_srcdir) $(X_CFLAGS)
+libepplet_glx_la_LIBADD = libepplet.la $(GLX_LIBS)
+libepplet_glx_la_LDFLAGS = -version-info 3:0:0
-EXTRA_DIST = epplet.h.in snprintf.c
+EXTRA_DIST = epplet.h.in snprintf.c epplet_glx.c
===================================================================
RCS file: /cvs/e/e16/epplets/api/epplet.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -3 -r1.147 -r1.148
--- epplet.c 11 Nov 2007 17:56:29 -0000 1.147
+++ epplet.c 17 Nov 2007 16:16:09 -0000 1.148
@@ -31,7 +31,7 @@
EppWindow;
typedef EppWindow *Epplet_window;
-static Display *disp = NULL;
+Display *disp = NULL;
static int window_num = 0; /* For window list */
static Epplet_window *windows = NULL; /* List of windows to loop though */
@@ -5435,78 +5435,6 @@
free(buf);
}
}
-
-#ifdef HAVE_GLX
-GLXContext
-Epplet_bind_double_GL(Epplet_gadget da, int red, int green, int blue,
- int aux_buffers, int alpha, int depth, int stencil,
- int accum_red, int accum_green, int accum_blue,
- int accum_alpha)
-{
- XVisualInfo *vi;
- GLXContext cx;
- Window win;
-
- /* This sets up our MINIMUM request list for glx values. If all
- * the following minimums are not available, then a NULL is
- * returned for cx. You also might get a LARGER value then you
- * specify. */
-
- int attributeListDbl[] = { GLX_RGBA, GLX_DOUBLEBUFFER,
- GLX_RED_SIZE, red, GLX_GREEN_SIZE, green, GLX_BLUE_SIZE, blue,
- GLX_ALPHA_SIZE, alpha, GLX_AUX_BUFFERS, aux_buffers,
- GLX_DEPTH_SIZE, depth, GLX_STENCIL_SIZE, stencil,
- GLX_ACCUM_RED_SIZE, accum_red, GLX_ACCUM_GREEN_SIZE, accum_green,
- GLX_ACCUM_BLUE_SIZE, accum_blue, GLX_ACCUM_ALPHA_SIZE, accum_alpha,
- None
- };
-
- win = Epplet_get_drawingarea_window(da);
- vi = glXChooseVisual(disp, DefaultScreen(disp), attributeListDbl);
- cx = glXCreateContext(disp, vi, 0, GL_TRUE);
- glXMakeCurrent(disp, win, cx);
-
- return cx;
-}
-
-GLXContext
-Epplet_bind_single_GL(Epplet_gadget da, int red, int green, int blue,
- int aux_buffers, int alpha, int depth, int stencil,
- int accum_red, int accum_green, int accum_blue,
- int accum_alpha)
-{
- XVisualInfo *vi;
- GLXContext cx;
- Window win;
- int attributeListSgl[] = { GLX_RGBA,
- GLX_RED_SIZE, red, GLX_GREEN_SIZE, green, GLX_BLUE_SIZE, blue,
- GLX_ALPHA_SIZE, alpha, GLX_AUX_BUFFERS, aux_buffers,
- GLX_DEPTH_SIZE, depth, GLX_STENCIL_SIZE, stencil,
- GLX_ACCUM_RED_SIZE, accum_red, GLX_ACCUM_GREEN_SIZE, accum_green,
- GLX_ACCUM_BLUE_SIZE, accum_blue, GLX_ACCUM_ALPHA_SIZE, accum_alpha,
- None
- };
-
- win = Epplet_get_drawingarea_window(da);
- vi = glXChooseVisual(disp, DefaultScreen(disp), attributeListSgl);
- cx = glXCreateContext(disp, vi, 0, GL_TRUE);
- glXMakeCurrent(disp, win, cx);
-
- return cx;
-}
-
-GLXContext
-Epplet_default_bind_GL(Epplet_gadget da)
-{
- return Epplet_bind_double_GL(da, 1, 1, 1, 0, 0, 8, 0, 0, 0, 0, 0);
-}
-
-void
-Epplet_unbind_GL(GLXContext cx)
-{
- glXDestroyContext(disp, cx);
-}
-#endif
static void
Epplet_handle_child(int num)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
