[cairo-commit] libglc libglc-agl.pc.in,NONE,1.1 ChangeLog,1.19,1.20 Makefile.am,1.3,1.4 TODO,1.3,1.4 configure.in,1.6,1.7 libglc-glx.pc.in,1.2,1.3
David Reveman
commit at pdx.freedesktop.org
Mon Aug 15 11:12:59 PDT 2005
Committed by: davidr
Update of /cvs/cairo/libglc
In directory pdx:/tmp/cvs-serv11261
Modified Files:
ChangeLog Makefile.am TODO configure.in libglc-glx.pc.in
Added Files:
libglc-agl.pc.in
Log Message:
Restructuring of internal rendering model, AGL backend added
--- NEW FILE: libglc-agl.pc.in ---
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: libglc-agl
Description: OpenGL compositing library (AGL backend)
Version: @VERSION@
Libs: -L${libdir} -lglc -lm @AGL_LIBS@
Cflags: -I${includedir} @AGL_CFLAGS@
Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/libglc/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ChangeLog 13 Dec 2003 10:44:41 -0000 1.19
--- ChangeLog 3 Feb 2004 15:12:11 -0000 1.20
***************
*** 1,2 ****
--- 1,7 ----
+ 2004-02-03 <c99drn at cs.umu.se>
+
+ Restructuring of internal rendering model.
+ AGL backend added.
+
2003-12-13 <c99drn at cs.umu.se>
Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/libglc/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am 5 Dec 2003 21:57:19 -0000 1.3
--- Makefile.am 3 Feb 2004 15:12:11 -0000 1.4
***************
*** 9,16 ****
endif
EXTRA_DIST = \
COPYING \
$(libglc_glx_extra_dist)
pkgconfigdir = $(libdir)/pkgconfig
! pkgconfig_DATA = $(libglc_glx_data)
--- 9,27 ----
endif
+ if LIBGLC_HAS_AGL_BACKEND
+ libglc_agl_extra_dist = libglc-agl.pc.in
+ libglc_agl_data = libglc-agl.pc
+ else
+ libglc_agl_extra_dist =
+ libglc_agl_data =
+ endif
+
EXTRA_DIST = \
COPYING \
$(libglc_glx_extra_dist)
+ $(libglc_agl_extra_dist)
pkgconfigdir = $(libdir)/pkgconfig
! pkgconfig_DATA = \
! $(libglc_glx_data) \
! $(libglc_agl_data)
Index: TODO
===================================================================
RCS file: /cvs/cairo/libglc/TODO,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TODO 4 Dec 2003 12:55:29 -0000 1.3
--- TODO 3 Feb 2004 15:12:11 -0000 1.4
***************
*** 1 ****
! * Profiling and optimizing.
--- 1,2 ----
! * Porter-Duff compositing without intermediate buffer using fragment shaders.
! * Add more options to surface formats. (depth/multisample/fullscreen...)
Index: configure.in
===================================================================
RCS file: /cvs/cairo/libglc/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** configure.in 13 Dec 2003 10:44:41 -0000 1.6
--- configure.in 3 Feb 2004 15:12:11 -0000 1.7
***************
*** 28,35 ****
dnl ===========================================================================
- RENDER_REQUIRED=0.8
-
- dnl ===========================================================================
-
AC_CONFIG_AUX_DIR(config)
--- 28,31 ----
***************
*** 67,84 ****
dnl ===========================================================================
- PKG_CHECK_MODULES(LIBGLC, render >= $RENDER_REQUIRED)
- AC_SUBST(LIBGLC_CFLAGS)
- AC_SUBST(LIBGLC_LIBS)
-
- dnl ===========================================================================
-
- GL_CFLAGS=""
- GL_LIBS="-lGL"
-
- AC_SUBST(GL_CFLAGS)
- AC_SUBST(GL_LIBS)
-
- dnl ===========================================================================
-
AC_ARG_ENABLE(glx,
AC_HELP_STRING([--disable-glx], [Disable libglc's GLX backend]),
--- 63,66 ----
***************
*** 86,89 ****
--- 68,72 ----
AH_TEMPLATE([XTHREADS], [Define if Xlib supports XTHREADS])
+ AH_TEMPLATE([HAVE_GL_GLXATI_H], [Define if <GL/glxATI.h> exists])
if test "x$use_glx" != "xyes"; then
***************
*** 93,101 ****
GLX_BACKEND_FEATURE=LIBGLC_HAS_GLX_BACKEND
AC_PATH_XTRA
! GLX_LIBS="$X_LIBS -lX11"
GLX_CFLAGS="$X_CFLAGS"
# Check for XTHREADS
-
save_LIBS="$LIBS"
save_CFLAGS="$CFLAGS"
--- 76,83 ----
GLX_BACKEND_FEATURE=LIBGLC_HAS_GLX_BACKEND
AC_PATH_XTRA
! GLX_LIBS="$X_LIBS -lX11 -lGL"
GLX_CFLAGS="$X_CFLAGS"
# Check for XTHREADS
save_LIBS="$LIBS"
save_CFLAGS="$CFLAGS"
***************
*** 122,125 ****
--- 104,118 ----
fi
+ # Check for glxATI.h
+ AC_MSG_CHECKING(for GL/glxATI.h)
+ AC_TRY_COMPILE(
+ [
+ #include <GL/glx.h>
+ #include <GL/glxATI.h>
+ ], [],
+ AC_DEFINE(HAVE_GL_GLXATI_H, 1)
+ AC_MSG_RESULT(yes),
+ AC_MSG_RESULT(no))
+
AM_CONDITIONAL(LIBGLC_HAS_GLX_BACKEND, true)
fi
***************
*** 131,134 ****
--- 124,172 ----
dnl ===========================================================================
+ AC_ARG_ENABLE(agl,
+ AC_HELP_STRING([--disable-agl], [Disable libglc's AGL backend]),
+ [use_agl=$enableval], [use_agl=yes])
+
+ AH_TEMPLATE([PTHREADS], [Define if PTHREADS are supported])
+
+ if test "x$use_agl" = "xyes"; then
+ AC_MSG_CHECKING([for AGL.framework])
+ save_libs="$LIBS"
+ LIBS="-framework AGL"
+ AC_TRY_LINK_FUNC(aglCreateContext, [use_agl=yes], [use_agl=no])
+ LIBS="$save_libs"
+ AC_MSG_RESULT([$use_agl])
+ fi
+
+ if test "x$use_agl" = "xyes"; then
+ save_libs="$LIBS"
+ LIBS="-lpthread"
+
+ AC_MSG_CHECKING([for PTHREADS])
+ AC_TRY_LINK_FUNC(pthread_key_create, [use_pthreads=yes], [use_pthreads=no])
+
+ LIBS="$save_LIBS"
+
+ if test "x$use_pthreads" = "xyes"
+ then
+ AGL_LIBS="$AGL_LIBS -lpthread"
+ AC_DEFINE(PTHREADS, 1)
+ fi
+
+ AC_MSG_RESULT($use_pthreads)
+
+ AGL_BACKEND_FEATURE=LIBGLC_HAS_AGL_BACKEND
+ AM_CONDITIONAL(LIBGLC_HAS_AGL_BACKEND, true)
+ else
+ AGL_BACKEND_FEATURE=LIBGLC_HAS_NO_AGL_BACKEND
+ AM_CONDITIONAL(LIBGLC_HAS_AGL_BACKEND, false)
+ fi
+
+ AC_SUBST(AGL_BACKEND_FEATURE)
+ AC_SUBST(AGL_CFLAGS)
+ AC_SUBST(AGL_LIBS)
+
+ dnl ===========================================================================
+
AC_OUTPUT([
Makefile
***************
*** 136,138 ****
--- 174,177 ----
src/glc-features.h
libglc-glx.pc
+ libglc-agl.pc
])
Index: libglc-glx.pc.in
===================================================================
RCS file: /cvs/cairo/libglc/libglc-glx.pc.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** libglc-glx.pc.in 13 Dec 2003 10:44:41 -0000 1.2
--- libglc-glx.pc.in 3 Feb 2004 15:12:11 -0000 1.3
***************
*** 7,10 ****
Description: OpenGL compositing library (GLX backend)
Version: @VERSION@
! Libs: -L${libdir} -lglc -lm @LIBGLC_LIBS@ @GL_LIBS@ @GLX_LIBS@
! Cflags: -I${includedir} @LIBGLC_CFLAGS@ @GL_CFLAGS@ @GLX_CFLAGS@
--- 7,10 ----
Description: OpenGL compositing library (GLX backend)
Version: @VERSION@
! Libs: -L${libdir} -lglc -lm @GLX_LIBS@
! Cflags: -I${includedir} @GLX_CFLAGS@
More information about the cairo-commit
mailing list