[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r12269: improve OpenGLES1 & 2 suppor
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r12269: improve OpenGLES1 & 2 support configure. Add configure support for OpenVG. Change _ANDROID to ANDROID. |
|
Date: |
Tue, 22 Jun 2010 12:14:10 -0600 |
|
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 12269
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Tue 2010-06-22 12:14:10 -0600
message:
improve OpenGLES1 & 2 support configure. Add configure support for OpenVG.
Change _ANDROID to ANDROID.
added:
macros/gles.m4
modified:
configure.ac
macros/opengl.m4
=== modified file 'configure.ac'
--- a/configure.ac 2010-06-12 20:37:26 +0000
+++ b/configure.ac 2010-06-22 18:14:10 +0000
@@ -246,13 +246,14 @@
CROSS_CXXFLAGS=
if test x"${android_ndk}" != xno; then
dnl LDFLAGS=-Wl,--dynamic-linker -Wl,/system/bin/linker -nostdlib -Wl,-rpath
-Wl,/system/lib -Wl,-rpath -Wl,${android_ndk}/usr/lib -L${android_ndk}/usr/lib
-lc -o hello ${android_ndk}/usr/lib/crtbegin_dynamic.o
+dnl CROSS_CXXFLAGS=-mandroid -fexceptions -I${android_ndk}/include
CROSS_CXXFLAGS=-mandroid -fexceptions
if test x"${with_top_level}" = x; then
with_top_level=/usr/local/android-arm/sysroot/usr
cross_compiling=yes
fi
ANDROID_NDK=${android_ndk}
- AC_DEFINE(_ANDROID, [1], [This is an Android build])
+ AC_DEFINE(ANDROID, [1], [This is an Android build])
else
ANDROID_NDK=
fi
@@ -696,6 +697,7 @@
fi
dnl By default, we want to to build all renderers
+build_ovg=no
build_gles=no
build_ogl=yes
build_agg=yes
@@ -715,6 +717,7 @@
fi
renderer_list=""
nrender=0
+ build_ovg=no
build_ogl=no
build_gles=no
build_agg=no
@@ -724,6 +727,7 @@
[case "${val}" in
no*|NO*)
renderer_list="none"
+ build_ovg=no
build_ogl=no
build_gles=no
build_agg=no
@@ -735,7 +739,8 @@
build_ogl=yes
build_agg=yes
build_cairo=yes
- nrender=3
+ build_ovg=yes
+ nrender=4
;;
ogl|OGL|OpenGL|opengl)
renderer_list="${renderer_list} OpenGL"
@@ -749,6 +754,11 @@
build_ogl=no
nrender=$((nrender+1))
;;
+ ovg|OVG|OpenVG|openvg)
+ renderer_list="${renderer_list} OpenVG"
+ build_ogv=yes
+ nrender=$((nrender+1))
+ ;;
agg|AGG)
renderer_list="${renderer_list} AGG"
build_agg=yes
@@ -811,10 +821,6 @@
AC_DEFINE([RENDERER_OPENGL], [], [Use OpenGL renderer])
fi
-if test x"${build_gles}" = xyes; then
- AC_DEFINE([RENDERER_GLES], [], [Use OpenGL-ES renderer])
-fi
-
dnl 16 bit: RGB555, RGB565
dnl 24 bit: RGB24, BGR24
dnl 32 bit: RGBA32, BGRA32
@@ -1069,6 +1075,7 @@
AC_PATH_PROG(DEJAGNU, runtest)
+AM_CONDITIONAL(BUILD_OVG_RENDERER, [ test x$build_ovg = xyes ])
AM_CONDITIONAL(BUILD_GLES_RENDERER, [ test x$build_gles = xyes ])
AM_CONDITIONAL(BUILD_OGL_RENDERER, [ test x$build_ogl = xyes])
AM_CONDITIONAL(BUILD_AGG_RENDERER, [ test x$build_agg = xyes ])
@@ -1323,6 +1330,10 @@
export pathlist=$PATH
fi
+if test x"${android_ndk}" != xno; then
+ incllist="${android_ndk}/include ${incllist}"
+fi
+
AM_CONDITIONAL(CROSS_COMPILING, [ test x$cross_compiling = xyes ])
dnl !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -2099,8 +2110,16 @@
AM_CONDITIONAL(KPARTS3, [test x"${build_kparts3}" = xyes])
AM_CONDITIONAL(KPARTS4, [test x"${build_kparts4}" = xyes])
+GNASH_PKG_FIND(ts, [tslib.h], [Touchscreen library], ts_config)
+
if test x"${build_gles}" = xyes; then
- GNASH_PATH_GLES
+ GNASH_PKG_FIND(EGL, [EGL/egl.h], [EGL library], eglGetDisplay)
+ GNASH_PATH_GLES
+fi
+
+if test x"${build_ogv}" = xyes; then
+ GNASH_PKG_FIND(EGL, [EGL/egl.h], [EGL library], eglGetDisplay)
+ GNASH_PKG_FIND(OpenVG, [vg/openvg.h], [OpenVG library], vgDrawImage)
fi
if test x"${build_ogl}" = xyes; then
=== added file 'macros/gles.m4'
--- a/macros/gles.m4 1970-01-01 00:00:00 +0000
+++ b/macros/gles.m4 2010-06-22 18:14:10 +0000
@@ -0,0 +1,237 @@
+dnl
+dnl Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
Foundation, Inc.
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+AC_DEFUN([GNASH_PATH_GLES],
+[
+ gles=yes
+
+ dnl This changes the default between OpenGL-ES 1.x and 2.x, which are
+ dnl somewhat incomatible with each other. gles1 or gles2 are all that's
+ dnl supported.
+ default_version=gles1
+ dnl This changes the default flavor of OpenGL-ES implementations. If only
+ dnl one is installed, it doesn't matter, but if you are a developer with
+ dnl multiple OpenGL-ES implementations, you can use this to limit the
+ dnl search. 10c, mali, android are all that's supported.
+ default_flavor=any
+ dnl The config flavor is used for what configure thinks the default
+ dnl is when there is no default flavor of OpenGL-ES library.
+ config_flavor=${default_flavor}
+
+ dnl add the default path to the Android NDK
+ if test x"${android_ndk}" != xno; then
+ newlist="${android_ndk}/usr/include ${incllist}"
+ else
+ newlist="${incllist}"
+ fi
+
+ dnl Look for the headers.
+ AC_ARG_WITH(gles_includes, AC_HELP_STRING([--with-gles-includes], [directory
where OpenGL-ES headers are]), with_gles_includes=${withval})
+ AC_CACHE_VAL(ac_cv_path_gles_includes,[
+ if test x"${with_gles_includes}" != x ; then
+ if test -f ${with_gles_includes}/GLES/egl.h -o -f
${with_gles_includes}/GLES2/gl2.h ; then
+ ac_cv_path_gles_includes="-I`(cd ${with_gles_includes}; pwd)`"
+ else
+ AC_MSG_ERROR([${with_gles_includes} directory doesn't contain egl.h or
gl2.h])
+ fi
+ fi
+ ])
+
+ dnl This gets reall fun, as all the implementations I could find
+ dnl have differences. OpenGL-ES 1.x by default doesn't have
+ dnl Farmebuffer support, this is added by an extension. For
+ dnl OpenGL-ES 2.x, this extension is now in the standard API.
+ dnl
+ dnl The three tested implementations so far are the linux gles-10c
+ dnl project, which appears unmaintained these days, but lacks the
+ dnl framebuffer extension. It does however work on a 64bit system,
+ dnl unlike the other libraries mentioned here.
+ dnl
+ dnl The other primary one is the Andproid implementation, which has
+ dnl OpenGL-ES 1.1 support (with the framebuffer extension) and 2.1
+ dnl support.
+ dnl
+ dnl The final one are the Mali Developer Tools from ARM, that
+ dnl contain emulator that lets you run OpenGL-ES applications on a
+ dnl standard desktop under X11. The 2.0 version of the tools
+ dnl includes both OpenGL-ES 1.1 and 2.1, but with a twist. The
+ dnl OpenGL-ES 1.x implementation is under the EGL, instead of the
+ dnl GLES top level directory.
+ if test x"${ac_cv_path_gles_includes}" = x; then
+ AC_MSG_CHECKING([for OpenGL-ES headers])
+ for i in ${newlist}; do
+ dnl OpenGL-ES 1.x
+ if test x"${default_version}" = xgles1; then
+ if test -f $i/GLES/gl.h; then
+ AC_DEFINE(HAVE_GLES_GL_H, [1], [Have OpenGL-ES GLES/gl.h])
+ AC_DEFINE([RENDERER_GLES], [], [Use OpenGL-ES version 1.x])
+ ac_cv_path_gles_includes="-I$i"
+ dnl Some implementations have this extension, which adds
+ dnl framebuffer support.
+ if test -f $i/GLES/glext.h; then
+ AC_DEFINE(HAVE_GLES_GLEXT_H, [1], [Have OpenGL-ES GLES/glext.h])
+ fi
+ dnl If it contains the egl.h file, it's probably gles-10c,
+ dnl if not, then it's probably the Android implementation.
+ if test -f $i/GLES/egl.h; then
+ config_flavor=10c
+ else
+ config_flavor=android
+ fi
+ fi
+ if test -f $i/EGL/egl.h; then
+ AC_DEFINE(HAVE_EGL_EGL_H, [1], [Have OpenGL-ES EGL/egl.h])
+ ac_cv_path_gles_includes="-I$i"
+ dnl Only the Mali library has this header file.
+ if test -f $i/EGL/egl_native_types.h; then
+ config_flavor=mali
+ else
+ config_flavor=android
+ fi
+ fi
+ fi
+ dnl If no OpenGL-ES 1.x headers can be found, look for v2 files
+ if test x"${ac_cv_path_gles_includes}" = x; then
+ default_version=gles2
+ fi
+ dnl OpenGL-ES 2.x
+ if test x"${default_version}" = xgles2; then
+ if test -f $i/GLES2/gl2.h; then
+ AC_DEFINE(HAVE_GLES2_GL2_H, [1], [Have OpenGL-ES GLES2/gl2.h])
+ AC_DEFINE([RENDERER_GLES2], [], [Use OpenGL-ES v2 version 2])
+ ac_cv_path_gles_includes="-I$i"
+ dnl Both OpenGL-ES 2.1 implementations are similar enough
+ dnl the flavor doesn't matter.
+ config_flavor=android
+ fi
+ if test -f $i/EGL/egl.h; then
+ AC_DEFINE(HAVE_EGL_EGL_H, [1], [Have OpenGL-ES EGL/egl.h])
+ AC_DEFINE([RENDERER_EGL], [], [Use OpenGL-ES version 1.3])
+ ac_cv_path_gles_includes="-I$i"
+ dnl Only the Mali library has this header file.
+ if test -f $i/EGL/egl_native_types.h; then
+ config_flavor=mali
+ else
+ config_flavor=android
+ fi
+ fi
+ fi
+ if test x"${ac_cv_path_gles_includes}" != x; then
+ break;
+ fi
+ done
+ fi
+ if test x"${ac_cv_path_gles_includes}" != x; then
+ AC_MSG_RESULT(${ac_cv_path_gles_includes})
+ fi
+
+ if test x"${ac_cv_path_gles_includes}" = x; then
+ AC_CHECK_HEADERS([GLES2/gl2.h], [ac_cv_path_gles_includes=""])
+ fi
+ if test x"${ac_cv_path_gles_includes}" = x; then
+ AC_CHECK_HEADERS([GLES/egl.h], [ac_cv_path_gles_includes=""])
+ fi
+
+ if test x"${ac_cv_path_gles_includes}" != x; then
+ GLES_CFLAGS="${ac_cv_path_gles_includes}"
+ else
+ GLES_CFLAGS=""
+ fi
+
+ if test x"${default_flavor}" = xany; then
+ flavor="${config_flavor}"
+ else
+ flavor="${default_flavor}"
+ fi
+
+ dnl the library has different names depending on the release and platform
+ dnl Android uses GLESv1_CM or GLESv2
+ dnl The older gles-10c uses libGLES_CL, but works on an x86_64, which the
+ dnl Mali tools from ARM don't.
+ dnl The Mali Developer Tools 1.1 from the ARM emulator use libegl & libglesv1
+ dnl The Mali Developer Tools 2.0 from the ARM emulator use libEGL &
+ dnl libGLESv2. We limit the search of librairies so if we have
+ dnl multiple OpenGL-ES implementations installed (for testing and
+ dnl development), so we don't mix and match headers and libaries
+ dnl between implementations.
+ if test x"${default_version}" = xgles1; then
+ AC_MSG_NOTICE([OpenGL-ES implementation being used is: ${flavor} 1.x])
+ case "${flavor}" in
+ mali) gleslist="egl glesv1" ;;
+ 10c) gleslist="GLES_CL" ;;
+ android) gleslist="EGL GLESv1_CM" ;;
+ *) gleslist="GLES_CL GLESv1_CM GLESv1" ;;
+ esac
+ fi
+
+ if test x"${default_version}" = xgles2; then
+ AC_MSG_NOTICE([OpenGL-ES implementation being used is: ${flavor} 2.x])
+ gleslist="EGL GLESv2"
+ fi
+
+ dnl Look for the libraries.
+ AC_ARG_WITH(gles_lib, AC_HELP_STRING([--with-gles-lib], [directory where
OpenGL-ES libraries are]), with_gles_lib=${withval})
+ AC_CACHE_VAL(ac_cv_path_gles_lib,[
+ if test x"${with_gles_lib}" != x ; then
+ for j in $gleslist; do
+ if test -f ${with_gles_lib}/$i.a -o -f
${with_gles_lib}/$i.${shlibext}; then
+ ac_cv_path_gles_lib="-L`(cd ${with_gles_lib}; pwd)` -l$i"
+ break;
+ fi
+ done
+ fi
+ ])
+
+ dnl add the default path to the Android NDK
+ newlist="${android_ndk}/usr/lib ${libslist}"
+ if test x"${ac_cv_path_gles_lib}" = x; then
+ for dir in ${newlist}; do
+ for lib in ${gleslist}; do
+ if test -f ${dir}/lib${lib}.${shlibext} -o -f ${dir}/lib${lib}.a; then
+ has_gles="yes"
+ if test ! x"${dir}" = x"/usr/lib" -a ! x"${dir}" = x"/usr/lib64";
then
+ ac_cv_path_gles_lib="-L${dir} -l${lib}"
+ else
+ ac_cv_path_gles_lib="-l${lib}"
+ fi
+ dnl add the additiontal library need to link
+ if test x"${default_version}" = xgles2; then
+ ac_cv_path_gles_lib="${ac_cv_path_gles_lib} -lGLESv2"
+ fi
+ break
+ fi
+ done
+ if test x"${ac_cv_path_gles_lib}" != x ; then
+ break
+ fi
+ done
+ fi
+
+ if test x"${ac_cv_path_gles_lib}" != x ; then
+ GLES_LIBS="${ac_cv_path_gles_lib}"
+ else
+ GLES_LIBS=""
+ fi
+
+ AC_SUBST(GLES_CFLAGS)
+ AC_SUBST(GLES_LIBS)
+])
+
+# Local Variables:
+# c-basic-offset: 2
+# tab-width: 2
+# indent-tabs-mode: nil
+# End:
=== modified file 'macros/opengl.m4'
--- a/macros/opengl.m4 2010-06-12 20:37:26 +0000
+++ b/macros/opengl.m4 2010-06-22 18:14:10 +0000
@@ -14,105 +14,6 @@
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-AC_DEFUN([GNASH_PATH_GLES],
-[
- gles=yes
-
- dnl the library has different names depending on the release
- gleslist="GLESv2 GLES_CL GLESv1_CM GLESv1"
-
- dnl add the default path to the Android NDK
- newlist="${android_ndk}/usr/include ${incllist}"
-
- dnl Look for the headers.
- AC_ARG_WITH(gles_includes, AC_HELP_STRING([--with-gles-includes], [directory
where OpenGL-ES headers are]), with_gles_includes=${withval})
- AC_CACHE_VAL(ac_cv_path_gles_includes,[
- if test x"${with_gles_includes}" != x ; then
- if test -f ${with_gles_includes}/GLES/egl.h -o -f
${with_gles_includes}/GLES2/gl2.h ; then
- ac_cv_path_gles_includes="-I`(cd ${with_gles_includes}; pwd)`"
- else
- AC_MSG_ERROR([${with_gles_includes} directory doesn't contain egl.h or
gl2.h])
- fi
- fi
- ])
-
- if test x"${ac_cv_path_gles_includes}" = x; then
- AC_MSG_CHECKING([for OpenGL-ES headers])
- for i in ${newlist}; do
- if test -f $i/GLES2/gl2.h; then
- AC_DEFINE(HAVE_GLES2_GL2_H, [1], [Have OpenGL_ES version 2])
- ac_cv_path_gles_includes="-I$i"
- break;
- else
- if test -f $i/GLES/egl.h; then
- AC_DEFINE(HAVE_GLES_EGL_H, [1], [Have OpenGL_ES version 1])
- ac_cv_path_gles_includes="-I$i"
- break;
- fi
- fi
- done
- fi
- if test x"${ac_cv_path_gles_includes}" != x; then
- AC_MSG_RESULT(${ac_cv_path_gles_includes})
- fi
-
- if test x"${ac_cv_path_gles_includes}" = x; then
- AC_CHECK_HEADERS([GLES2/gl2.h], [ac_cv_path_gles_includes=""])
- fi
- if test x"${ac_cv_path_gles_includes}" = x; then
- AC_CHECK_HEADERS([GLES/egl.h], [ac_cv_path_gles_includes=""])
- fi
-
- if test x"${ac_cv_path_gles_includes}" != x; then
- GLES_CFLAGS="${ac_cv_path_gles_includes}"
- else
- GLES_CFLAGS=""
- fi
-
- dnl Look for the libraries.
- AC_ARG_WITH(gles_lib, AC_HELP_STRING([--with-gles-lib], [directory where
OpenGL-ES libraries are]), with_gles_lib=${withval})
- AC_CACHE_VAL(ac_cv_path_gles_lib,[
- if test x"${with_gles_lib}" != x ; then
- for j in $gleslist; do
- if test -f ${with_gles_lib}/$i.a -o -f
${with_gles_lib}/$i.${shlibext}; then
- ac_cv_path_gles_lib="-L`(cd ${with_gles_lib}; pwd)` -l$i"
- break;
- fi
- done
- fi
- ])
-
- dnl add the default path to the Android NDK
- newlist="${android_ndk}/usr/lib ${libslist}"
- if test x"${ac_cv_path_gles_lib}" = x; then
- for dir in ${newlist}; do
- for lib in ${gleslist}; do
- if test -f ${dir}/lib${lib}.${shlibext} -o -f ${dir}/lib${lib}.a; then
- has_gles="yes"
- if test ! x"${dir}" = x"/usr/lib" -a ! x"${dir}" = x"/usr/lib64";
then
- ac_cv_path_gles_lib="-L${dir} -l${lib}"
- else
- ac_cv_path_gles_lib="-l${lib}"
- fi
- break
- fi
- done
- if test x"${ac_cv_path_gles_lib}" != x ; then
- break
- fi
- done
- fi
-
- if test x"${ac_cv_path_gles_lib}" != x ; then
- GLES_LIBS="${ac_cv_path_gles_lib}"
- else
- GLES_LIBS=""
- fi
-
- AC_SUBST(GLES_CFLAGS)
- AC_SUBST(GLES_LIBS)
-])
-
AC_DEFUN([GNASH_PATH_OPENGL],
[
opengl=yes
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r12269: improve OpenGLES1 & 2 support configure. Add configure support for OpenVG. Change _ANDROID to ANDROID.,
Rob Savoye <=