diff options
Diffstat (limited to 'mesalib')
| -rw-r--r-- | mesalib/Makefile.am | 6 | ||||
| -rw-r--r-- | mesalib/configure.ac | 15 | ||||
| -rw-r--r-- | mesalib/docs/GL3.txt | 14 | ||||
| -rw-r--r-- | mesalib/src/mapi/glapi/Makefile.am | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/Makefile.am | 2 |
5 files changed, 22 insertions, 17 deletions
diff --git a/mesalib/Makefile.am b/mesalib/Makefile.am index 29405a0fd..63e02c6a0 100644 --- a/mesalib/Makefile.am +++ b/mesalib/Makefile.am @@ -26,12 +26,6 @@ ACLOCAL_AMFLAGS = -I m4 doxygen: cd doxygen && $(MAKE) -check-local: - $(MAKE) -C src/mapi/glapi/tests check - $(MAKE) -C src/mapi/shared-glapi/tests check - $(MAKE) -C src/mesa/main/tests check - $(MAKE) -C src/glx/tests check - .PHONY: doxygen # Rules for making release tarballs diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 35f6797ee..21a1986b2 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -618,19 +618,19 @@ AC_ARG_ENABLE([opencl], @<:@default=no@:>@])], [], [enable_opencl=no]) -AC_ARG_ENABLE([xlib_glx], +AC_ARG_ENABLE([xlib-glx], [AS_HELP_STRING([--enable-xlib-glx], [make GLX library Xlib-based instead of DRI-based @<:@default=disabled@:>@])], [enable_xlib_glx="$enableval"], [enable_xlib_glx=no]) -AC_ARG_ENABLE([gallium_egl], +AC_ARG_ENABLE([gallium-egl], [AS_HELP_STRING([--enable-gallium-egl], [enable optional EGL state tracker (not required for EGL support in Gallium with OpenGL and OpenGL ES) @<:@default=disable@:>@])], [enable_gallium_egl="$enableval"], [enable_gallium_egl=no]) -AC_ARG_ENABLE([gallium_gbm], +AC_ARG_ENABLE([gallium-gbm], [AS_HELP_STRING([--enable-gallium-gbm], [enable optional gbm state tracker (not required for gbm support in Gallium) @@ -644,7 +644,7 @@ AC_ARG_ENABLE([r600-llvm-compiler], [enable_r600_llvm="$enableval"], [enable_r600_llvm=no]) -AC_ARG_ENABLE([gallium_tests], +AC_ARG_ENABLE([gallium-tests], [AS_HELP_STRING([--enable-gallium-tests], [Enable optional Gallium tests) @<:@default=disable@:>@])], [enable_gallium_tests="$enableval"], @@ -1423,8 +1423,6 @@ AC_ARG_WITH([egl-platforms], with_egl_platforms="" fi]) -EGL_PLATFORMS="" - if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then AC_MSG_ERROR([cannot build egl state tracker without EGL library]) fi @@ -1478,8 +1476,6 @@ else EGL_NATIVE_PLATFORM="_EGL_INVALID_PLATFORM" fi -EGL_PLATFORMS="$egl_platforms" - if echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1; then NEED_WINSYS_XLIB=yes fi @@ -1493,7 +1489,6 @@ AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x") AM_CONDITIONAL(HAVE_EGL_DRIVER_GLX, test "x$HAVE_EGL_DRIVER_GLX" != "x") AC_SUBST([EGL_NATIVE_PLATFORM]) -AC_SUBST([EGL_PLATFORMS]) AC_SUBST([EGL_CFLAGS]) # If we don't have the X11 platform, set this define so we don't try to include @@ -2184,7 +2179,7 @@ dnl EGL echo "" echo " EGL: $enable_egl" if test "$enable_egl" = yes; then - echo " EGL platforms: $EGL_PLATFORMS" + echo " EGL platforms: $egl_platforms" egl_drivers="" if test "x$HAVE_EGL_DRIVER_GLX" != "x"; then diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt index f2152a31e..64986ea73 100644 --- a/mesalib/docs/GL3.txt +++ b/mesalib/docs/GL3.txt @@ -156,5 +156,19 @@ ARB_texture_view not started ARB_vertex_attrib_binding not started +GL 4.4: + +GLSL 4.4 not started +MAX_VERTEX_ATTRIB_STRIDE not started +ARB_buffer_storage not started +ARB_clear_texture not started +ARB_enhanced_layouts not started +ARB_multi_bind not started +ARB_query_buffer_object not started +ARB_texture_mirror_clamp_to_edge not started +ARB_texture_stencil8 not started +ARB_vertex_type_10f_11f_11f_rev not started + + More info about these features and the work involved can be found at http://dri.freedesktop.org/wiki/MissingFunctionality diff --git a/mesalib/src/mapi/glapi/Makefile.am b/mesalib/src/mapi/glapi/Makefile.am index 1698d1474..05c67a6d4 100644 --- a/mesalib/src/mapi/glapi/Makefile.am +++ b/mesalib/src/mapi/glapi/Makefile.am @@ -19,6 +19,8 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. +SUBDIRS = . tests + TOP = $(top_srcdir) include Makefile.sources include ../Makefile.sources diff --git a/mesalib/src/mesa/Makefile.am b/mesalib/src/mesa/Makefile.am index d5f5f5b86..e9c16e78e 100644 --- a/mesalib/src/mesa/Makefile.am +++ b/mesalib/src/mesa/Makefile.am @@ -23,7 +23,7 @@ if NEED_LIBDRICORE DRICORE_SUBDIR = libdricore endif -SUBDIRS = program x86 x86-64 . $(DRICORE_SUBDIR) +SUBDIRS = program x86 x86-64 . $(DRICORE_SUBDIR) main/tests if HAVE_X11_DRIVER SUBDIRS += drivers/x11 |