From 438af0c7d4bf60b408b259c88205ff2193195466 Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 21 Sep 2014 18:11:28 +0200 Subject: libxtrans xkeyboard-config xserver mesa plink glproto git update 21 Sep 2014 plink revision 10233 xserver commit 28337cb14e4347e1dd7936c5393a22e042866687 xkeyboard-config commit 48e1c0b351b6711edc0f167cbb81e4424b75291a glproto commit bd3d751e1eb17efb39f65093271bb4ac071aa9e0 libxtrans commit fb7f198c88e97d22c8c89e76e9cd06b2b2720a96 mesa commit 4eb2bbefd2bf0359aff7ebbb8e931a1c7833606f --- X11/xtrans/Xtrans.c | 25 + X11/xtrans/Xtrans.h | 4 + gl/glxproto.h | 2 +- mesalib/configure.ac | 84 +- mesalib/docs/GL3.txt | 4 +- mesalib/docs/index.html | 11 + mesalib/docs/relnotes.html | 2 + mesalib/docs/relnotes/10.2.8.html | 130 ++ mesalib/docs/relnotes/10.3.html | 252 ++- mesalib/docs/relnotes/10.4.html | 62 + mesalib/scons/gallium.py | 6 + mesalib/src/gallium/Makefile.am | 4 +- mesalib/src/gallium/auxiliary/Makefile.am | 4 + mesalib/src/gallium/auxiliary/Makefile.sources | 2 - mesalib/src/gallium/auxiliary/util/u_cpu_detect.c | 2 +- mesalib/src/gallium/auxiliary/util/u_format.c | 17 + mesalib/src/gallium/auxiliary/util/u_format.csv | 80 +- mesalib/src/gallium/auxiliary/util/u_format.h | 2 + mesalib/src/gallium/auxiliary/util/u_format_latc.c | 72 +- .../src/gallium/auxiliary/util/u_format_parse.py | 9 +- mesalib/src/gallium/auxiliary/util/u_format_rgtc.c | 92 +- mesalib/src/gallium/auxiliary/util/u_math.h | 1 + mesalib/src/gallium/auxiliary/util/u_sampler.c | 1 + mesalib/src/gallium/auxiliary/util/u_vbuf.c | 3 +- mesalib/src/glsl/Makefile.sources | 1 + mesalib/src/glsl/ast_to_hir.cpp | 77 +- mesalib/src/glsl/ir_optimization.h | 2 + mesalib/src/glsl/linker.cpp | 25 +- mesalib/src/glsl/linker.h | 3 + mesalib/src/glsl/loop_analysis.h | 9 +- mesalib/src/glsl/lower_vertex_id.cpp | 144 ++ mesalib/src/glsl/opt_constant_folding.cpp | 5 + mesalib/src/mesa/drivers/dri/common/xmlconfig.c | 4 +- mesalib/src/mesa/drivers/dri/swrast/swrast.c | 3 - mesalib/src/mesa/main/api_validate.c | 66 - mesalib/src/mesa/main/arrayobj.c | 46 - mesalib/src/mesa/main/arrayobj.h | 4 - mesalib/src/mesa/main/attrib.c | 1 - mesalib/src/mesa/main/buffers.c | 1 - mesalib/src/mesa/main/clear.c | 1 - mesalib/src/mesa/main/context.c | 12 +- mesalib/src/mesa/main/convolve.c | 5 +- mesalib/src/mesa/main/eval.c | 1 - mesalib/src/mesa/main/feedback.c | 1 - mesalib/src/mesa/main/fog.c | 1 - mesalib/src/mesa/main/format_pack.c | 99 +- mesalib/src/mesa/main/format_unpack.c | 77 +- mesalib/src/mesa/main/format_utils.c | 1102 +++++++------ mesalib/src/mesa/main/formats.c | 26 + mesalib/src/mesa/main/formats.csv | 5 + mesalib/src/mesa/main/formats.h | 5 + mesalib/src/mesa/main/histogram.c | 4 +- mesalib/src/mesa/main/macros.h | 8 +- mesalib/src/mesa/main/mtypes.h | 101 +- mesalib/src/mesa/main/pipelineobj.c | 4 +- mesalib/src/mesa/main/shader_query.cpp | 18 +- mesalib/src/mesa/main/state.c | 5 - mesalib/src/mesa/main/texcompress_rgtc.c | 79 +- mesalib/src/mesa/main/texcompress_rgtc_tmp.h | 418 ----- mesalib/src/mesa/main/texformat.c | 13 + mesalib/src/mesa/main/uniform_query.cpp | 16 +- mesalib/src/mesa/main/varray.c | 9 +- mesalib/src/mesa/main/varray.h | 33 - mesalib/src/mesa/program/ir_to_mesa.cpp | 7 +- mesalib/src/mesa/program/prog_optimize.c | 9 +- mesalib/src/mesa/program/register_allocate.c | 1 + mesalib/src/mesa/program/register_allocate.h | 5 +- mesalib/src/mesa/state_tracker/st_atom_texture.c | 30 +- mesalib/src/mesa/state_tracker/st_cb_fbo.c | 10 + mesalib/src/mesa/state_tracker/st_cb_texture.c | 62 +- mesalib/src/mesa/state_tracker/st_context.c | 82 +- mesalib/src/mesa/state_tracker/st_extensions.c | 1 + mesalib/src/mesa/state_tracker/st_format.c | 121 +- mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 3 + mesalib/src/mesa/state_tracker/st_texture.c | 15 +- mesalib/src/mesa/swrast/s_texfetch.c | 5 + mesalib/src/mesa/swrast/s_texfetch_tmp.h | 54 +- mesalib/src/mesa/vbo/vbo_exec_array.c | 26 +- mesalib/src/mesa/vbo/vbo_exec_draw.c | 2 - mesalib/src/mesa/vbo/vbo_save_draw.c | 1 - mesalib/src/mesa/vbo/vbo_split_copy.c | 1 - mesalib/src/util/Makefile.sources | 3 +- mesalib/src/util/rgtc.c | 61 + mesalib/src/util/rgtc.h | 39 + mesalib/src/util/texcompress_rgtc_tmp.h | 418 +++++ tools/plink/cmdline.c | 15 + tools/plink/misc.c | 148 +- tools/plink/misc.h | 3 + tools/plink/putty.h | 6 + tools/plink/settings.c | 31 +- tools/plink/ssh.c | 166 +- tools/plink/sshpubk.c | 48 - tools/plink/sshshare.c | 5 + tools/plink/winhelp.h | 1 + tools/plink/winplink.c | 8 +- tools/plink/winstore.c | 9 +- xorg-server/COPYING | 24 + xorg-server/configure.ac | 41 +- xorg-server/dix/extension.c | 2 + xorg-server/dix/main.c | 2 + xorg-server/dix/pixmap.c | 18 +- xorg-server/dix/registry.c | 94 +- xorg-server/dix/resource.c | 2 + xorg-server/glamor/glamor.c | 12 +- xorg-server/glamor/glamor_glyphs.c | 86 +- xorg-server/glamor/glamor_largepixmap.c | 96 +- xorg-server/glamor/glamor_pixmap.c | 2 +- xorg-server/glamor/glamor_priv.h | 50 +- xorg-server/glamor/glamor_trapezoid.c | 1708 +------------------- xorg-server/glx/glxcmds.c | 7 +- xorg-server/glx/glxdriswrast.c | 2 +- xorg-server/hw/kdrive/ephyr/Makefile.am | 1 + xorg-server/hw/kdrive/ephyr/ephyr.h | 2 - xorg-server/hw/kdrive/ephyr/ephyrcursor.c | 262 +++ xorg-server/hw/kdrive/ephyr/ephyrinit.c | 67 +- xorg-server/hw/kdrive/ephyr/hostx.c | 39 +- xorg-server/hw/kdrive/ephyr/hostx.h | 4 + xorg-server/hw/xfree86/Makefile.am | 2 +- xorg-server/hw/xfree86/doc/README.DRIcomp | 3 - xorg-server/hw/xfree86/doc/Registry | 1 - xorg-server/hw/xfree86/drivers/Makefile.am | 5 + .../hw/xfree86/drivers/modesetting/Makefile.am | 61 + .../hw/xfree86/drivers/modesetting/driver.c | 1113 +++++++++++++ .../hw/xfree86/drivers/modesetting/driver.h | 81 + .../xfree86/drivers/modesetting/drmmode_display.c | 1616 ++++++++++++++++++ .../xfree86/drivers/modesetting/drmmode_display.h | 136 ++ .../hw/xfree86/drivers/modesetting/modesetting.man | 54 + xorg-server/hw/xfree86/int10/generic.c | 16 +- xorg-server/hw/xfree86/loader/loadmod.c | 46 +- xorg-server/hw/xfree86/man/xorg.conf.man | 6 - xorg-server/hw/xfree86/os-support/bsd/Makefile.am | 4 +- .../hw/xfree86/os-support/bsd/alpha_video.c | 434 ----- xorg-server/hw/xfree86/os-support/bsd/arm_video.c | 284 ---- xorg-server/hw/xfree86/os-support/bsd/bsd_axp.c | 71 - xorg-server/hw/xfree86/os-support/bsd/i386_video.c | 562 +------ xorg-server/hw/xfree86/os-support/bsd/ppc_video.c | 56 - .../hw/xfree86/os-support/bsd/sparc64_video.c | 40 - xorg-server/hw/xfree86/os-support/hurd/Makefile.am | 2 +- xorg-server/hw/xfree86/os-support/hurd/hurd_mmap.c | 94 -- .../hw/xfree86/os-support/hurd/hurd_video.c | 65 - .../hw/xfree86/os-support/linux/Makefile.am | 10 +- .../hw/xfree86/os-support/linux/int10/linux.c | 19 +- xorg-server/hw/xfree86/os-support/linux/lnx_axp.c | 103 -- xorg-server/hw/xfree86/os-support/linux/lnx_init.c | 6 +- .../hw/xfree86/os-support/linux/lnx_video.c | 676 -------- .../hw/xfree86/os-support/shared/bios_mmap.c | 135 -- xorg-server/hw/xfree86/os-support/shared/vidmem.c | 205 --- xorg-server/hw/xfree86/os-support/shared/xf86Axp.c | 60 - xorg-server/hw/xfree86/os-support/shared/xf86Axp.h | 33 - .../hw/xfree86/os-support/solaris/sun_vid.c | 140 -- xorg-server/hw/xfree86/os-support/stub/Makefile.am | 1 - xorg-server/hw/xfree86/os-support/stub/stub_bios.c | 12 - xorg-server/hw/xfree86/os-support/xf86OSpriv.h | 11 - xorg-server/hw/xfree86/os-support/xf86_OSproc.h | 26 - xorg-server/hw/xwayland/Makefile.am | 4 +- xorg-server/hw/xwayland/xwayland-input.c | 9 + xorg-server/hw/xwayland/xwayland.c | 48 +- xorg-server/hw/xwayland/xwayland.h | 1 + xorg-server/hw/xwin/Makefile.am | 33 +- xorg-server/hw/xwin/glx/.gitignore | 5 +- xorg-server/hw/xwin/glx/gen_gl_wrappers.py | 13 +- xorg-server/hw/xwin/glx/glwindows.h | 5 + xorg-server/hw/xwin/glx/indirect.c | 19 +- xorg-server/hw/xwin/glx/winpriv.c | 2 +- xorg-server/hw/xwin/winclipboardthread.c | 3 +- xorg-server/hw/xwin/windisplay.c | 64 + xorg-server/hw/xwin/windisplay.h | 34 + xorg-server/hw/xwin/winmsg.h | 2 + xorg-server/hw/xwin/winmultiwindowwm.c | 7 +- xorg-server/hw/xwin/winprefs.c | 8 +- xorg-server/hw/xwin/winshadddnl.c | 4 + xorg-server/include/dix-config.h.in | 3 - xorg-server/include/pixmap.h | 6 + xorg-server/include/pixmapstr.h | 1 + xorg-server/include/registry.h | 40 +- xorg-server/include/xorg-config.h.in | 6 - xorg-server/os/log.c | 10 +- xorg-server/os/utils.c | 6 +- xorg-server/present/present.c | 12 +- xorg-server/present/present.h | 1 + xorg-server/present/present_event.c | 2 +- xorg-server/test/Makefile.am | 5 +- xorg-server/test/list.c | 24 +- xorg-server/test/signal-logging.c | 7 +- .../xkeyboard-config/rules/base.extras.xml.in | 292 ++-- xorg-server/xkeyboard-config/rules/base.xml.in | 269 +-- xorg-server/xkeyboard-config/symbols/altwin | 4 +- xorg-server/xkeyboard-config/symbols/am | 2 - xorg-server/xkeyboard-config/symbols/apl | 27 +- xorg-server/xkeyboard-config/symbols/ara | 3 +- xorg-server/xkeyboard-config/symbols/bg | 2 +- xorg-server/xkeyboard-config/symbols/br | 1 - xorg-server/xkeyboard-config/symbols/brai | 2 +- xorg-server/xkeyboard-config/symbols/capslock | 24 +- xorg-server/xkeyboard-config/symbols/epo | 3 +- xorg-server/xkeyboard-config/symbols/fi | 2 +- xorg-server/xkeyboard-config/symbols/group | 2 +- xorg-server/xkeyboard-config/symbols/inet | 18 +- xorg-server/xkeyboard-config/symbols/ir | 67 +- xorg-server/xkeyboard-config/symbols/jp | 2 +- xorg-server/xkeyboard-config/symbols/keypad | 10 +- xorg-server/xkeyboard-config/symbols/kr | 4 +- xorg-server/xkeyboard-config/symbols/kz | 2 - xorg-server/xkeyboard-config/symbols/level3 | 2 +- xorg-server/xkeyboard-config/symbols/pc | 2 +- xorg-server/xkeyboard-config/symbols/rs | 12 +- xorg-server/xkeyboard-config/symbols/ru | 2 +- 207 files changed, 7380 insertions(+), 7169 deletions(-) create mode 100644 mesalib/docs/relnotes/10.2.8.html create mode 100644 mesalib/docs/relnotes/10.4.html create mode 100644 mesalib/src/glsl/lower_vertex_id.cpp delete mode 100644 mesalib/src/mesa/main/texcompress_rgtc_tmp.h create mode 100644 mesalib/src/util/rgtc.c create mode 100644 mesalib/src/util/rgtc.h create mode 100644 mesalib/src/util/texcompress_rgtc_tmp.h create mode 100644 xorg-server/hw/kdrive/ephyr/ephyrcursor.c create mode 100644 xorg-server/hw/xfree86/drivers/Makefile.am create mode 100644 xorg-server/hw/xfree86/drivers/modesetting/Makefile.am create mode 100644 xorg-server/hw/xfree86/drivers/modesetting/driver.c create mode 100644 xorg-server/hw/xfree86/drivers/modesetting/driver.h create mode 100644 xorg-server/hw/xfree86/drivers/modesetting/drmmode_display.c create mode 100644 xorg-server/hw/xfree86/drivers/modesetting/drmmode_display.h create mode 100644 xorg-server/hw/xfree86/drivers/modesetting/modesetting.man delete mode 100644 xorg-server/hw/xfree86/os-support/bsd/bsd_axp.c delete mode 100644 xorg-server/hw/xfree86/os-support/hurd/hurd_mmap.c delete mode 100644 xorg-server/hw/xfree86/os-support/linux/lnx_axp.c delete mode 100644 xorg-server/hw/xfree86/os-support/shared/bios_mmap.c delete mode 100644 xorg-server/hw/xfree86/os-support/shared/xf86Axp.c delete mode 100644 xorg-server/hw/xfree86/os-support/shared/xf86Axp.h delete mode 100644 xorg-server/hw/xfree86/os-support/stub/stub_bios.c create mode 100644 xorg-server/hw/xwin/windisplay.c create mode 100644 xorg-server/hw/xwin/windisplay.h diff --git a/X11/xtrans/Xtrans.c b/X11/xtrans/Xtrans.c index 28808030c..bfba1ad79 100644 --- a/X11/xtrans/Xtrans.c +++ b/X11/xtrans/Xtrans.c @@ -803,6 +803,31 @@ TRANS(NoListen) (const char * protocol) return ret; } +int +TRANS(Listen) (const char * protocol) +{ + Xtransport *trans; + int i = 0, ret = 0; + + if ((trans = TRANS(SelectTransport)(protocol)) == NULL) + { + prmsg (1,"TransListen: unable to find transport: %s\n", + protocol); + + return -1; + } + if (trans->flags & TRANS_ALIAS) { + if (trans->nolisten) + while (trans->nolisten[i]) { + ret |= TRANS(Listen)(trans->nolisten[i]); + i++; + } + } + + trans->flags &= ~TRANS_NOLISTEN; + return ret; +} + int TRANS(IsListening) (const char * protocol) { diff --git a/X11/xtrans/Xtrans.h b/X11/xtrans/Xtrans.h index 6decc6b3a..026fbd73f 100644 --- a/X11/xtrans/Xtrans.h +++ b/X11/xtrans/Xtrans.h @@ -311,6 +311,10 @@ int TRANS(NoListen) ( const char* /* protocol*/ ); +int TRANS(Listen) ( + const char* /* protocol*/ +); + int TRANS(IsListening) ( const char* /* protocol*/ ); diff --git a/gl/glxproto.h b/gl/glxproto.h index b50adc2c8..b4629c78c 100644 --- a/gl/glxproto.h +++ b/gl/glxproto.h @@ -2157,7 +2157,7 @@ typedef struct { #define X_GLXCreateWindow 31 #define X_GLXDestroyWindow 32 #define X_GLXSetClientInfoARB 33 -#define X_GLXCreateContextAtrribsARB 34 +#define X_GLXCreateContextAttribsARB 34 #define X_GLXSetConfigInfo2ARB 35 /* Opcodes for single commands (part of GLX command space) */ diff --git a/mesalib/configure.ac b/mesalib/configure.ac index be85fd51b..12f914e0f 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -823,6 +823,11 @@ fi AM_CONDITIONAL(HAVE_SHARED_GLAPI, test "x$enable_shared_glapi" = xyes) +# Build the pipe-drivers as separate libraries/modules. +# Do not touch this unless you know what you are doing. +# XXX: Expose via configure option ? +enable_shared_pipe_drivers=no + dnl dnl Driver specific build directories dnl @@ -843,7 +848,7 @@ esac if test "x$enable_dri" = xyes; then GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/dri" GALLIUM_STATE_TRACKERS_DIRS="dri $GALLIUM_STATE_TRACKERS_DIRS" - enable_gallium_loader=yes + enable_gallium_loader="$enable_shared_pipe_drivers" fi if test "x$enable_gallium_osmesa" = xyes; then @@ -1318,7 +1323,8 @@ if test "x$enable_gallium_egl" = xyes; then GALLIUM_STATE_TRACKERS_DIRS="egl $GALLIUM_STATE_TRACKERS_DIRS" GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS egl-static" -# enable_gallium_loader=yes +# XXX: Uncomment once converted to use static/shared pipe-drivers +# enable_gallium_loader=$enable_shared_pipe_drivers fi AM_CONDITIONAL(HAVE_GALLIUM_EGL, test "x$enable_gallium_egl" = xyes) @@ -1347,7 +1353,7 @@ if test "x$enable_gallium_gbm" = xyes; then GALLIUM_STATE_TRACKERS_DIRS="gbm $GALLIUM_STATE_TRACKERS_DIRS" GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS gbm" - enable_gallium_loader=yes + enable_gallium_loader=$enable_shared_pipe_drivers fi AM_CONDITIONAL(HAVE_GALLIUM_GBM, test "x$enable_gallium_gbm" = xyes) @@ -1364,7 +1370,7 @@ if test "x$enable_xa" = xyes; then Example: ./configure --enable-xa --with-gallium-drivers=svga...]) fi GALLIUM_STATE_TRACKERS_DIRS="xa $GALLIUM_STATE_TRACKERS_DIRS" - enable_gallium_loader=yes + enable_gallium_loader=$enable_shared_pipe_drivers fi AM_CONDITIONAL(HAVE_ST_XA, test "x$enable_xa" = xyes) @@ -1412,7 +1418,7 @@ fi if test "x$enable_xvmc" = xyes; then PKG_CHECK_MODULES([XVMC], [xvmc >= $XVMC_REQUIRED x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED]) GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xvmc" - enable_gallium_loader=yes + enable_gallium_loader=$enable_shared_pipe_drivers fi AM_CONDITIONAL(HAVE_ST_XVMC, test "x$enable_xvmc" = xyes) @@ -1420,14 +1426,14 @@ if test "x$enable_vdpau" = xyes; then PKG_CHECK_MODULES([VDPAU], [vdpau >= $VDPAU_REQUIRED x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED], [VDPAU_LIBS="`$PKG_CONFIG --libs x11-xcb xcb xcb-dri2`"]) GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS vdpau" - enable_gallium_loader=yes + enable_gallium_loader=$enable_shared_pipe_drivers fi AM_CONDITIONAL(HAVE_ST_VDPAU, test "x$enable_vdpau" = xyes) if test "x$enable_omx" = xyes; then PKG_CHECK_MODULES([OMX], [libomxil-bellagio >= $LIBOMXIL_BELLAGIO_REQUIRED x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED]) GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS omx" - enable_gallium_loader=yes + enable_gallium_loader=$enable_shared_pipe_drivers fi AM_CONDITIONAL(HAVE_ST_OMX, test "x$enable_omx" = xyes) @@ -1479,6 +1485,7 @@ if test "x$enable_opencl" = xyes; then GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS clover" GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS opencl" + # XXX: Use $enable_shared_pipe_drivers once converted to use static/shared pipe-drivers enable_gallium_loader=yes if test "x$enable_opencl_icd" = xyes; then @@ -1653,6 +1660,7 @@ strip_unwanted_llvm_flags() { # Use \> (marks the end of the word) echo `$1` | sed \ -e 's/-DNDEBUG\>//g' \ + -e 's/-D_GNU_SOURCE\>//g' \ -e 's/-pedantic\>//g' \ -e 's/-Wcovered-switch-default\>//g' \ -e 's/-O.\>//g' \ @@ -1687,7 +1695,7 @@ if test "x$enable_gallium_llvm" = xyes; then fi if test "x$LLVM_CONFIG" != xno; then - LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/svn.*//g'` + LLVM_VERSION=`$LLVM_CONFIG --version | egrep -o '^[[0-9.]]+'` LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags` LLVM_BINDIR=`$LLVM_CONFIG --bindir` LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"` @@ -1779,6 +1787,7 @@ dnl dnl Gallium Tests dnl if test "x$enable_gallium_tests" = xyes; then + # XXX: Use $enable_shared_pipe_drivers once converted to use static/shared pipe-drivers enable_gallium_loader=yes fi AM_CONDITIONAL(HAVE_GALLIUM_TESTS, test "x$enable_gallium_tests" = xyes) @@ -1786,7 +1795,6 @@ AM_CONDITIONAL(HAVE_GALLIUM_TESTS, test "x$enable_gallium_tests" = xyes) if test "x$enable_gallium_loader" = xyes; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS pipe-loader" fi -AM_CONDITIONAL(NEED_GALLIUM_LOADER, test "x$enable_gallium_loader" = xyes) dnl Directory for VDPAU libs AC_ARG_WITH([vdpau-libdir], @@ -1820,27 +1828,26 @@ dnl dnl Gallium helper functions dnl gallium_check_st() { - if test "x$NEED_NONNULL_WINSYS" = xyes; then - if test "x$have_libdrm" != xyes; then - AC_MSG_ERROR([DRI or Xorg DDX requires libdrm >= $LIBDRM_REQUIRED]) - fi - GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS $1" - fi - if test "x$enable_dri" = xyes && test -n "$2"; then - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $2" + if test "x$have_libdrm" != xyes; then + AC_MSG_ERROR([$1 requires libdrm >= $LIBDRM_REQUIRED]) fi - if test "x$enable_xa" = xyes && test -n "$3"; then + GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS $2" + + if test "x$enable_dri" = xyes && test -n "$3"; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $3" fi - if test "x$enable_xvmc" = xyes && test -n "$4"; then + if test "x$enable_xa" = xyes && test -n "$4"; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $4" fi - if test "x$enable_vdpau" = xyes && test -n "$5"; then + if test "x$enable_xvmc" = xyes && test -n "$5"; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $5" fi - if test "x$enable_omx" = xyes && test "x$6" != x; then + if test "x$enable_vdpau" = xyes && test -n "$6"; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $6" fi + if test "x$enable_omx" = xyes && test "x$7" != x; then + GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $7" + fi } gallium_require_llvm() { @@ -1898,13 +1905,6 @@ radeon_llvm_check() { [AC_MSG_ERROR([$1 requires libelf when using LLVM])]) } -dnl Gallium drivers -if test "x$enable_dri" = xyes -o "x$enable_xa" = xyes -o \ - "x$enable_xvmc" = xyes -o "x$enable_vdpau" = xyes; then - NEED_NONNULL_WINSYS=yes -fi -AM_CONDITIONAL(NEED_NONNULL_WINSYS, test "x$NEED_NONNULL_WINSYS" = xyes) - dnl Duplicates in GALLIUM_DRIVERS_DIRS are removed by sorting it after this block if test -n "$with_gallium_drivers"; then gallium_drivers=`IFS=', '; echo $with_gallium_drivers` @@ -1914,21 +1914,21 @@ if test -n "$with_gallium_drivers"; then HAVE_GALLIUM_SVGA=yes GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS svga softpipe" gallium_require_drm_loader - gallium_check_st "svga/drm" "dri/vmwgfx" "xa/vmwgfx" + gallium_check_st "svga" "svga/drm" "dri/vmwgfx" "xa/vmwgfx" ;; xi915) HAVE_GALLIUM_I915=yes PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED]) gallium_require_drm_loader GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915" - gallium_check_st "i915/drm" "dri/i915" "xa/i915" + gallium_check_st "Gallium i915" "i915/drm" "dri/i915" "xa/i915" ;; xilo) HAVE_GALLIUM_ILO=yes PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED]) gallium_require_drm_loader GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS ilo" - gallium_check_st "intel/drm" "dri/ilo" "xa/ilo" + gallium_check_st "Gallium i965/ilo" "intel/drm" "dri/ilo" "xa/ilo" ;; xr300) HAVE_GALLIUM_R300=yes @@ -1936,7 +1936,7 @@ if test -n "$with_gallium_drivers"; then gallium_require_drm_loader gallium_require_llvm "Gallium R300" GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300" - gallium_check_st "radeon/drm" "dri/r300" + gallium_check_st "Gallium R300" "radeon/drm" "dri/r300" ;; xr600) HAVE_GALLIUM_R600=yes @@ -1953,7 +1953,7 @@ if test -n "$with_gallium_drivers"; then if test "x$enable_opencl" = xyes; then LLVM_COMPONENTS="${LLVM_COMPONENTS} bitreader asmparser" fi - gallium_check_st "radeon/drm" "dri/r600" "" "xvmc/r600" "vdpau/r600" "omx/r600" + gallium_check_st "Gallium R600" "radeon/drm" "dri/r600" "" "xvmc/r600" "vdpau/r600" "omx/r600" ;; xradeonsi) HAVE_GALLIUM_RADEONSI=yes @@ -1962,21 +1962,21 @@ if test -n "$with_gallium_drivers"; then GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS radeonsi" radeon_llvm_check "radeonsi" require_egl_drm "radeonsi" - gallium_check_st "radeon/drm" "dri/radeonsi" "" "" "vdpau/radeonsi" "omx/radeonsi" + gallium_check_st "radeonsi" "radeon/drm" "dri/radeonsi" "" "" "vdpau/radeonsi" "omx/radeonsi" ;; xnouveau) HAVE_GALLIUM_NOUVEAU=yes PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED]) gallium_require_drm_loader GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau" - gallium_check_st "nouveau/drm" "dri/nouveau" "xa/nouveau" "xvmc/nouveau" "vdpau/nouveau" "omx/nouveau" + gallium_check_st "nouveau" "nouveau/drm" "dri/nouveau" "xa/nouveau" "xvmc/nouveau" "vdpau/nouveau" "omx/nouveau" ;; xfreedreno) HAVE_GALLIUM_FREEDRENO=yes PKG_CHECK_MODULES([FREEDRENO], [libdrm_freedreno >= $LIBDRM_FREEDRENO_REQUIRED]) gallium_require_drm_loader GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS freedreno" - gallium_check_st "freedreno/drm" "dri/freedreno" "xa/freedreno" "" "" + gallium_check_st "freedreno" "freedreno/drm" "dri/freedreno" "xa/freedreno" "" "" ;; xswrast) HAVE_GALLIUM_SOFTPIPE=yes @@ -1991,6 +1991,7 @@ if test -n "$with_gallium_drivers"; then fi if test "x$have_libdrm" = xyes; then + GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/kms-dri" GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri/kms-swrast" fi ;; @@ -1998,7 +1999,7 @@ if test -n "$with_gallium_drivers"; then HAVE_GALLIUM_VC4=yes gallium_require_drm_loader GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS vc4" - gallium_check_st "vc4/drm" "dri-vc4" "" "" "" + gallium_check_st "vc4" "vc4/drm" "dri-vc4" "" "" "" case "$host_cpu" in i?86 | x86_64 | amd64) @@ -2074,9 +2075,7 @@ AM_CONDITIONAL(NEED_GALLIUM_SOFTPIPE_DRIVER, test "x$HAVE_GALLIUM_SVGA" = xyes - AM_CONDITIONAL(NEED_GALLIUM_LLVMPIPE_DRIVER, test "x$HAVE_GALLIUM_SOFTPIPE" = xyes \ && test "x$MESA_LLVM" = x1) -# Enable static gallium targets for now. -# Do not touch this unless you know what you are doing. -AM_CONDITIONAL(HAVE_GALLIUM_STATIC_TARGETS, test "xyes" = xyes) +AM_CONDITIONAL(HAVE_GALLIUM_STATIC_TARGETS, test "x$enable_shared_pipe_drivers" = xno) # NOTE: anything using xcb or other client side libs ends up in separate # _CLIENT variables. The pipe loader is built in two variants, @@ -2120,12 +2119,9 @@ AM_CONDITIONAL(HAVE_R200_DRI, test x$HAVE_R200_DRI = xyes) AM_CONDITIONAL(HAVE_RADEON_DRI, test x$HAVE_RADEON_DRI = xyes) AM_CONDITIONAL(HAVE_SWRAST_DRI, test x$HAVE_SWRAST_DRI = xyes) -AM_CONDITIONAL(NEED_RADEON_DRM_WINSYS, test "x$NEED_NONNULL_WINSYS" = xyes -a \ - "x$HAVE_GALLIUM_R300" = xyes -o \ +AM_CONDITIONAL(NEED_RADEON_DRM_WINSYS, test "x$HAVE_GALLIUM_R300" = xyes -o \ "x$HAVE_GALLIUM_R600" = xyes -o \ "x$HAVE_GALLIUM_RADEONSI" = xyes) -AM_CONDITIONAL(NEED_WINSYS_WRAPPER, test "x$HAVE_GALLIUM_I915" = xyes -o \ - "x$HAVE_GALLIUM_SVGA" = xyes) AM_CONDITIONAL(NEED_WINSYS_XLIB, test "x$NEED_WINSYS_XLIB" = xyes) AM_CONDITIONAL(NEED_RADEON_LLVM, test x$NEED_RADEON_LLVM = xyes) AM_CONDITIONAL(USE_R600_LLVM_COMPILER, test x$USE_R600_LLVM_COMPILER = xyes) diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt index f5d5e72c9..5adc7598c 100644 --- a/mesalib/docs/GL3.txt +++ b/mesalib/docs/GL3.txt @@ -138,7 +138,7 @@ GL 4.2, GLSL 4.20: GL_ARB_shader_atomic_counters DONE (i965) GL_ARB_texture_storage DONE (all drivers) GL_ARB_transform_feedback_instanced DONE (i965, nv50, nvc0, r600, radeonsi) - GL_ARB_base_instance DONE (i965, nv50, nvc0, r600, radeonsi) + GL_ARB_base_instance DONE (i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe) GL_ARB_shader_image_load_store in progress (curro) GL_ARB_conservative_depth DONE (all drivers that support GLSL 1.30) GL_ARB_shading_language_420pack DONE (all drivers that support GLSL 1.30) @@ -168,7 +168,7 @@ GL 4.3, GLSL 4.30: GL_ARB_texture_buffer_range DONE (nv50, nvc0, i965, r600, radeonsi, llvmpipe) GL_ARB_texture_query_levels DONE (all drivers that support GLSL 1.30) GL_ARB_texture_storage_multisample DONE (all drivers that support GL_ARB_texture_multisample) - GL_ARB_texture_view DONE (i965) + GL_ARB_texture_view DONE (i965, nv50, nvc0) GL_ARB_vertex_attrib_binding DONE (all drivers) diff --git a/mesalib/docs/index.html b/mesalib/docs/index.html index 5d18dd25c..98162bbe9 100644 --- a/mesalib/docs/index.html +++ b/mesalib/docs/index.html @@ -16,6 +16,17 @@

News

+

September 19, 2014

+

+Mesa 10.3 is released. This is a new +development release. See the release notes for more information about +the release. +

+

+Also, Mesa 10.2.8 is released. +This is a bug fix release from the 10.2 branch. +

+

September 6, 2014

Mesa 10.2.7 is released. diff --git a/mesalib/docs/relnotes.html b/mesalib/docs/relnotes.html index 36bcd139b..0a4c3de1d 100644 --- a/mesalib/docs/relnotes.html +++ b/mesalib/docs/relnotes.html @@ -21,6 +21,8 @@ The release notes summarize what's new or changed in each Mesa release.