[cairo-commit] libglc ChangeLog,1.30,1.31 TODO,1.7,1.8 configure.in,1.7,1.8

[David Reveman]

Committed by: davidr

Update of /cvs/cairo/libglc
In directory pdx:/tmp/cvs-serv21282

Modified Files:
	ChangeLog TODO configure.in 
Log Message:
Dynamic lookup of all GL and GLX extension symbols

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/libglc/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** ChangeLog	12 Feb 2004 12:49:39 -0000	1.30
--- ChangeLog	16 Feb 2004 22:02:40 -0000	1.31
***************
*** 1,2 ****
--- 1,8 ----
+ 2004-02-16    <c99drn at cs.umu.se>
+ 
+ 	* configure.in: Check version of GL headers.
+ 
+ 	Dynamic lookup of all GL and GLX extension symbols.
+ 
  2004-02-12    <c99drn at cs.umu.se>
  

Index: TODO
===================================================================
RCS file: /cvs/cairo/libglc/TODO,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TODO	12 Feb 2004 12:49:39 -0000	1.7
--- TODO	16 Feb 2004 22:02:40 -0000	1.8
***************
*** 1,2 ****
! * Manual repeat for compositing using framgment program.
! * Minimize intermediate area when compositing with mask and transformation.
\ No newline at end of file
--- 1,7 ----
! * Manual repeat when compositing using fragment program.
! * Scaling transformations of source surface when compositing using fragment
!   program.
! * Minimize intermediate area when compositing with mask and transformation.
! * Convolution filter support.
! * GL_ARB_texture_non_power_of_two support.
! * GLX_ARB_render_texture support.
\ No newline at end of file

Index: configure.in
===================================================================
RCS file: /cvs/cairo/libglc/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** configure.in	3 Feb 2004 15:12:11 -0000	1.7
--- configure.in	16 Feb 2004 22:02:40 -0000	1.8
***************
*** 64,69 ****
  
  AC_ARG_ENABLE(glx,
!   AC_HELP_STRING([--disable-glx], [Disable libglc's GLX backend]),
!   [use_glx=$enableval], [use_glx=yes])
  
  AH_TEMPLATE([XTHREADS], [Define if Xlib supports XTHREADS])
--- 64,86 ----
  
  AC_ARG_ENABLE(glx,
!   AC_HELP_STRING([--enable-glx], [Enable libglc's GLX backend]),
!   [use_glx=$enableval], [use_glx=no])
! 
! AC_ARG_ENABLE(agl,
!   AC_HELP_STRING([--enable-agl], [Enable libglc's AGL backend]),
!   [use_agl=$enableval], [use_agl=no])
! 
! 
! if test "x$use_agl" != "xyes"; then
!   use_glx="yes"
! else
!   if test "x$use_glx" != "xyes"; then
!     use_agl="yes"
!   else
!     AC_MSG_ERROR(libglc cannot be compiled for both GLX and AGL)
!   fi
! fi
! 
! dnl ===========================================================================
  
  AH_TEMPLATE([XTHREADS], [Define if Xlib supports XTHREADS])
***************
*** 104,107 ****
--- 121,177 ----
    fi
  
+   # Check glext.h version
+   AC_MSG_CHECKING(version of GL/glext.h)
+   AC_RUN_IFELSE([
+     AC_LANG_PROGRAM(
+     [
+       #include <GL/gl.h>
+       #include <GL/glext.h>
+     ], 
+     [
+       #if GL_GLEXT_VERSION < 21
+         return 1;
+       #endif
+     ])],
+   AC_MSG_RESULT(ok),
+   AC_MSG_RESULT(failed)
+   AC_MSG_RESULT(** WARNING **: I'd like to have a newer <GL/glext.h>. Please download it from http://oss.sgi.com/projects/ogl-sample/ABI/),
+   AC_MSG_RESULT(ok))
+ 
+   # Check for GLX 1.3 in glx.h
+   AC_MSG_CHECKING(for GLX 1.3 in GL/glx.h)
+   AC_RUN_IFELSE([
+     AC_LANG_PROGRAM(
+     [
+       #include <GL/glx.h>
+     ], 
+     [
+       #ifndef GLX_VERSION_1_3
+         return 1;
+       #endif
+     ])],
+   AC_MSG_RESULT(ok),
+   AC_MSG_RESULT(failed)
+   AC_MSG_RESULT(** WARNING **: <GL/glx.h> is missing GLX 1.3),
+   AC_MSG_RESULT(ok))
+ 
+   # Check glxext.h version
+   AC_MSG_CHECKING(version of GL/glxext.h)
+   AC_RUN_IFELSE([
+     AC_LANG_PROGRAM(
+     [
+       #include <GL/glx.h>
+       #include <GL/glxext.h>
+     ], 
+     [
+       #if GLX_GLXEXT_VERSION < 5
+         return 1;
+       #endif
+     ])],
+   AC_MSG_RESULT(ok),
+   AC_MSG_RESULT(failed)
+   AC_MSG_RESULT(** WARNING **: I'd like to have a newer <GL/glxext.h>. Please download it from http://oss.sgi.com/projects/ogl-sample/ABI/),
+   AC_MSG_RESULT(ok))
+ 
    # Check for glxATI.h
    AC_MSG_CHECKING(for GL/glxATI.h)
***************
*** 124,134 ****
  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"
--- 194,203 ----
  dnl ===========================================================================
  
  AH_TEMPLATE([PTHREADS], [Define if PTHREADS are supported])
  
! if test "x$use_agl" != "xyes"; then
!   AGL_BACKEND_FEATURE=LIBGLC_HAS_NO_AGL_BACKEND
!   AM_CONDITIONAL(LIBGLC_HAS_AGL_BACKEND, false)
! else
    AC_MSG_CHECKING([for AGL.framework])
    save_libs="$LIBS"
***************
*** 137,143 ****
    LIBS="$save_libs"
    AC_MSG_RESULT([$use_agl])
- fi
  
! if test "x$use_agl" = "xyes"; then
    save_libs="$LIBS"
    LIBS="-lpthread"
--- 206,214 ----
    LIBS="$save_libs"
    AC_MSG_RESULT([$use_agl])
  
!   if test "x$use_agl" != "xyes"; then
!     AC_MSG_ERROR(I need AGL.framework to compile AGL backend)
!   fi
! 
    save_libs="$LIBS"
    LIBS="-lpthread"
***************
*** 158,164 ****
    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
  
--- 229,232 ----