diff --git a/configure.ac b/configure.ac index c5abbfd0784..ad64df01231 100644 --- a/configure.ac +++ b/configure.ac @@ -692,11 +692,6 @@ AC_ARG_ENABLE([gles2], [enable support for OpenGL ES 2.x API @<:@default=disabled@:>@])], [enable_gles2="$enableval"], [enable_gles2=no]) -AC_ARG_ENABLE([openvg], - [AS_HELP_STRING([--enable-openvg], - [enable support for OpenVG API @<:@default=disabled@:>@])], - [enable_openvg="$enableval"], - [enable_openvg=no]) AC_ARG_ENABLE([dri], [AS_HELP_STRING([--enable-dri], @@ -827,7 +822,6 @@ if test "x$enable_opengl" = xno -a \ "x$enable_gles1" = xno -a \ "x$enable_gles2" = xno -a \ "x$enable_nine" = xno -a \ - "x$enable_openvg" = xno -a \ "x$enable_xa" = xno -a \ "x$enable_xvmc" = xno -a \ "x$enable_vdpau" = xno -a \ @@ -1547,29 +1541,6 @@ if test "x$enable_xa" = xyes; then fi AM_CONDITIONAL(HAVE_ST_XA, test "x$enable_xa" = xyes) -dnl -dnl OpenVG configuration -dnl -VG_LIB_DEPS="" - -if test "x$enable_openvg" = xyes; then - if test "x$enable_egl" = xno; then - AC_MSG_ERROR([cannot enable OpenVG without EGL]) - fi - if test -z "$with_gallium_drivers"; then - AC_MSG_ERROR([cannot enable OpenVG without Gallium]) - fi - - AC_MSG_ERROR([Cannot enable OpenVG, because egl_gallium has been removed and - OpenVG has not been integrated into standard libEGL yet]) - - EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(VG_LIB)' - VG_LIB_DEPS="$VG_LIB_DEPS $SELINUX_LIBS $PTHREAD_LIBS" - VG_PC_LIB_PRIV="-lm $CLOCK_LIB $PTHREAD_LIBS $DLOPEN_LIBS" - AC_SUBST([VG_PC_LIB_PRIV]) -fi -AM_CONDITIONAL(HAVE_OPENVG, test "x$enable_openvg" = xyes) - dnl dnl Gallium G3DVL configuration dnl @@ -2400,7 +2371,6 @@ AC_CONFIG_FILES([Makefile src/gallium/state_trackers/osmesa/Makefile src/gallium/state_trackers/va/Makefile src/gallium/state_trackers/vdpau/Makefile - src/gallium/state_trackers/vega/Makefile src/gallium/state_trackers/xa/Makefile src/gallium/state_trackers/xvmc/Makefile src/gallium/targets/d3dadapter9/Makefile @@ -2478,7 +2448,6 @@ echo " includedir: $includedir" dnl API info echo "" echo " OpenGL: $enable_opengl (ES1: $enable_gles1 ES2: $enable_gles2)" -echo " OpenVG: $enable_openvg" dnl Driver info echo "" diff --git a/docs/contents.html b/docs/contents.html index 50c0d591360..6612cbefa84 100644 --- a/docs/contents.html +++ b/docs/contents.html @@ -61,7 +61,6 @@
  • Shading Language
  • EGL
  • OpenGL ES -
  • OpenVG / Vega
  • Environment Variables
  • Off-Screen Rendering
  • Debugging Tips diff --git a/docs/egl.html b/docs/egl.html index 704cd9a85bc..a715a3ad31d 100644 --- a/docs/egl.html +++ b/docs/egl.html @@ -112,13 +112,6 @@ is required if applications mix OpenGL and OpenGL ES.

    -
    --enable-openvg
    -
    - -

    OpenVG must be explicitly enabled by this option.

    - -
    -

    Use EGL

    diff --git a/docs/openvg.html b/docs/openvg.html deleted file mode 100644 index 28ebb82e83d..00000000000 --- a/docs/openvg.html +++ /dev/null @@ -1,59 +0,0 @@ - - - - - OpenVG State Tracker - - - - -
    -

    The Mesa 3D Graphics Library

    -
    - - -
    - -

    OpenVG State Tracker

    - -

    -The current version of the OpenVG state tracker implements OpenVG 1.1. -

    -

    -More information about OpenVG can be found at - -http://www.khronos.org/openvg/ . -

    -

    -The OpenVG state tracker depends on the Gallium architecture and a working EGL implementation. -Please refer to Mesa EGL for more information about EGL. -

    - - -

    Building the library

    -
      -
    1. Run configure with --enable-openvg and ---enable-gallium-egl. If you do not need OpenGL, you can add ---disable-opengl to save the compilation time.
      2. - -
    2. Build and install Mesa as usual.
      3. -
    - -

    Sample build

    -A sample build looks as follows: -
    -  $ ./configure --disable-opengl --enable-openvg --enable-gallium-egl
-  $ make
-  $ make install
-
    - -

    It will install libOpenVG.so, libEGL.so, and one -or more EGL drivers.

    - -

    OpenVG Demos

    - -

    OpenVG demos can be found in mesa/demos repository.

    - -
    - - diff --git a/docs/relnotes/10.6.0.html b/docs/relnotes/10.6.0.html index abb50cd4763..a396109bbd6 100644 --- a/docs/relnotes/10.6.0.html +++ b/docs/relnotes/10.6.0.html @@ -61,6 +61,7 @@ TBD. diff --git a/docs/relnotes/7.6.html b/docs/relnotes/7.6.html index 86ad4a848b5..c6eba1d2ef9 100644 --- a/docs/relnotes/7.6.html +++ b/docs/relnotes/7.6.html @@ -48,7 +48,7 @@ c49c19c2bbef4f3b7f1389974dff25f4 MesaGLUT-7.6.zip

    New features