docs: add release notes for 17.1.2

Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Update version to 17.1.2
2017-06-05 20:27:24 +00:00 · 2017-06-05 20:15:30 +00:00 · 2017-06-03 20:37:13 +02:00 · 2017-06-03 20:37:13 +02:00 · 2017-06-02 23:04:01 +02:00 · 2017-06-02 23:04:01 +02:00
5341 changed files with 307492 additions and 1101410 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,7 +11,6 @@ tab_width = 8
 [*.{c,h,cpp,hpp,cc,hh}]
 indent_style = space
 indent_size = 3
-max_line_length = 78

 [{Makefile*,*.mk}]
 indent_style = tab
@@ -34,7 +33,3 @@ indent_size = 2

 [*.patch]
 trim_trailing_whitespace = false
-
-[{meson.build,meson_options.txt}]
-indent_style = space
-indent_size = 2
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,52 @@
+*.a
+*.dll
+*.exe
+*.ilk
+*.la
+*.lo
+*.log
+*.o
+*.obj
+*.os
+*.pc
+*.pdb
 *.pyc
 *.pyo
-*.out
+*.so
+*.so.*
+*.sw[a-z]
+*.tar
+*.tar.bz2
+*.tar.gz
+*.tar.xz
+*.trs
+*.zip
+*~
+depend
+depend.bak
+bin/ltmain.sh
+lib
+lib64
+configure
+configure.lineno
+autom4te.cache
+aclocal.m4
+config.log
+config.status
+cscope*
+tags
+.scon*
+config.py
 build
+libtool
+manifest.txt
+.dir-locals.el
+.deps/
+.dirstamp
+.libs/
+Makefile
+Makefile.in
+.install-mesa-links
+.install-gallium-links
+/src/git_sha1.h
+TAGS
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,382 +0,0 @@
-# This is the tag of the docker image used for the build jobs. If the
-# image doesn't exist yet, the containers-build stage generates it.
-#
-# In order to generate a new image, one should generally change the tag.
-# While removing the image from the registry would also work, that's not
-# recommended except for ephemeral images during development: Replacing
-# an image after a significant amount of time might pull in newer
-# versions of gcc/clang or other packages, which might break the build
-# with older commits using the same tag.
-#
-# After merging a change resulting in generating a new image to the
-# main repository, it's recommended to remove the image from the source
-# repository's container registry, so that the image from the main
-# repository's registry will be used there as well.
-variables:
-  UPSTREAM_REPO: mesa/mesa
-  DEBIAN_TAG: "2019-08-09"
-  DEBIAN_VERSION: stretch-slim
-  DEBIAN_IMAGE: "$CI_REGISTRY_IMAGE/debian/$DEBIAN_VERSION:$DEBIAN_TAG"
-
-include:
-  - project: 'wayland/ci-templates'
-    ref: c73dae8b84697ef18e2dbbf4fed7386d9652b0cd
-    file: '/templates/debian.yml'
-
-stages:
-  - containers-build
-  - build+test
-  - test
-
-
-# When to automatically run the CI
-.ci-run-policy: &ci-run-policy
-  only:
-    - branches@mesa/mesa
-    - merge_requests
-    - /^ci([-/].*)?$/
-  retry:
-    max: 2
-    when:
-      - runner_system_failure
-
-.ci-deqp-artifacts: &ci-deqp-artifacts
-  artifacts:
-    when: always
-    untracked: false
-    paths:
-      # Watch out!  Artifacts are relative to the build dir.
-      # https://gitlab.com/gitlab-org/gitlab-ce/commit/8788fb925706cad594adf6917a6c5f6587dd1521
-      - artifacts
-
-# CONTAINERS
-
-debian:
-  extends: .debian@container-ifnot-exists
-  stage: containers-build
-  <<: *ci-run-policy
-  variables:
-    GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
-    DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh'
-
-
-# BUILD
-
-.build:
-  <<: *ci-run-policy
-  image: $DEBIAN_IMAGE
-  stage: build+test
-  cache:
-    paths:
-      - ccache
-  artifacts:
-    when: always
-    paths:
-      - _build/meson-logs/*.txt
-      # scons:
-      - build/*/config.log
-      - shader-db
-  variables:
-    CCACHE_COMPILERCHECK: "content"
-  # Use ccache transparently, and print stats before/after
-  before_script:
-    - export PATH="/usr/lib/ccache:$PATH"
-    - export CCACHE_BASEDIR="$PWD"
-    - export CCACHE_DIR="$PWD/ccache"
-    - ccache --zero-stats || true
-    - ccache --show-stats || true
-  after_script:
-    # In case the install dir is being saved as artifacts, tar it up
-    # so that symlinks and hardlinks aren't each packed separately in
-    # the zip file.
-    - if [ -d install ]; then
-        tar -cf artifacts/install.tar install;
-      fi
-    - export CCACHE_DIR="$PWD/ccache"
-    - ccache --show-stats
-
-.meson-build:
-  extends: .build
-  script:
-    - .gitlab-ci/meson-build.sh
-
-.scons-build:
-  extends: .build
-  variables:
-    SCONSFLAGS: "-j4"
-  script:
-    - if test -n "$LLVM_VERSION"; then
-        export LLVM_CONFIG="llvm-config-${LLVM_VERSION}";
-      fi
-    - scons $SCONS_TARGET
-    - eval $SCONS_CHECK_COMMAND
-
-# NOTE: Building SWR is 2x (yes two) times slower than all the other
-# gallium drivers combined.
-# Start this early so that it doesn't limit the total run time.
-#
-# We also stick the glvnd build here, since we want non-glvnd in
-# meson-main for actual driver CI.
-meson-swr-glvnd:
-  extends: .meson-build
-  variables:
-    UNWIND: "true"
-    DRI_LOADERS: >
-      -D glvnd=true
-      -D egl=true
-    GALLIUM_ST: >
-      -D dri3=true
-      -D gallium-vdpau=false
-      -D gallium-xvmc=false
-      -D gallium-omx=disabled
-      -D gallium-va=false
-      -D gallium-xa=false
-      -D gallium-nine=false
-      -D gallium-opencl=disabled
-    GALLIUM_DRIVERS: "swr,iris"
-    LLVM_VERSION: "6.0"
-
-meson-clang:
-  extends: .meson-build
-  variables:
-    UNWIND: "true"
-    DRI_DRIVERS: "auto"
-    GALLIUM_DRIVERS: "auto"
-    VULKAN_DRIVERS: intel,amd,freedreno
-    CC: "ccache clang-8"
-    CXX: "ccache clang++-8"
-  before_script:
-    - export CCACHE_BASEDIR="$PWD" CCACHE_DIR="$PWD/ccache"
-    - ccache --zero-stats --show-stats || true
-     # clang++ breaks if it picks up the GCC 8 directory without libstdc++.so
-    - apt-get remove -y libgcc-8-dev
-
-scons-swr:
-  extends: .scons-build
-  variables:
-    SCONS_TARGET: "swr=1"
-    SCONS_CHECK_COMMAND: "true"
-    LLVM_VERSION: "6.0"
-
-scons-win64:
-  extends: .scons-build
-  variables:
-    SCONS_TARGET: platform=windows machine=x86_64
-    SCONS_CHECK_COMMAND: "true"
-
-meson-main:
-  extends: .meson-build
-  variables:
-    UNWIND: "true"
-    DRI_LOADERS: >
-      -D glx=dri
-      -D gbm=true
-      -D egl=true
-      -D platforms=x11,wayland,drm,surfaceless
-    DRI_DRIVERS: "i915,i965,r100,r200,nouveau"
-    GALLIUM_ST: >
-      -D dri3=true
-      -D gallium-extra-hud=true
-      -D gallium-vdpau=true
-      -D gallium-xvmc=true
-      -D gallium-omx=bellagio
-      -D gallium-va=true
-      -D gallium-xa=true
-      -D gallium-nine=true
-      -D gallium-opencl=disabled
-    GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima"
-    LLVM_VERSION: "7"
-    EXTRA_OPTION: >
-      -D osmesa=gallium
-      -D tools=all
-    MESON_SHADERDB: "true"
-    BUILDTYPE: "debugoptimized"
-  <<: *ci-deqp-artifacts
-
-meson-clover:
-  extends: .meson-build
-  variables:
-    UNWIND: "true"
-    DRI_LOADERS: >
-      -D glx=disabled
-      -D egl=false
-      -D gbm=false
-    GALLIUM_ST: >
-      -D dri3=false
-      -D gallium-vdpau=false
-      -D gallium-xvmc=false
-      -D gallium-omx=disabled
-      -D gallium-va=false
-      -D gallium-xa=false
-      -D gallium-nine=false
-      -D gallium-opencl=icd
-  script:
-    - export GALLIUM_DRIVERS="r600,radeonsi"
-    - .gitlab-ci/meson-build.sh
-    - LLVM_VERSION=7 .gitlab-ci/meson-build.sh
-    - export GALLIUM_DRIVERS="i915,r600"
-    - LLVM_VERSION=3.9 .gitlab-ci/meson-build.sh
-    - LLVM_VERSION=4.0 .gitlab-ci/meson-build.sh
-    - LLVM_VERSION=5.0 .gitlab-ci/meson-build.sh
-    - LLVM_VERSION=6.0 .gitlab-ci/meson-build.sh
-
-meson-vulkan:
-  extends: .meson-build
-  variables:
-    UNWIND: "false"
-    DRI_LOADERS: >
-      -D glx=disabled
-      -D gbm=false
-      -D egl=false
-      -D platforms=x11,wayland,drm
-      -D osmesa=none
-    GALLIUM_ST: >
-      -D dri3=true
-      -D gallium-vdpau=false
-      -D gallium-xvmc=false
-      -D gallium-omx=disabled
-      -D gallium-va=false
-      -D gallium-xa=false
-      -D gallium-nine=false
-      -D gallium-opencl=disabled
-    VULKAN_DRIVERS: intel,amd,freedreno
-    LLVM_VERSION: "7"
-    EXTRA_OPTION: >
-      -D vulkan-overlay-layer=true
-
-.meson-cross:
-  extends: .meson-build
-  variables:
-    UNWIND: "false"
-    DRI_LOADERS: >
-      -D glx=disabled
-      -D gbm=false
-      -D egl=false
-      -D platforms=surfaceless
-      -D osmesa=none
-    GALLIUM_ST: >
-      -D dri3=false
-      -D gallium-vdpau=false
-      -D gallium-xvmc=false
-      -D gallium-omx=disabled
-      -D gallium-va=false
-      -D gallium-xa=false
-      -D gallium-nine=false
-      -D llvm=false
-  <<: *ci-deqp-artifacts
-  script:
-    - .gitlab-ci/meson-build.sh
-
-meson-armhf:
-  extends: .meson-cross
-  variables:
-    CROSS: armhf
-    VULKAN_DRIVERS: freedreno
-    GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,tegra,v3d,vc4"
-    # Disable the tests since we're cross compiling.
-    EXTRA_OPTION: >
-      -D build-tests=false
-      -D I-love-half-baked-turnips=true
-      -D vulkan-overlay-layer=true
-
-meson-arm64:
-  extends: .meson-cross
-  variables:
-    CROSS: arm64
-    VULKAN_DRIVERS: freedreno
-    GALLIUM_DRIVERS: "etnaviv,freedreno,kmsro,lima,nouveau,panfrost,tegra,v3d,vc4"
-    # Disable the tests since we're cross compiling.
-    EXTRA_OPTION: >
-      -D build-tests=false
-      -D I-love-half-baked-turnips=true
-      -D vulkan-overlay-layer=true
-
-# While the main point of this build is testing the i386 cross build,
-# we also use this one to test some other options that are exclusive
-# with meson-main's choices (classic swrast and osmesa)
-meson-i386:
-  extends: .meson-cross
-  variables:
-    CROSS: i386
-    VULKAN_DRIVERS: intel
-    DRI_DRIVERS: "swrast"
-    GALLIUM_DRIVERS: "iris"
-    # Disable i386 tests, because u_format_tests gets precision
-    # failures in dxtn unpacking
-    EXTRA_OPTION: >
-      -D build-tests=false
-      -D vulkan-overlay-layer=true
-      -D llvm=false
-      -D osmesa=classic
-
-scons-nollvm:
-  extends: .scons-build
-  variables:
-    SCONS_TARGET: "llvm=0"
-    SCONS_CHECK_COMMAND: "scons llvm=0 check"
-
-scons-llvm:
-  extends: .scons-build
-  variables:
-    SCONS_TARGET: "llvm=1"
-    SCONS_CHECK_COMMAND: "scons llvm=1 check"
-    LLVM_VERSION: "3.4"
-    # LLVM 3.4 packages were built with an old libstdc++ ABI
-    CXX: "g++ -D_GLIBCXX_USE_CXX11_ABI=0"
-
-.deqp-test:
-  <<: *ci-run-policy
-  stage: test
-  image: $DEBIAN_IMAGE
-  variables:
-    GIT_STRATEGY: none # testing doesn't build anything from source
-    DEQP_SKIPS: deqp-default-skips.txt
-  script:
-    # Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY
-    - rm -rf install
-    - tar -xf artifacts/install.tar
-    - ./artifacts/deqp-runner.sh
-  artifacts:
-    when: on_failure
-    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
-    paths:
-      - results/
-
-test-llvmpipe-gles2:
-  parallel: 4
-  variables:
-    DEQP_VER: gles2
-    DEQP_EXPECTED_FAILS: deqp-llvmpipe-fails.txt
-    LIBGL_ALWAYS_SOFTWARE: "true"
-    DEQP_RENDERER_MATCH: "llvmpipe"
-  extends: .deqp-test
-  dependencies:
-    - meson-main
-
-test-softpipe-gles2:
-  parallel: 4
-  variables:
-    DEQP_VER: gles2
-    DEQP_EXPECTED_FAILS: deqp-softpipe-fails.txt
-    LIBGL_ALWAYS_SOFTWARE: "true"
-    DEQP_RENDERER_MATCH: "softpipe"
-    GALLIUM_DRIVER: "softpipe"
-  extends: .deqp-test
-  dependencies:
-    - meson-main
-
-# The GLES2 CTS run takes about 8 minutes of CPU time, while GLES3 is
-# 25 minutes.  Until we can get its runtime down, just do a partial
-# (every 10 tests) run.
-test-softpipe-gles3-limited:
-  variables:
-    DEQP_VER: gles3
-    DEQP_EXPECTED_FAILS: deqp-softpipe-fails.txt
-    LIBGL_ALWAYS_SOFTWARE: "true"
-    DEQP_RENDERER_MATCH: "softpipe"
-    GALLIUM_DRIVER: "softpipe"
-    CI_NODE_INDEX: 1
-    CI_NODE_TOTAL: 10
-  extends: .deqp-test
-  dependencies:
-    - meson-main
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -1,285 +0,0 @@
-#!/bin/bash
-
-set -e
-set -o xtrace
-
-export DEBIAN_FRONTEND=noninteractive
-
-CROSS_ARCHITECTURES="armhf arm64 i386"
-for arch in $CROSS_ARCHITECTURES; do
-    dpkg --add-architecture $arch
-done
-
-apt-get install -y \
-      apt-transport-https \
-      ca-certificates \
-      curl \
-      wget \
-      unzip \
-      gnupg
-
-curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
-echo "deb [trusted=yes] https://apt.llvm.org/stretch/ llvm-toolchain-stretch-7 main" >/etc/apt/sources.list.d/llvm7.list
-echo "deb [trusted=yes] https://apt.llvm.org/stretch/ llvm-toolchain-stretch-8 main" >/etc/apt/sources.list.d/llvm8.list
-
-sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
-echo 'deb https://deb.debian.org/debian stretch-backports main' >/etc/apt/sources.list.d/backports.list
-echo 'deb https://deb.debian.org/debian jessie main' >/etc/apt/sources.list.d/jessie.list
-
-apt-get update
-apt-get install -y -t stretch-backports \
-      llvm-3.4-dev \
-      llvm-3.9-dev \
-      libclang-3.9-dev \
-      llvm-4.0-dev \
-      libclang-4.0-dev \
-      llvm-5.0-dev \
-      libclang-5.0-dev \
-      llvm-6.0-dev \
-      libclang-6.0-dev \
-      llvm-7-dev \
-      libclang-7-dev \
-      llvm-8-dev \
-      libclang-8-dev \
-      g++ \
-      clang-8
-
-# Install remaining packages from Debian buster to get newer versions
-echo "deb https://deb.debian.org/debian/ buster main" >/etc/apt/sources.list.d/buster.list
-echo "deb https://deb.debian.org/debian/ buster-updates main" >/etc/apt/sources.list.d/buster-updates.list
-apt-get update
-apt-get install -y \
-      git \
-      bzip2 \
-      zlib1g-dev \
-      pkg-config \
-      libxrender-dev \
-      libxdamage-dev \
-      libxxf86vm-dev \
-      gcc \
-      git \
-      libepoxy-dev \
-      libegl1-mesa-dev \
-      libgbm-dev \
-      libclc-dev \
-      libxvmc-dev \
-      libomxil-bellagio-dev \
-      xz-utils \
-      libexpat1-dev \
-      libx11-xcb-dev \
-      libelf-dev \
-      libunwind-dev \
-      libglvnd-dev \
-      libgtk-3-dev \
-      libpng-dev \
-      libgbm-dev \
-      libgles2-mesa-dev \
-      python-mako \
-      python3-mako \
-      bison \
-      flex \
-      gettext \
-      cmake \
-      meson \
-      scons
-
-# Cross-build Mesa deps
-for arch in $CROSS_ARCHITECTURES; do
-    apt-get install -y \
-            libdrm-dev:${arch} \
-            libexpat1-dev:${arch} \
-            libelf-dev:${arch}
-done
-apt-get install -y \
-        dpkg-dev \
-        gcc-aarch64-linux-gnu \
-        g++-aarch64-linux-gnu \
-        gcc-arm-linux-gnueabihf \
-        g++-arm-linux-gnueabihf \
-        gcc-i686-linux-gnu \
-        g++-i686-linux-gnu
-
-# for 64bit windows cross-builds
-apt-get install -y mingw-w64
-
-# for the vulkan overlay layer
-wget https://github.com/KhronosGroup/glslang/releases/download/master-tot/glslang-master-linux-Release.zip
-unzip glslang-master-linux-Release.zip bin/glslangValidator
-install -m755 bin/glslangValidator /usr/local/bin/
-rm bin/glslangValidator glslang-master-linux-Release.zip
-
-
-# dependencies where we want a specific version
-export              XORG_RELEASES=https://xorg.freedesktop.org/releases/individual
-export               XCB_RELEASES=https://xcb.freedesktop.org/dist
-export           WAYLAND_RELEASES=https://wayland.freedesktop.org/releases
-
-export         XORGMACROS_VERSION=util-macros-1.19.0
-export            GLPROTO_VERSION=glproto-1.4.17
-export          DRI2PROTO_VERSION=dri2proto-2.8
-export       LIBPCIACCESS_VERSION=libpciaccess-0.13.4
-export             LIBDRM_VERSION=libdrm-2.4.99
-export           XCBPROTO_VERSION=xcb-proto-1.13
-export         RANDRPROTO_VERSION=randrproto-1.5.0
-export          LIBXRANDR_VERSION=libXrandr-1.5.0
-export             LIBXCB_VERSION=libxcb-1.13
-export       LIBXSHMFENCE_VERSION=libxshmfence-1.3
-export           LIBVDPAU_VERSION=libvdpau-1.1
-export              LIBVA_VERSION=libva-1.7.0
-export         LIBWAYLAND_VERSION=wayland-1.15.0
-export  WAYLAND_PROTOCOLS_VERSION=wayland-protocols-1.12
-
-wget $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2
-tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
-cd $XORGMACROS_VERSION; ./configure; make install; cd ..
-rm -rf $XORGMACROS_VERSION
-
-wget $XORG_RELEASES/proto/$GLPROTO_VERSION.tar.bz2
-tar -xvf $GLPROTO_VERSION.tar.bz2 && rm $GLPROTO_VERSION.tar.bz2
-cd $GLPROTO_VERSION; ./configure; make install; cd ..
-rm -rf $GLPROTO_VERSION
-
-wget $XORG_RELEASES/proto/$DRI2PROTO_VERSION.tar.bz2
-tar -xvf $DRI2PROTO_VERSION.tar.bz2 && rm $DRI2PROTO_VERSION.tar.bz2
-cd $DRI2PROTO_VERSION; ./configure; make install; cd ..
-rm -rf $DRI2PROTO_VERSION
-
-wget $XCB_RELEASES/$XCBPROTO_VERSION.tar.bz2
-tar -xvf $XCBPROTO_VERSION.tar.bz2 && rm $XCBPROTO_VERSION.tar.bz2
-cd $XCBPROTO_VERSION; ./configure; make install; cd ..
-rm -rf $XCBPROTO_VERSION
-
-wget $XCB_RELEASES/$LIBXCB_VERSION.tar.bz2
-tar -xvf $LIBXCB_VERSION.tar.bz2 && rm $LIBXCB_VERSION.tar.bz2
-cd $LIBXCB_VERSION; ./configure; make install; cd ..
-rm -rf $LIBXCB_VERSION
-
-wget $XORG_RELEASES/lib/$LIBPCIACCESS_VERSION.tar.bz2
-tar -xvf $LIBPCIACCESS_VERSION.tar.bz2 && rm $LIBPCIACCESS_VERSION.tar.bz2
-cd $LIBPCIACCESS_VERSION; ./configure; make install; cd ..
-rm -rf $LIBPCIACCESS_VERSION
-
-wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.bz2
-tar -xvf $LIBDRM_VERSION.tar.bz2 && rm $LIBDRM_VERSION.tar.bz2
-cd $LIBDRM_VERSION; ./configure --enable-vc4 --enable-freedreno --enable-etnaviv-experimental-api; make install; cd ..
-rm -rf $LIBDRM_VERSION
-
-wget $XORG_RELEASES/proto/$RANDRPROTO_VERSION.tar.bz2
-tar -xvf $RANDRPROTO_VERSION.tar.bz2 && rm $RANDRPROTO_VERSION.tar.bz2
-cd $RANDRPROTO_VERSION; ./configure; make install; cd ..
-rm -rf $RANDRPROTO_VERSION
-
-wget $XORG_RELEASES/lib/$LIBXRANDR_VERSION.tar.bz2
-tar -xvf $LIBXRANDR_VERSION.tar.bz2 && rm $LIBXRANDR_VERSION.tar.bz2
-cd $LIBXRANDR_VERSION; ./configure; make install; cd ..
-rm -rf $LIBXRANDR_VERSION
-
-wget $XORG_RELEASES/lib/$LIBXSHMFENCE_VERSION.tar.bz2
-tar -xvf $LIBXSHMFENCE_VERSION.tar.bz2 && rm $LIBXSHMFENCE_VERSION.tar.bz2
-cd $LIBXSHMFENCE_VERSION; ./configure; make install; cd ..
-rm -rf $LIBXSHMFENCE_VERSION
-
-wget https://people.freedesktop.org/~aplattner/vdpau/$LIBVDPAU_VERSION.tar.bz2
-tar -xvf $LIBVDPAU_VERSION.tar.bz2 && rm $LIBVDPAU_VERSION.tar.bz2
-cd $LIBVDPAU_VERSION; ./configure; make install; cd ..
-rm -rf $LIBVDPAU_VERSION
-
-wget https://www.freedesktop.org/software/vaapi/releases/libva/$LIBVA_VERSION.tar.bz2
-tar -xvf $LIBVA_VERSION.tar.bz2 && rm $LIBVA_VERSION.tar.bz2
-cd $LIBVA_VERSION; ./configure --disable-wayland --disable-dummy-driver; make install; cd ..
-rm -rf $LIBVA_VERSION
-
-wget $WAYLAND_RELEASES/$LIBWAYLAND_VERSION.tar.xz
-tar -xvf $LIBWAYLAND_VERSION.tar.xz && rm $LIBWAYLAND_VERSION.tar.xz
-cd $LIBWAYLAND_VERSION; ./configure --enable-libraries --without-host-scanner --disable-documentation --disable-dtd-validation; make install; cd ..
-rm -rf $LIBWAYLAND_VERSION
-
-wget $WAYLAND_RELEASES/$WAYLAND_PROTOCOLS_VERSION.tar.xz
-tar -xvf $WAYLAND_PROTOCOLS_VERSION.tar.xz && rm $WAYLAND_PROTOCOLS_VERSION.tar.xz
-cd $WAYLAND_PROTOCOLS_VERSION; ./configure; make install; cd ..
-rm -rf $WAYLAND_PROTOCOLS_VERSION
-
-pushd /usr/local
-git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
-rm -rf shader-db/.git
-cd shader-db
-make
-popd
-
-# Use ccache to speed up builds
-apt-get install -y ccache
-
-# We need xmllint to validate the XML files in Mesa
-apt-get install -y libxml2-utils
-
-
-# Generate cross build files for Meson
-for arch in $CROSS_ARCHITECTURES; do
-  cross_file="/cross_file-$arch.txt"
-  /usr/share/meson/debcrossgen --arch "$arch" -o "$cross_file"
-  # Work around a bug in debcrossgen that should be fixed in the next release
-  if [ "$arch" = "i386" ]; then
-    sed -i "s|cpu_family = 'i686'|cpu_family = 'x86'|g" "$cross_file"
-  fi
-done
-
-
-############### Build dEQP
-git config --global user.email "mesa@example.com"
-git config --global user.name "Mesa CI"
-# XXX: Use --depth 1 once we can drop the cherry-picks.
-git clone \
-    https://github.com/KhronosGroup/VK-GL-CTS.git \
-    -b opengl-es-cts-3.2.5.1 \
-    /VK-GL-CTS
-cd /VK-GL-CTS
-# Fix surfaceless build
-git cherry-pick -x 22f41e5e321c6dcd8569c4dad91bce89f06b3670
-git cherry-pick -x 1daa8dff73161ea60ead965bd6c9f2a0a2165648
-
-# surfaceless links against libkms and such despite not using it.
-sed -i '/gbm/d' targets/surfaceless/surfaceless.cmake
-sed -i '/libkms/d' targets/surfaceless/surfaceless.cmake
-sed -i '/libgbm/d' targets/surfaceless/surfaceless.cmake
-
-python3 external/fetch_sources.py
-
-mkdir -p /deqp
-cd /deqp
-cmake -G Ninja \
-      -DDEQP_TARGET=surfaceless               \
-      -DCMAKE_BUILD_TYPE=Release              \
-      /VK-GL-CTS
-ninja
-
-# Copy out the mustpass lists we want from a bunch of other junk.
-mkdir /deqp/mustpass
-for gles in gles2 gles3 gles31; do
-    cp \
-        /deqp/external/openglcts/modules/gl_cts/data/mustpass/gles/aosp_mustpass/3.2.5.x/$gles-master.txt \
-        /deqp/mustpass/$gles-master.txt
-done
-
-# Remove the rest of the build products that we don't need.
-rm -rf /deqp/external
-rm -rf /deqp/modules/internal
-rm -rf /deqp/executor
-rm -rf /deqp/execserver
-rm -rf /deqp/modules/egl
-rm -rf /deqp/framework
-du -sh *
-rm -rf /VK-GL-CTS
-
-############### Uninstall the build software
-
-apt-get purge -y \
-      git \
-      curl \
-      unzip \
-      gnupg \
-      cmake \
-      git \
-      libgles2-mesa-dev \
-      libgbm-dev
-
-apt-get autoremove -y --purge
--- a/.gitlab-ci/deqp-default-skips.txt
+++ b/.gitlab-ci/deqp-default-skips.txt
@@ -1,10 +0,0 @@
-# Note: skips lists for CI are just a list of lines that, when
-# non-zero-length and not starting with '#', will regex match to
-# delete lines from the test list.  Be careful.
-
-# Skip the perf/stress tests to keep runtime manageable
-dEQP-GLES[0-9]*.performance
-dEQP-GLES[0-9]*.stress
-
-# These are really slow on tiling architectures (including llvmpipe).
-dEQP-GLES[0-9]*.functional.flush_finish
--- a/.gitlab-ci/deqp-llvmpipe-fails.txt
+++ b/.gitlab-ci/deqp-llvmpipe-fails.txt
@@ -1,124 +0,0 @@
-dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_center
-dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_corner
-dEQP-GLES2.functional.clipping.point.wide_point_clip
-dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_center
-dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_corner
-dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_neg_y_neg_z_and_neg_x_neg_y_pos_z
-dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_pos_y_pos_z_and_neg_x_neg_y_neg_z
-dEQP-GLES2.functional.fbo.render.color_clear.rbo_rgba4
-dEQP-GLES2.functional.fbo.render.color_clear.rbo_rgba4_depth_component16
-dEQP-GLES2.functional.fbo.render.color_clear.rbo_rgba4_stencil_index8
-dEQP-GLES2.functional.fbo.render.depth.rbo_rgba4_depth_component16
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_rbo_rgba4
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.no_rebind_rbo_rgba4_stencil_index8
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_rbo_rgba4
-dEQP-GLES2.functional.fbo.render.recreate_colorbuffer.rebind_rbo_rgba4_stencil_index8
-dEQP-GLES2.functional.fbo.render.recreate_depthbuffer.no_rebind_rbo_rgba4_depth_component16
-dEQP-GLES2.functional.fbo.render.recreate_depthbuffer.rebind_rbo_rgba4_depth_component16
-dEQP-GLES2.functional.fbo.render.recreate_stencilbuffer.no_rebind_rbo_rgba4_stencil_index8
-dEQP-GLES2.functional.fbo.render.recreate_stencilbuffer.rebind_rbo_rgba4_stencil_index8
-dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgba4
-dEQP-GLES2.functional.fbo.render.shared_colorbuffer.rbo_rgba4_depth_component16
-dEQP-GLES2.functional.fbo.render.shared_depthbuffer.rbo_rgba4_depth_component16
-dEQP-GLES2.functional.polygon_offset.default_displacement_with_units
-dEQP-GLES2.functional.polygon_offset.fixed16_displacement_with_units
-dEQP-GLES2.functional.rasterization.interpolation.basic.line_loop_wide
-dEQP-GLES2.functional.rasterization.interpolation.basic.line_strip_wide
-dEQP-GLES2.functional.rasterization.interpolation.basic.lines_wide
-dEQP-GLES2.functional.rasterization.interpolation.projected.line_loop_wide
-dEQP-GLES2.functional.rasterization.interpolation.projected.line_strip_wide
-dEQP-GLES2.functional.rasterization.interpolation.projected.lines_wide
-dEQP-GLES2.functional.rasterization.limits.points
-dEQP-GLES2.functional.shaders.texture_functions.fragment.texture2d_bias
-dEQP-GLES2.functional.shaders.texture_functions.fragment.texture2dproj_vec3_bias
-dEQP-GLES2.functional.shaders.texture_functions.fragment.texture2dproj_vec4_bias
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_linear_clamp_rgba8888
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_linear_mirror_etc1
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_linear_mirror_rgba8888
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_linear_repeat_etc1
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_linear_repeat_rgba8888
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_nearest_clamp_rgba8888
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_nearest_mirror_etc1
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_nearest_mirror_rgba8888
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_nearest_repeat_etc1
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_nearest_repeat_l8
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_nearest_repeat_rgb888
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_nearest_repeat_rgba4444
-dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_linear_nearest_repeat_rgba8888
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_linear_clamp_rgba8888
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_linear_mirror_etc1
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_linear_mirror_rgba8888
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_linear_repeat_etc1
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_linear_repeat_rgba8888
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_nearest_clamp_rgba8888
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_nearest_mirror_etc1
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_nearest_mirror_rgba8888
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_nearest_repeat_etc1
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_nearest_repeat_l8
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_nearest_repeat_rgb888
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_nearest_repeat_rgba4444
-dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_linear_nearest_repeat_rgba8888
-dEQP-GLES2.functional.texture.mipmap.2d.affine.linear_linear_repeat
-dEQP-GLES2.functional.texture.mipmap.2d.affine.nearest_linear_clamp
-dEQP-GLES2.functional.texture.mipmap.2d.affine.nearest_linear_mirror
-dEQP-GLES2.functional.texture.mipmap.2d.affine.nearest_linear_repeat
-dEQP-GLES2.functional.texture.mipmap.2d.basic.linear_linear_repeat
-dEQP-GLES2.functional.texture.mipmap.2d.basic.linear_linear_repeat_non_square
-dEQP-GLES2.functional.texture.mipmap.2d.basic.nearest_linear_clamp
-dEQP-GLES2.functional.texture.mipmap.2d.basic.nearest_linear_clamp_non_square
-dEQP-GLES2.functional.texture.mipmap.2d.basic.nearest_linear_mirror
-dEQP-GLES2.functional.texture.mipmap.2d.basic.nearest_linear_mirror_non_square
-dEQP-GLES2.functional.texture.mipmap.2d.basic.nearest_linear_repeat
-dEQP-GLES2.functional.texture.mipmap.2d.basic.nearest_linear_repeat_non_square
-dEQP-GLES2.functional.texture.mipmap.2d.projected.linear_linear_repeat
-dEQP-GLES2.functional.texture.mipmap.2d.projected.nearest_linear_clamp
-dEQP-GLES2.functional.texture.mipmap.2d.projected.nearest_linear_mirror
-dEQP-GLES2.functional.texture.mipmap.2d.projected.nearest_linear_repeat
-dEQP-GLES2.functional.texture.mipmap.cube.basic.linear_linear
-dEQP-GLES2.functional.texture.mipmap.cube.basic.linear_nearest
-dEQP-GLES2.functional.texture.mipmap.cube.bias.linear_linear
-dEQP-GLES2.functional.texture.mipmap.cube.bias.linear_nearest
-dEQP-GLES2.functional.texture.mipmap.cube.projected.linear_linear
-dEQP-GLES2.functional.texture.mipmap.cube.projected.linear_nearest
-dEQP-GLES2.functional.texture.vertex.2d.filtering.linear_mipmap_linear_linear_clamp
-dEQP-GLES2.functional.texture.vertex.2d.filtering.linear_mipmap_linear_linear_mirror
-dEQP-GLES2.functional.texture.vertex.2d.filtering.linear_mipmap_linear_linear_repeat
-dEQP-GLES2.functional.texture.vertex.2d.filtering.linear_mipmap_linear_nearest_clamp
-dEQP-GLES2.functional.texture.vertex.2d.filtering.linear_mipmap_linear_nearest_mirror
-dEQP-GLES2.functional.texture.vertex.2d.filtering.linear_mipmap_linear_nearest_repeat
-dEQP-GLES2.functional.texture.vertex.2d.filtering.nearest_mipmap_linear_linear_clamp
-dEQP-GLES2.functional.texture.vertex.2d.filtering.nearest_mipmap_linear_linear_mirror
-dEQP-GLES2.functional.texture.vertex.2d.filtering.nearest_mipmap_linear_linear_repeat
-dEQP-GLES2.functional.texture.vertex.2d.filtering.nearest_mipmap_linear_nearest_clamp
-dEQP-GLES2.functional.texture.vertex.2d.filtering.nearest_mipmap_linear_nearest_mirror
-dEQP-GLES2.functional.texture.vertex.2d.filtering.nearest_mipmap_linear_nearest_repeat
-dEQP-GLES2.functional.texture.vertex.2d.wrap.clamp_clamp
-dEQP-GLES2.functional.texture.vertex.2d.wrap.clamp_mirror
-dEQP-GLES2.functional.texture.vertex.2d.wrap.clamp_repeat
-dEQP-GLES2.functional.texture.vertex.2d.wrap.mirror_clamp
-dEQP-GLES2.functional.texture.vertex.2d.wrap.mirror_mirror
-dEQP-GLES2.functional.texture.vertex.2d.wrap.mirror_repeat
-dEQP-GLES2.functional.texture.vertex.2d.wrap.repeat_clamp
-dEQP-GLES2.functional.texture.vertex.2d.wrap.repeat_mirror
-dEQP-GLES2.functional.texture.vertex.2d.wrap.repeat_repeat
-dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_linear_clamp
-dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_linear_mirror
-dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_linear_repeat
-dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_nearest_clamp
-dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_nearest_mirror
-dEQP-GLES2.functional.texture.vertex.cube.filtering.linear_mipmap_linear_nearest_repeat
-dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_linear_clamp
-dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_linear_mirror
-dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_linear_repeat
-dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_nearest_clamp
-dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_nearest_mirror
-dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_nearest_repeat
-dEQP-GLES2.functional.texture.vertex.cube.wrap.clamp_clamp
-dEQP-GLES2.functional.texture.vertex.cube.wrap.clamp_mirror
-dEQP-GLES2.functional.texture.vertex.cube.wrap.clamp_repeat
-dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_clamp
-dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_mirror
-dEQP-GLES2.functional.texture.vertex.cube.wrap.mirror_repeat
-dEQP-GLES2.functional.texture.vertex.cube.wrap.repeat_clamp
-dEQP-GLES2.functional.texture.vertex.cube.wrap.repeat_mirror
-dEQP-GLES2.functional.texture.vertex.cube.wrap.repeat_repeat
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -1,112 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-DEQP_OPTIONS=(--deqp-surface-width=256 --deqp-surface-height=256)
-DEQP_OPTIONS+=(--deqp-surface-type=pbuffer)
-DEQP_OPTIONS+=(--deqp-gl-config-name=rgba8888d24s8ms0)
-DEQP_OPTIONS+=(--deqp-visibility=hidden)
-DEQP_OPTIONS+=(--deqp-log-images=disable)
-DEQP_OPTIONS+=(--deqp-watchdog=enable)
-DEQP_OPTIONS+=(--deqp-crashhandler=enable)
-
-if [ -z "$DEQP_VER" ]; then
-   echo 'DEQP_VER must be set to something like "gles2" or "gles31" for the test run'
-   exit 1
-fi
-
-if [ -z "$DEQP_SKIPS" ]; then
-   echo 'DEQP_SKIPS must be set to something like "deqp-default-skips.txt"'
-   exit 1
-fi
-
-# Prep the expected failure list
-if [ -n "$DEQP_EXPECTED_FAILS" ]; then
-   export DEQP_EXPECTED_FAILS=`pwd`/artifacts/$DEQP_EXPECTED_FAILS
-else
-   export DEQP_EXPECTED_FAILS=/tmp/expect-no-failures.txt
-   touch $DEQP_EXPECTED_FAILS
-fi
-sort < $DEQP_EXPECTED_FAILS > /tmp/expected-fails.txt
-
-# Fix relative paths on inputs.
-export DEQP_SKIPS=`pwd`/artifacts/$DEQP_SKIPS
-
-# Be a good citizen on the shared runners.
-export LP_NUM_THREADS=4
-
-# Set up the driver environment.
-export LD_LIBRARY_PATH=`pwd`/install/lib/
-export EGL_PLATFORM=surfaceless
-
-# the runner was failing to look for libkms in /usr/local/lib for some reason
-# I never figured out.
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-
-RESULTS=`pwd`/results
-mkdir -p $RESULTS
-
-cd /deqp/modules/$DEQP_VER
-
-# Generate test case list file
-cp /deqp/mustpass/$DEQP_VER-master.txt /tmp/case-list.txt
-
-# Note: not using sorted input and comm, becuase I want to run the tests in
-# the same order that dEQP would.
-while read -r line; do
-   if echo "$line" | grep -q '^[^#]'; then
-       sed -i "/$line/d" /tmp/case-list.txt
-   fi
-done < $DEQP_SKIPS
-
-# If the job is parallel, take the corresponding fraction of the caselist.
-# Note: N~M is a gnu sed extension to match every nth line (first line is #1).
-if [ -n "$CI_NODE_INDEX" ]; then
-   sed -ni $CI_NODE_INDEX~$CI_NODE_TOTAL"p" /tmp/case-list.txt
-fi
-
-if [ ! -s /tmp/case-list.txt ]; then
-    echo "Caselist generation failed"
-    exit 1
-fi
-
-# Cannot use tee because dash doesn't have pipefail
-touch /tmp/result.txt
-tail -f /tmp/result.txt &
-
-./deqp-$DEQP_VER "${DEQP_OPTIONS[@]}" --deqp-log-filename=$RESULTS/results.qpa --deqp-caselist-file=/tmp/case-list.txt >> /tmp/result.txt
-DEQP_EXITCODE=$?
-
-sed -ne \
-    '/StatusCode="Fail"/{x;p}; s/#beginTestCaseResult //; T; h' \
-    $RESULTS/results.qpa \
-    > /tmp/unsorted-fails.txt
-
-# Scrape out the renderer that the test run used, so we can validate that the
-# right driver was used.
-if grep -q "dEQP-.*.info.renderer" /tmp/case-list.txt; then
-    # This is an ugly dependency on the .qpa format: Print 3 lines after the
-    # match, which happens to contain the result.
-    RENDERER=`sed -n '/#beginTestCaseResult dEQP-.*.info.renderer/{n;n;n;p}' $RESULTS/results.qpa | sed -n -E "s|<Text>(.*)</Text>|\1|p"`
-
-    echo "GL_RENDERER for this test run: $RENDERER"
-
-    if [ -n "$DEQP_RENDERER_MATCH" ]; then
-        echo $RENDERER | grep -q $DEQP_RENDERER_MATCH > /dev/null
-    fi
-fi
-
-if [ $DEQP_EXITCODE -ne 0 ]; then
-   exit $DEQP_EXITCODE
-fi
-
-sort < /tmp/unsorted-fails.txt > $RESULTS/fails.txt
-
-comm -23 $RESULTS/fails.txt /tmp/expected-fails.txt > /tmp/new-fails.txt
-if [ -s /tmp/new-fails.txt ]; then
-    echo "Unexpected failures:"
-    cat /tmp/new-fails.txt
-    exit 1
-else
-    echo "No new failures"
-fi
--- a/.gitlab-ci/deqp-softpipe-fails.txt
+++ b/.gitlab-ci/deqp-softpipe-fails.txt
@@ -1,445 +0,0 @@
-dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_center
-dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_corner
-dEQP-GLES2.functional.clipping.point.wide_point_clip
-dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_center
-dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_corner
-dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_neg_y_neg_z_and_neg_x_neg_y_pos_z
-dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_pos_y_pos_z_and_neg_x_neg_y_neg_z
-dEQP-GLES2.functional.polygon_offset.default_displacement_with_units
-dEQP-GLES2.functional.polygon_offset.fixed16_displacement_with_units
-dEQP-GLES2.functional.rasterization.interpolation.basic.line_loop_wide
-dEQP-GLES2.functional.rasterization.interpolation.basic.line_strip_wide
-dEQP-GLES2.functional.rasterization.interpolation.basic.lines_wide
-dEQP-GLES2.functional.rasterization.interpolation.projected.line_loop_wide
-dEQP-GLES2.functional.rasterization.interpolation.projected.line_strip_wide
-dEQP-GLES2.functional.rasterization.interpolation.projected.lines_wide
-dEQP-GLES2.functional.rasterization.limits.points
-dEQP-GLES2.functional.rasterization.primitives.points
-dEQP-GLES3.functional.clipping.line.wide_line_clip_viewport_center
-dEQP-GLES3.functional.clipping.line.wide_line_clip_viewport_corner
-dEQP-GLES3.functional.clipping.point.wide_point_clip
-dEQP-GLES3.functional.clipping.point.wide_point_clip_viewport_center
-dEQP-GLES3.functional.clipping.point.wide_point_clip_viewport_corner
-dEQP-GLES3.functional.clipping.triangle_vertex.clip_two.clip_neg_y_neg_z_and_neg_x_neg_y_pos_z
-dEQP-GLES3.functional.clipping.triangle_vertex.clip_two.clip_pos_y_pos_z_and_neg_x_neg_y_neg_z
-dEQP-GLES3.functional.draw.random.124
-dEQP-GLES3.functional.fbo.depth.depth_test_clamp.depth24_stencil8
-dEQP-GLES3.functional.fbo.depth.depth_test_clamp.depth32f_stencil8
-dEQP-GLES3.functional.fbo.depth.depth_test_clamp.depth_component16
-dEQP-GLES3.functional.fbo.depth.depth_test_clamp.depth_component24
-dEQP-GLES3.functional.fbo.depth.depth_test_clamp.depth_component32f
-dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth32f_stencil8
-dEQP-GLES3.functional.fbo.depth.depth_write_clamp.depth_component32f
-dEQP-GLES3.functional.fbo.invalidate.sub.unbind_blit_msaa_color
-dEQP-GLES3.functional.fbo.invalidate.sub.unbind_blit_msaa_depth
-dEQP-GLES3.functional.fbo.invalidate.sub.unbind_blit_msaa_depth_stencil
-dEQP-GLES3.functional.fbo.invalidate.sub.unbind_blit_msaa_stencil
-dEQP-GLES3.functional.fbo.invalidate.whole.unbind_blit_msaa_color
-dEQP-GLES3.functional.fbo.invalidate.whole.unbind_blit_msaa_depth
-dEQP-GLES3.functional.fbo.invalidate.whole.unbind_blit_msaa_depth_stencil
-dEQP-GLES3.functional.fbo.invalidate.whole.unbind_blit_msaa_stencil
-dEQP-GLES3.functional.fbo.msaa.2_samples.depth24_stencil8
-dEQP-GLES3.functional.fbo.msaa.2_samples.depth32f_stencil8
-dEQP-GLES3.functional.fbo.msaa.2_samples.depth_component16
-dEQP-GLES3.functional.fbo.msaa.2_samples.depth_component24
-dEQP-GLES3.functional.fbo.msaa.2_samples.depth_component32f
-dEQP-GLES3.functional.fbo.msaa.2_samples.r11f_g11f_b10f
-dEQP-GLES3.functional.fbo.msaa.2_samples.r16f
-dEQP-GLES3.functional.fbo.msaa.2_samples.r8
-dEQP-GLES3.functional.fbo.msaa.2_samples.rg16f
-dEQP-GLES3.functional.fbo.msaa.2_samples.rg8
-dEQP-GLES3.functional.fbo.msaa.2_samples.rgb10_a2
-dEQP-GLES3.functional.fbo.msaa.2_samples.rgb565
-dEQP-GLES3.functional.fbo.msaa.2_samples.rgb5_a1
-dEQP-GLES3.functional.fbo.msaa.2_samples.rgb8
-dEQP-GLES3.functional.fbo.msaa.2_samples.rgba4
-dEQP-GLES3.functional.fbo.msaa.2_samples.rgba8
-dEQP-GLES3.functional.fbo.msaa.2_samples.srgb8_alpha8
-dEQP-GLES3.functional.fbo.msaa.2_samples.stencil_index8
-dEQP-GLES3.functional.fbo.msaa.4_samples.depth24_stencil8
-dEQP-GLES3.functional.fbo.msaa.4_samples.depth32f_stencil8
-dEQP-GLES3.functional.fbo.msaa.4_samples.depth_component16
-dEQP-GLES3.functional.fbo.msaa.4_samples.depth_component24
-dEQP-GLES3.functional.fbo.msaa.4_samples.depth_component32f
-dEQP-GLES3.functional.fbo.msaa.4_samples.r11f_g11f_b10f
-dEQP-GLES3.functional.fbo.msaa.4_samples.r16f
-dEQP-GLES3.functional.fbo.msaa.4_samples.r8
-dEQP-GLES3.functional.fbo.msaa.4_samples.rg16f
-dEQP-GLES3.functional.fbo.msaa.4_samples.rg8
-dEQP-GLES3.functional.fbo.msaa.4_samples.rgb10_a2
-dEQP-GLES3.functional.fbo.msaa.4_samples.rgb565
-dEQP-GLES3.functional.fbo.msaa.4_samples.rgb5_a1
-dEQP-GLES3.functional.fbo.msaa.4_samples.rgb8
-dEQP-GLES3.functional.fbo.msaa.4_samples.rgba4
-dEQP-GLES3.functional.fbo.msaa.4_samples.rgba8
-dEQP-GLES3.functional.fbo.msaa.4_samples.srgb8_alpha8
-dEQP-GLES3.functional.fbo.msaa.4_samples.stencil_index8
-dEQP-GLES3.functional.multisample.fbo_max_samples.proportionality_alpha_to_coverage
-dEQP-GLES3.functional.multisample.fbo_max_samples.proportionality_sample_coverage
-dEQP-GLES3.functional.multisample.fbo_max_samples.proportionality_sample_coverage_inverted
-dEQP-GLES3.functional.multisample.fbo_max_samples.sample_coverage_invert
-dEQP-GLES3.functional.negative_api.buffer.blit_framebuffer_multisample
-dEQP-GLES3.functional.negative_api.buffer.read_pixels_fbo_format_mismatch
-dEQP-GLES3.functional.polygon_offset.default_displacement_with_units
-dEQP-GLES3.functional.polygon_offset.fixed16_displacement_with_units
-dEQP-GLES3.functional.polygon_offset.fixed24_displacement_with_units
-dEQP-GLES3.functional.polygon_offset.float32_displacement_with_units
-dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.interpolation.lines_wide
-dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.primitives.lines_wide
-dEQP-GLES3.functional.rasterization.fbo.rbo_singlesample.interpolation.lines_wide
-dEQP-GLES3.functional.rasterization.fbo.rbo_singlesample.primitives.points
-dEQP-GLES3.functional.rasterization.fbo.texture_2d.interpolation.lines_wide
-dEQP-GLES3.functional.rasterization.fbo.texture_2d.primitives.points
-dEQP-GLES3.functional.rasterization.interpolation.basic.line_loop_wide
-dEQP-GLES3.functional.rasterization.interpolation.basic.line_strip_wide
-dEQP-GLES3.functional.rasterization.interpolation.basic.lines_wide
-dEQP-GLES3.functional.rasterization.interpolation.projected.line_loop_wide
-dEQP-GLES3.functional.rasterization.interpolation.projected.line_strip_wide
-dEQP-GLES3.functional.rasterization.interpolation.projected.lines_wide
-dEQP-GLES3.functional.rasterization.primitives.points
-dEQP-GLES3.functional.rasterizer_discard.basic.write_depth_points
-dEQP-GLES3.functional.rasterizer_discard.basic.write_stencil_points
-dEQP-GLES3.functional.rasterizer_discard.fbo.write_depth_points
-dEQP-GLES3.functional.rasterizer_discard.fbo.write_stencil_points
-dEQP-GLES3.functional.rasterizer_discard.scissor.write_depth_points
-dEQP-GLES3.functional.rasterizer_discard.scissor.write_stencil_points
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.float_highp
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.vec3_highp
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.vec4_highp
-dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.float_highp
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.vec3_highp
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.vec4_highp
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa2.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.float_highp
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.vec3_highp
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.vec4_highp
-dEQP-GLES3.functional.shaders.derivate.dfdx.fbo_msaa4.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.float_highp
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.vec3_highp
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.vec4_highp
-dEQP-GLES3.functional.shaders.derivate.dfdx.nicest.fbo_msaa4.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.texture.msaa4.float_highp
-dEQP-GLES3.functional.shaders.derivate.dfdx.texture.msaa4.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.texture.msaa4.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.dfdx.texture.msaa4.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.texture.msaa4.vec3_highp
-dEQP-GLES3.functional.shaders.derivate.dfdx.texture.msaa4.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdx.texture.msaa4.vec4_highp
-dEQP-GLES3.functional.shaders.derivate.dfdx.texture.msaa4.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.float_highp
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.vec3_highp
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.vec4_highp
-dEQP-GLES3.functional.shaders.derivate.dfdy.fastest.fbo_msaa4.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.float_highp
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.vec3_highp
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.vec4_highp
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa2.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.float_highp
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.vec3_highp
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.vec4_highp
-dEQP-GLES3.functional.shaders.derivate.dfdy.fbo_msaa4.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.float_highp
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.vec3_highp
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.vec4_highp
-dEQP-GLES3.functional.shaders.derivate.dfdy.nicest.fbo_msaa4.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.texture.msaa4.float_highp
-dEQP-GLES3.functional.shaders.derivate.dfdy.texture.msaa4.float_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.texture.msaa4.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.dfdy.texture.msaa4.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.texture.msaa4.vec3_highp
-dEQP-GLES3.functional.shaders.derivate.dfdy.texture.msaa4.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.dfdy.texture.msaa4.vec4_highp
-dEQP-GLES3.functional.shaders.derivate.dfdy.texture.msaa4.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.float_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.float_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.vec3_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.vec4_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.fastest.fbo_msaa4.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.float_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.float_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.vec3_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.vec4_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa2.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.float_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.float_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.vec3_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.vec4_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.fbo_msaa4.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.float_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.float_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.vec3_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.vec4_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.nicest.fbo_msaa4.vec4_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.texture.msaa4.float_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.texture.msaa4.float_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.texture.msaa4.vec2_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.texture.msaa4.vec2_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.texture.msaa4.vec3_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.texture.msaa4.vec3_mediump
-dEQP-GLES3.functional.shaders.derivate.fwidth.texture.msaa4.vec4_highp
-dEQP-GLES3.functional.shaders.derivate.fwidth.texture.msaa4.vec4_mediump
-dEQP-GLES3.functional.state_query.integers.max_samples_getfloat
-dEQP-GLES3.functional.state_query.integers.max_samples_getinteger64
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_linear_clamp_clamp_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_linear_clamp_clamp_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_linear_clamp_mirror_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_linear_clamp_mirror_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_linear_clamp_repeat_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_linear_clamp_repeat_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_linear_mirror_clamp_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_linear_mirror_clamp_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_linear_mirror_mirror_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_linear_mirror_mirror_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_linear_mirror_repeat_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_linear_mirror_repeat_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_linear_repeat_clamp_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_linear_repeat_clamp_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_linear_repeat_mirror_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_linear_repeat_mirror_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_linear_repeat_repeat_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_linear_repeat_repeat_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_linear_linear_clamp_clamp_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_linear_linear_clamp_mirror_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_linear_linear_clamp_repeat_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_linear_linear_mirror_clamp_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_linear_linear_mirror_mirror_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_linear_linear_mirror_repeat_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_linear_linear_repeat_clamp_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_linear_linear_repeat_clamp_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_linear_linear_repeat_mirror_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_linear_linear_repeat_mirror_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_linear_linear_repeat_repeat_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_linear_linear_repeat_repeat_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_linear_nearest_repeat_clamp_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_linear_nearest_repeat_clamp_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_linear_nearest_repeat_mirror_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_linear_nearest_repeat_mirror_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_linear_nearest_repeat_repeat_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_linear_nearest_repeat_repeat_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_nearest_linear_clamp_clamp_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_nearest_linear_clamp_mirror_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_nearest_linear_clamp_repeat_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_nearest_linear_mirror_clamp_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_nearest_linear_mirror_mirror_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_nearest_linear_mirror_repeat_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_nearest_linear_repeat_clamp_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_nearest_linear_repeat_clamp_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_nearest_linear_repeat_mirror_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_nearest_linear_repeat_mirror_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_nearest_linear_repeat_repeat_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_nearest_linear_repeat_repeat_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_nearest_nearest_repeat_clamp_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_nearest_nearest_repeat_clamp_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_nearest_nearest_repeat_mirror_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_nearest_nearest_repeat_mirror_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_nearest_nearest_repeat_repeat_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_mipmap_nearest_nearest_repeat_repeat_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_nearest_clamp_clamp_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_nearest_clamp_clamp_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_nearest_clamp_mirror_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_nearest_clamp_mirror_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_nearest_clamp_repeat_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_nearest_clamp_repeat_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_nearest_mirror_clamp_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_nearest_mirror_clamp_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_nearest_mirror_mirror_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_nearest_mirror_mirror_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_nearest_mirror_repeat_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_nearest_mirror_repeat_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_nearest_repeat_clamp_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_nearest_repeat_clamp_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_nearest_repeat_mirror_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_nearest_repeat_mirror_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_nearest_repeat_repeat_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.linear_nearest_repeat_repeat_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_linear_clamp_clamp_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_linear_clamp_mirror_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_linear_clamp_repeat_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_linear_mirror_clamp_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_linear_mirror_mirror_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_linear_mirror_repeat_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_linear_repeat_clamp_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_linear_repeat_clamp_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_linear_repeat_mirror_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_linear_repeat_mirror_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_linear_repeat_repeat_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_linear_repeat_repeat_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_linear_linear_clamp_clamp_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_linear_linear_clamp_mirror_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_linear_linear_clamp_repeat_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_linear_linear_mirror_clamp_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_linear_linear_mirror_mirror_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_linear_linear_mirror_repeat_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_linear_linear_repeat_clamp_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_linear_linear_repeat_clamp_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_linear_linear_repeat_mirror_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_linear_linear_repeat_mirror_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_linear_linear_repeat_repeat_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_linear_linear_repeat_repeat_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_nearest_linear_clamp_clamp_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_nearest_linear_clamp_mirror_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_nearest_linear_clamp_repeat_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_nearest_linear_mirror_clamp_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_nearest_linear_mirror_mirror_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_nearest_linear_mirror_repeat_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_nearest_linear_repeat_clamp_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_nearest_linear_repeat_clamp_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_nearest_linear_repeat_mirror_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_nearest_linear_repeat_mirror_repeat
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_nearest_linear_repeat_repeat_mirror
-dEQP-GLES3.functional.texture.filtering.3d.combinations.nearest_mipmap_nearest_linear_repeat_repeat_repeat
-dEQP-GLES3.functional.texture.filtering.3d.formats.r11f_g11f_b10f_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.r11f_g11f_b10f_linear_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.r11f_g11f_b10f_linear_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.formats.r11f_g11f_b10f_nearest_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.r11f_g11f_b10f_nearest_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgb10_a2_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgb10_a2_linear_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgb10_a2_linear_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgb10_a2_nearest_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgb10_a2_nearest_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgb565_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgb565_linear_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgb565_linear_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgb565_nearest_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgb565_nearest_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgb5_a1_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgb5_a1_linear_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgb5_a1_linear_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgb5_a1_nearest_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgb5_a1_nearest_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgb9_e5_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgb9_e5_linear_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgb9_e5_linear_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgb9_e5_nearest_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgb9_e5_nearest_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgba16f_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgba16f_linear_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgba16f_linear_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgba16f_nearest_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgba16f_nearest_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgba4_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgba4_linear_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgba4_linear_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgba4_nearest_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgba4_nearest_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgba8_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgba8_linear_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgba8_linear_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgba8_nearest_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgba8_nearest_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgba8_snorm_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgba8_snorm_linear_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgba8_snorm_linear_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgba8_snorm_nearest_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.rgba8_snorm_nearest_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.formats.srgb8_alpha8_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.srgb8_alpha8_linear_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.srgb8_alpha8_linear_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.formats.srgb8_alpha8_nearest_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.srgb8_alpha8_nearest_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_r8_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_r8_linear_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_r8_linear_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_r8_nearest_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.formats.srgb_r8_nearest_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.sizes.128x32x64_linear
-dEQP-GLES3.functional.texture.filtering.3d.sizes.128x32x64_linear_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.sizes.128x32x64_linear_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.sizes.128x32x64_nearest_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.sizes.128x32x64_nearest_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.sizes.63x63x63_linear
-dEQP-GLES3.functional.texture.filtering.3d.sizes.63x63x63_linear_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.sizes.63x63x63_linear_mipmap_nearest
-dEQP-GLES3.functional.texture.filtering.3d.sizes.63x63x63_nearest_mipmap_linear
-dEQP-GLES3.functional.texture.filtering.3d.sizes.63x63x63_nearest_mipmap_nearest
-dEQP-GLES3.functional.texture.vertex.3d.filtering.linear_linear_clamp
-dEQP-GLES3.functional.texture.vertex.3d.filtering.linear_linear_mirror
-dEQP-GLES3.functional.texture.vertex.3d.filtering.linear_linear_repeat
-dEQP-GLES3.functional.texture.vertex.3d.filtering.linear_mipmap_linear_linear_clamp
-dEQP-GLES3.functional.texture.vertex.3d.filtering.linear_mipmap_linear_linear_mirror
-dEQP-GLES3.functional.texture.vertex.3d.filtering.linear_mipmap_linear_linear_repeat
-dEQP-GLES3.functional.texture.vertex.3d.filtering.linear_mipmap_linear_nearest_clamp
-dEQP-GLES3.functional.texture.vertex.3d.filtering.linear_mipmap_linear_nearest_mirror
-dEQP-GLES3.functional.texture.vertex.3d.filtering.linear_mipmap_linear_nearest_repeat
-dEQP-GLES3.functional.texture.vertex.3d.filtering.linear_mipmap_nearest_linear_repeat
-dEQP-GLES3.functional.texture.vertex.3d.filtering.linear_nearest_clamp
-dEQP-GLES3.functional.texture.vertex.3d.filtering.linear_nearest_mirror
-dEQP-GLES3.functional.texture.vertex.3d.filtering.linear_nearest_repeat
-dEQP-GLES3.functional.texture.vertex.3d.filtering.nearest_linear_repeat
-dEQP-GLES3.functional.texture.vertex.3d.filtering.nearest_mipmap_linear_linear_repeat
-dEQP-GLES3.functional.texture.vertex.3d.filtering.nearest_mipmap_nearest_linear_repeat
-dEQP-GLES3.functional.texture.vertex.3d.wrap.clamp_clamp_clamp
-dEQP-GLES3.functional.texture.vertex.3d.wrap.clamp_clamp_mirror
-dEQP-GLES3.functional.texture.vertex.3d.wrap.clamp_clamp_repeat
-dEQP-GLES3.functional.texture.vertex.3d.wrap.clamp_mirror_mirror
-dEQP-GLES3.functional.texture.vertex.3d.wrap.clamp_mirror_repeat
-dEQP-GLES3.functional.texture.vertex.3d.wrap.clamp_repeat_mirror
-dEQP-GLES3.functional.texture.vertex.3d.wrap.clamp_repeat_repeat
-dEQP-GLES3.functional.texture.vertex.3d.wrap.mirror_clamp_clamp
-dEQP-GLES3.functional.texture.vertex.3d.wrap.mirror_clamp_mirror
-dEQP-GLES3.functional.texture.vertex.3d.wrap.mirror_clamp_repeat
-dEQP-GLES3.functional.texture.vertex.3d.wrap.mirror_mirror_mirror
-dEQP-GLES3.functional.texture.vertex.3d.wrap.mirror_mirror_repeat
-dEQP-GLES3.functional.texture.vertex.3d.wrap.mirror_repeat_mirror
-dEQP-GLES3.functional.texture.vertex.3d.wrap.mirror_repeat_repeat
-dEQP-GLES3.functional.texture.vertex.3d.wrap.repeat_clamp_clamp
-dEQP-GLES3.functional.texture.vertex.3d.wrap.repeat_clamp_mirror
-dEQP-GLES3.functional.texture.vertex.3d.wrap.repeat_clamp_repeat
-dEQP-GLES3.functional.texture.vertex.3d.wrap.repeat_mirror_clamp
-dEQP-GLES3.functional.texture.vertex.3d.wrap.repeat_mirror_mirror
-dEQP-GLES3.functional.texture.vertex.3d.wrap.repeat_mirror_repeat
-dEQP-GLES3.functional.texture.vertex.3d.wrap.repeat_repeat_clamp
-dEQP-GLES3.functional.texture.vertex.3d.wrap.repeat_repeat_mirror
-dEQP-GLES3.functional.texture.vertex.3d.wrap.repeat_repeat_repeat
-dEQP-GLES3.functional.texture.wrap.astc_8x8.repeat_repeat_linear_divisible
-dEQP-GLES3.functional.texture.wrap.astc_8x8.repeat_repeat_linear_not_divisible
-dEQP-GLES3.functional.texture.wrap.astc_8x8_srgb.repeat_repeat_linear_divisible
-dEQP-GLES3.functional.texture.wrap.astc_8x8_srgb.repeat_repeat_linear_not_divisible
-dEQP-GLES3.functional.vertex_arrays.single_attribute.normalize.int2_10_10_10.components4_quads1
-dEQP-GLES3.functional.vertex_arrays.single_attribute.normalize.int2_10_10_10.components4_quads256
--- a/.gitlab-ci/meson-build.sh
+++ b/.gitlab-ci/meson-build.sh
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-set -e
-set -o xtrace
-
-# We need to control the version of llvm-config we're using, so we'll
-# generate a native file to do so. This requires meson >=0.49
-if test -n "$LLVM_VERSION"; then
-    LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
-    echo -e "[binaries]\nllvm-config = '`which $LLVM_CONFIG`'" > native.file
-    $LLVM_CONFIG --version
-else
-    rm -f native.file
-    touch native.file
-fi
-
-rm -rf _build
-meson _build --native-file=native.file \
-      ${CROSS+--cross /cross_file-$CROSS.txt} \
-      -D prefix=`pwd`/install \
-      -D libdir=lib \
-      -D buildtype=${BUILDTYPE:-debug} \
-      -D build-tests=true \
-      -D libunwind=${UNWIND} \
-      ${DRI_LOADERS} \
-      -D dri-drivers=${DRI_DRIVERS:-[]} \
-      ${GALLIUM_ST} \
-      -D gallium-drivers=${GALLIUM_DRIVERS:-[]} \
-      -D vulkan-drivers=${VULKAN_DRIVERS:-[]} \
-      -D I-love-half-baked-turnips=true \
-      ${EXTRA_OPTION}
-cd _build
-meson configure
-ninja -j4
-LC_ALL=C.UTF-8 ninja test
-ninja install
-cd ..
-
-if test -n "$MESON_SHADERDB"; then
-    ./.gitlab-ci/run-shader-db.sh;
-fi
-
-# Delete 2MB of includes from artifacts.
-rm -rf install/include
-
-# Strip the drivers in the artifacts to cut 80% of the artifacts size.
-if [ -n "$CROSS" ]; then
-    STRIP=`sed -n -E "s/strip\s*=\s*'(.*)'/\1/p" /cross_file-$CROSS.txt`
-    if [ -z "$STRIP" ]; then
-        echo "Failed to find strip command in cross file"
-        exit 1
-    fi
-else
-    STRIP="strip"
-fi
-find install -name \*.so -exec $STRIP {} \;
-
-# Test runs don't pull down the git tree, so put the dEQP helper
-# script and associated bits there.
-mkdir -p artifacts/
-cp -Rp .gitlab-ci/deqp* artifacts/
-# cp -Rp src/freedreno/ci/expected* artifacts/
--- a/.gitlab-ci/run-shader-db.sh
+++ b/.gitlab-ci/run-shader-db.sh
@@ -1,17 +0,0 @@
-set -e
-set -v
-
-ARTIFACTSDIR=`pwd`/shader-db
-mkdir -p $ARTIFACTSDIR
-export DRM_SHIM_DEBUG=true
-
-LIBDIR=`pwd`/install/lib
-export LD_LIBRARY_PATH=$LIBDIR
-
-cd /usr/local/shader-db
-
-for driver in freedreno v3d; do
-    env LD_PRELOAD=$LIBDIR/lib${driver}_noop_drm_shim.so \
-        ./run -j 4 ./shaders \
-            > $ARTIFACTSDIR/${driver}-shader-db.txt
-done
--- a/.mailmap
+++ b/.mailmap
@@ -145,16 +145,9 @@ Edward O'Callaghan <funfunctor@folklore1984.net> <eocallaghan@alterapraxis.com>
 Emeric Grange <emeric.grange@gmail.com> Emeric <emeric.grange@gmail.com>

 Emil Velikov <emil.l.velikov@gmail.com> <emil.velikov@collabora.com>
-Emil Velikov <emil.l.velikov@gmail.com> <emil.veliko@collabora.com>
-Emil Velikov <emil.l.velikov@gmail.com> <emil.velikov@collabora.co.uk>
-Emil Velikov <emil.l.velikov@gmail.com> <emil.veliikov@collabora.com>
-Emil Velikov <emil.l.velikov@gmail.com> <emil.velikov@gmail.com>
-Emil Velikov <emil.l.velikov@gmail.com> <emmil.velikov@collabora.com>

 Eric Anholt <eric@anholt.net> Eric Anholt <anholt@FreeBSD.org>

-Eric Engestrom <eric@engestrom.ch> <eric.engestrom@imgtec.com>
-
 Eugeni Dodonov <eugeni.dodonov@intel.com> <eugeni@mandriva.com>

 Fabian Bieler <der.fabe@gmx.net> <fabianbieler@fastmail.fm>
@@ -265,9 +258,6 @@ Kristian Høgsberg <krh@bitplanet.net> <krh@hinata.boston.redhat.com>
 Kristian Høgsberg <krh@bitplanet.net> <krh@sasori.boston.redhat.com>
 Kristian Høgsberg <krh@bitplanet.net> <krh@temari.boston.redhat.com>
 Kristian Høgsberg <krh@bitplanet.net> <kristian.h.kristensen@intel.com>
-Kristian Høgsberg <krh@bitplanet.net> <hoegsberg@chromium.org>
-Kristian Høgsberg <krh@bitplanet.net> <hoegsberg@google.com>
-Kristian Høgsberg <krh@bitplanet.net> <hoegsberg@gmail.com>

 Krzesimir Nowak <qdlacz@gmail.com> <krzesimir@kinvolk.io>

--- a/.travis.yml
+++ b/.travis.yml
@@ -1,62 +1,380 @@
 language: c

-os: osx
+sudo: false
+dist: trusty

 cache:
+  apt: true
  ccache: true

 env:
  global:
-    - PKG_CONFIG_PATH=""
+    - XORG_RELEASES=http://xorg.freedesktop.org/releases/individual
+    - XCB_RELEASES=http://xcb.freedesktop.org/dist
+    - XORGMACROS_VERSION=util-macros-1.19.0
+    - GLPROTO_VERSION=glproto-1.4.17
+    - DRI2PROTO_VERSION=dri2proto-2.8
+    - LIBPCIACCESS_VERSION=libpciaccess-0.13.4
+    - LIBDRM_VERSION=libdrm-2.4.74
+    - XCBPROTO_VERSION=xcb-proto-1.11
+    - LIBXCB_VERSION=libxcb-1.11
+    - LIBXSHMFENCE_VERSION=libxshmfence-1.2
+    - LIBTXC_DXTN_VERSION=libtxc_dxtn-1.0.1
+    - LIBVDPAU_VERSION=libvdpau-1.1
+    - LIBVA_VERSION=libva-1.6.2
+    - LIBWAYLAND_VERSION=wayland-1.11.1
+    - PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig
+    - LD_LIBRARY_PATH="$HOME/prefix/lib:$LD_LIBRARY_PATH"

 matrix:
  include:
    - env:
-      - BUILD=meson
+        - LABEL="make loaders/classic DRI"
+        - BUILD=make
+        - MAKEFLAGS="-j4"
+        - MAKE_CHECK_COMMAND="make check"
+        - DRI_LOADERS="--enable-glx --enable-gbm --enable-egl --with-platforms=x11,drm,surfaceless,wayland --enable-osmesa"
+        - DRI_DRIVERS="i915,i965,radeon,r200,swrast,nouveau"
+        - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa"
+        - GALLIUM_DRIVERS=""
+        - VULKAN_DRIVERS=""
+      addons:
+        apt:
+          packages:
+            - xz-utils
+            - x11proto-xf86vidmode-dev
+            - libexpat1-dev
+            - libx11-xcb-dev
    - env:
-      - BUILD=scons
-
-before_install:
-  - HOMEBREW_NO_AUTO_UPDATE=1 brew install expat gettext
-  - if test "x$BUILD" = xmeson; then
-      HOMEBREW_NO_AUTO_UPDATE=1 brew install python3 ninja;
-    fi
-  - if test "x$BUILD" = xscons; then
-      HOMEBREW_NO_AUTO_UPDATE=1 brew install python2 scons;
-    fi
-
-  # Set PATH for homebrew pip3 installs
-  - PATH="$HOME/Library/Python/3.6/bin:${PATH}"
-  # Set PKG_CONFIG_PATH for keg-only expat
-  - PKG_CONFIG_PATH="/usr/local/opt/expat/lib/pkgconfig:${PKG_CONFIG_PATH}"
-  # Set PATH for keg-only gettext
-  - PATH="/usr/local/opt/gettext/bin:${PATH}"
-
-  # Install xquartz for prereqs ...
-  - XQUARTZ_VERSION="2.7.11"
-  - wget -nv https://dl.bintray.com/xquartz/downloads/XQuartz-${XQUARTZ_VERSION}.dmg
-  - hdiutil attach XQuartz-${XQUARTZ_VERSION}.dmg
-  - sudo installer -pkg /Volumes/XQuartz-${XQUARTZ_VERSION}/XQuartz.pkg -target /
-  - hdiutil detach /Volumes/XQuartz-${XQUARTZ_VERSION}
-  # ... and set paths
-  - PKG_CONFIG_PATH="/opt/X11/share/pkgconfig:/opt/X11/lib/pkgconfig:${PKG_CONFIG_PATH}"
+        # NOTE: Building SWR is 2x (yes two) times slower than all the other
+        # gallium drivers combined.
+        # Start this early so that it doesn't hunder the run time.
+        - LABEL="make Gallium Drivers SWR"
+        - BUILD=make
+        - MAKEFLAGS="-j4"
+        - MAKE_CHECK_COMMAND="true"
+        - LLVM_VERSION=3.9
+        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
+        - OVERRIDE_CC="gcc-5"
+        - OVERRIDE_CXX="g++-5"
+        - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
+        - DRI_DRIVERS=""
+        - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa"
+        - GALLIUM_DRIVERS="swr"
+        - VULKAN_DRIVERS=""
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-3.9
+          packages:
+            # LLVM packaging is broken and misses these dependencies
+            - libedit-dev
+            # From sources above
+            - g++-5
+            - llvm-3.9-dev
+            # Common
+            - xz-utils
+            - x11proto-xf86vidmode-dev
+            - libexpat1-dev
+            - libx11-xcb-dev
+            - libelf-dev
+    - env:
+        - LABEL="make Gallium Drivers Other"
+        - BUILD=make
+        - MAKEFLAGS="-j4"
+        - MAKE_CHECK_COMMAND="true"
+        - LLVM_VERSION=3.9
+        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
+        - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
+        - DRI_DRIVERS=""
+        - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa"
+        - GALLIUM_DRIVERS="i915,nouveau,r300,r600,radeonsi,freedreno,svga,swrast,vc4,virgl,etnaviv,imx"
+        - VULKAN_DRIVERS=""
+      addons:
+        apt:
+          sources:
+            - llvm-toolchain-trusty-3.9
+          packages:
+            # LLVM packaging is broken and misses these dependencies
+            - libedit-dev
+            # From sources above
+            - llvm-3.9-dev
+            # Common
+            - xz-utils
+            - x11proto-xf86vidmode-dev
+            - libexpat1-dev
+            - libx11-xcb-dev
+            - libelf-dev
+    - env:
+        # NOTE: Analogous to SWR above, building Clover is quite slow.
+        - LABEL="make Gallium ST Clover"
+        - BUILD=make
+        - MAKEFLAGS="-j4"
+        - MAKE_CHECK_COMMAND="true"
+        - LLVM_VERSION=3.6
+        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
+        - OVERRIDE_CC=gcc-4.7
+        - OVERRIDE_CXX=g++-4.7
+        - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
+        - DRI_DRIVERS=""
+        - GALLIUM_ST="--disable-dri --enable-opencl --enable-opencl-icd --enable-llvm --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa"
+        # i915 most likely doesn't work with OpenCL.
+        # Regardless - we're doing a quick build test here.
+        - GALLIUM_DRIVERS="i915"
+        - VULKAN_DRIVERS=""
+      addons:
+        apt:
+          sources:
+            - llvm-toolchain-trusty-3.6
+          packages:
+            - libclc-dev
+            # LLVM packaging is broken and misses these dependencies
+            - libedit-dev
+            - g++-4.7
+            # From sources above
+            - llvm-3.6-dev
+            - clang-3.6
+            - libclang-3.6-dev
+            # Common
+            - xz-utils
+            - x11proto-xf86vidmode-dev
+            - libexpat1-dev
+            - libx11-xcb-dev
+            - libelf-dev
+    - env:
+        - LABEL="make Gallium ST Other"
+        - BUILD=make
+        - MAKEFLAGS="-j4"
+        - MAKE_CHECK_COMMAND="true"
+        - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
+        - DRI_DRIVERS=""
+        - GALLIUM_ST="--enable-dri --disable-opencl --enable-xa --enable-nine --enable-xvmc --enable-vdpau --enable-va --enable-omx --enable-gallium-osmesa"
+        # We need swrast for osmesa and nine.
+        # i915 most likely doesn't work with most ST.
+        # Regardless - we're doing a quick build test here.
+        - GALLIUM_DRIVERS="i915,swrast"
+        - VULKAN_DRIVERS=""
+      addons:
+        apt:
+          packages:
+            # Nine requires gcc 4.6... which is the one we have right ?
+            - libxvmc-dev
+            # Build locally, for now.
+            #- libvdpau-dev
+            #- libva-dev
+            - libomxil-bellagio-dev
+            # LLVM packaging is broken and misses these dependencies
+            - libedit-dev
+            # Common
+            - xz-utils
+            - x11proto-xf86vidmode-dev
+            - libexpat1-dev
+            - libx11-xcb-dev
+            - libelf-dev
+    - env:
+        - LABEL="make Vulkan"
+        - BUILD=make
+        - MAKEFLAGS="-j4"
+        - MAKE_CHECK_COMMAND="make -C src/gtest check && make -C src/intel check"
+        - LLVM_VERSION=3.9
+        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
+        - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl --with-platforms=x11,wayland"
+        - DRI_DRIVERS=""
+        - GALLIUM_ST="--enable-dri --enable-dri3 --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa"
+        - GALLIUM_DRIVERS=""
+        - VULKAN_DRIVERS="intel,radeon"
+      addons:
+        apt:
+          sources:
+            - llvm-toolchain-trusty-3.9
+          packages:
+            # LLVM packaging is broken and misses these dependencies
+            - libedit-dev
+            # From sources above
+            - llvm-3.9-dev
+            # Common
+            - xz-utils
+            - x11proto-xf86vidmode-dev
+            - libexpat1-dev
+            - libx11-xcb-dev
+            - libelf-dev
+    - env:
+        - LABEL="scons"
+        - BUILD=scons
+        - SCONSFLAGS="-j4"
+        # Explicitly disable.
+        - SCONS_TARGET="llvm=0"
+        # Keep it symmetrical to the make build.
+        - SCONS_CHECK_COMMAND="scons llvm=0 check"
+      addons:
+        apt:
+          packages:
+            - scons
+            # Common
+            - xz-utils
+            - x11proto-xf86vidmode-dev
+            - libexpat1-dev
+            - libx11-xcb-dev
+            - libelf-dev
+    - env:
+        - LABEL="scons LLVM"
+        - BUILD=scons
+        - SCONSFLAGS="-j4"
+        - SCONS_TARGET="llvm=1"
+        # Keep it symmetrical to the make build.
+        - SCONS_CHECK_COMMAND="scons llvm=1 check"
+        - LLVM_VERSION=3.3
+        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
+      addons:
+        apt:
+          packages:
+            - scons
+            # LLVM packaging is broken and misses these dependencies
+            - libedit-dev
+            - llvm-3.3-dev
+            # Common
+            - xz-utils
+            - x11proto-xf86vidmode-dev
+            - libexpat1-dev
+            - libx11-xcb-dev
+            - libelf-dev
+    - env:
+        - LABEL="scons SWR"
+        - BUILD=scons
+        - SCONSFLAGS="-j4"
+        - SCONS_TARGET="swr=1"
+        - LLVM_VERSION=3.9
+        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
+        # Keep it symmetrical to the make build. There's no actual SWR, yet.
+        - SCONS_CHECK_COMMAND="true"
+        - OVERRIDE_CC="gcc-5"
+        - OVERRIDE_CXX="g++-5"
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-3.9
+          packages:
+            - scons
+            # LLVM packaging is broken and misses these dependencies
+            - libedit-dev
+            # From sources above
+            - g++-5
+            - llvm-3.9-dev
+            # Common
+            - xz-utils
+            - x11proto-xf86vidmode-dev
+            - libexpat1-dev
+            - libx11-xcb-dev
+            - libelf-dev

 install:
-  - if test "x$BUILD" = xmeson; then
-      pip3 install --user meson;
-      pip3 install --user mako;
-    fi
-  - if test "x$BUILD" = xscons; then
-      pip2 install --user mako;
+  - pip install --user mako
+
+  # Since libdrm gets updated in configure.ac regularly, try to pick up the
+  # latest version from there.
+  - for line in `grep "^LIBDRM.*_REQUIRED=" configure.ac`; do
+      old_ver=`echo $LIBDRM_VERSION | sed 's/libdrm-//'`;
+      new_ver=`echo $line | sed 's/.*REQUIRED=//'`;
+      if `echo "$old_ver,$new_ver" | tr ',' '\n' | sort -Vc 2> /dev/null`; then
+        export LIBDRM_VERSION="libdrm-$new_ver";
+      fi;
+    done
+
+  # Install dependencies where we require specific versions (or where
+  # disallowed by Travis CI's package whitelisting).
+
+  - wget $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2
+  - tar -jxvf $XORGMACROS_VERSION.tar.bz2
+  - (cd $XORGMACROS_VERSION && ./configure --prefix=$HOME/prefix && make install)
+
+  - wget $XORG_RELEASES/proto/$GLPROTO_VERSION.tar.bz2
+  - tar -jxvf $GLPROTO_VERSION.tar.bz2
+  - (cd $GLPROTO_VERSION && ./configure --prefix=$HOME/prefix && make install)
+
+  - wget $XORG_RELEASES/proto/$DRI2PROTO_VERSION.tar.bz2
+  - tar -jxvf $DRI2PROTO_VERSION.tar.bz2
+  - (cd $DRI2PROTO_VERSION && ./configure --prefix=$HOME/prefix && make install)
+
+  - wget $XCB_RELEASES/$XCBPROTO_VERSION.tar.bz2
+  - tar -jxvf $XCBPROTO_VERSION.tar.bz2
+  - (cd $XCBPROTO_VERSION && ./configure --prefix=$HOME/prefix && make install)
+
+  - wget $XCB_RELEASES/$LIBXCB_VERSION.tar.bz2
+  - tar -jxvf $LIBXCB_VERSION.tar.bz2
+  - (cd $LIBXCB_VERSION && ./configure --prefix=$HOME/prefix && make install)
+
+  - wget $XORG_RELEASES/lib/$LIBPCIACCESS_VERSION.tar.bz2
+  - tar -jxvf $LIBPCIACCESS_VERSION.tar.bz2
+  - (cd $LIBPCIACCESS_VERSION && ./configure --prefix=$HOME/prefix && make install)
+
+  - wget http://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.bz2
+  - tar -jxvf $LIBDRM_VERSION.tar.bz2
+  - (cd $LIBDRM_VERSION && ./configure --prefix=$HOME/prefix --enable-vc4 --enable-freedreno --enable-etnaviv-experimental-api && make install)
+
+  - wget $XORG_RELEASES/lib/$LIBXSHMFENCE_VERSION.tar.bz2
+  - tar -jxvf $LIBXSHMFENCE_VERSION.tar.bz2
+  - (cd $LIBXSHMFENCE_VERSION && ./configure --prefix=$HOME/prefix && make install)
+
+  # libtxc-dxtn uses the patented S3 Texture Compression
+  # algorithm. Therefore, we don't want to use this library but it is
+  # still possible through setting the USE_TXC_DXTN variable to yes in
+  # the travis web UI.
+  #
+  # According to Wikipedia, the patent expires on October 2, 2017:
+  # https://en.wikipedia.org/wiki/S3_Texture_Compression#Patent
+  - if test "x$USE_TXC_DXTN" = xyes; then
+      wget https://people.freedesktop.org/~cbrill/libtxc_dxtn/$LIBTXC_DXTN_VERSION.tar.bz2;
+      tar -jxvf $LIBTXC_DXTN_VERSION.tar.bz2;
+      (cd $LIBTXC_DXTN_VERSION && ./configure --prefix=$HOME/prefix && make install);
    fi

+  - wget http://people.freedesktop.org/~aplattner/vdpau/$LIBVDPAU_VERSION.tar.bz2
+  - tar -jxvf $LIBVDPAU_VERSION.tar.bz2
+  - (cd $LIBVDPAU_VERSION && ./configure --prefix=$HOME/prefix && make install)
+
+  - wget http://www.freedesktop.org/software/vaapi/releases/libva/$LIBVA_VERSION.tar.bz2
+  - tar -jxvf $LIBVA_VERSION.tar.bz2
+  - (cd $LIBVA_VERSION && ./configure --prefix=$HOME/prefix --disable-wayland --disable-dummy-driver && make install)
+
+  - wget http://wayland.freedesktop.org/releases/$LIBWAYLAND_VERSION.tar.xz
+  - tar -axvf $LIBWAYLAND_VERSION.tar.xz
+  - (cd $LIBWAYLAND_VERSION && ./configure --prefix=$HOME/prefix --enable-libraries --without-host-scanner --disable-documentation --disable-dtd-validation && make install)
+
+  # Generate the header since one is missing on the Travis instance
+  - mkdir -p linux
+  - printf "%s\n" \
+           "#ifndef _LINUX_MEMFD_H" \
+           "#define _LINUX_MEMFD_H" \
+           "" \
+           "#define __NR_memfd_create 319" \
+           "#define SYS_memfd_create __NR_memfd_create" \
+           "" \
+           "#define MFD_CLOEXEC             0x0001U" \
+           "#define MFD_ALLOW_SEALING       0x0002U" \
+           "" \
+           "#endif /* _LINUX_MEMFD_H */" > linux/memfd.h
+
 script:
-  - if test "x$BUILD" = xmeson; then
-      meson _build -Dbuild-tests=true;
-      ninja -C _build || travis_terminate 1;
-      ninja -C _build test || travis_terminate 1;
+  - if test "x$BUILD" = xmake; then
+      test -n "$OVERRIDE_CC" && export CC="$OVERRIDE_CC";
+      test -n "$OVERRIDE_CXX" && export CXX="$OVERRIDE_CXX";
+      export CC="$CC -isystem`pwd`";
+
+      ./autogen.sh --enable-debug
+        $DRI_LOADERS
+        --with-dri-drivers=$DRI_DRIVERS
+        $GALLIUM_ST
+        --with-gallium-drivers=$GALLIUM_DRIVERS
+        --with-vulkan-drivers=$VULKAN_DRIVERS
+        --disable-llvm-shared-libs
+        &&
+      make && eval $MAKE_CHECK_COMMAND;
    fi
+
  - if test "x$BUILD" = xscons; then
-      scons || travis_terminate 1;
-      scons check || travis_terminate 1;
+      test -n "$OVERRIDE_CC" && export CC="$OVERRIDE_CC";
+      test -n "$OVERRIDE_CXX" && export CXX="$OVERRIDE_CXX";
+      scons $SCONS_TARGET && eval $SCONS_CHECK_COMMAND;
    fi
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -31,36 +31,25 @@ LOCAL_C_INCLUDES += \

 MESA_VERSION := $(shell cat $(MESA_TOP)/VERSION)
 LOCAL_CFLAGS += \
-	-Wno-error \
-	-Werror=incompatible-pointer-types \
 	-Wno-unused-parameter \
+	-Wno-date-time \
 	-Wno-pointer-arith \
 	-Wno-missing-field-initializers \
 	-Wno-initializer-overrides \
 	-Wno-mismatched-tags \
 	-DPACKAGE_VERSION=\"$(MESA_VERSION)\" \
-	-DPACKAGE_BUGREPORT=\"https://gitlab.freedesktop.org/mesa/mesa/issues\"
+	-DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\"

-# XXX: The following __STDC_*_MACROS defines should not be needed.
-# It's likely due to a bug elsewhere, but let's temporarily add them
-# here to fix the radeonsi build.
 LOCAL_CFLAGS += \
-	-DANDROID_API_LEVEL=$(PLATFORM_SDK_VERSION) \
 	-DENABLE_SHADER_CACHE \
-	-D__STDC_CONSTANT_MACROS \
-	-D__STDC_LIMIT_MACROS \
 	-DHAVE___BUILTIN_EXPECT \
 	-DHAVE___BUILTIN_FFS \
 	-DHAVE___BUILTIN_FFSLL \
-	-DHAVE_DLFCN_H \
 	-DHAVE_FUNC_ATTRIBUTE_FLATTEN \
 	-DHAVE_FUNC_ATTRIBUTE_UNUSED \
 	-DHAVE_FUNC_ATTRIBUTE_FORMAT \
 	-DHAVE_FUNC_ATTRIBUTE_PACKED \
 	-DHAVE_FUNC_ATTRIBUTE_ALIAS \
-	-DHAVE_FUNC_ATTRIBUTE_NORETURN \
-	-DHAVE_FUNC_ATTRIBUTE_RETURNS_NONNULL \
-	-DHAVE_FUNC_ATTRIBUTE_WARN_UNUSED_RESULT \
 	-DHAVE___BUILTIN_CTZ \
 	-DHAVE___BUILTIN_POPCOUNT \
 	-DHAVE___BUILTIN_POPCOUNTLL \
@@ -68,16 +57,9 @@ LOCAL_CFLAGS += \
 	-DHAVE___BUILTIN_CLZLL \
 	-DHAVE___BUILTIN_UNREACHABLE \
 	-DHAVE_PTHREAD=1 \
-	-DHAVE_DLADDR \
+	-DHAVE_DLOPEN \
 	-DHAVE_DL_ITERATE_PHDR \
-	-DHAVE_LINUX_FUTEX_H \
-	-DHAVE_ENDIAN_H \
-	-DHAVE_ZLIB \
-	-DMAJOR_IN_SYSMACROS \
-	-DVK_USE_PLATFORM_ANDROID_KHR \
 	-fvisibility=hidden \
-	-fno-math-errno \
-	-fno-trapping-math \
 	-Wno-sign-compare

 LOCAL_CPPFLAGS += \
@@ -91,18 +73,6 @@ LOCAL_CPPFLAGS += \
 LOCAL_CONLYFLAGS += \
 	-std=c99

-# c11 timespec_get is part of bionic as well
-# https://android-review.googlesource.com/c/718518
-# This means releases from P and earlier won't need this
-ifeq ($(filter 5 6 7 8 9, $(MESA_ANDROID_MAJOR_VERSION)),)
-LOCAL_CFLAGS += -DHAVE_TIMESPEC_GET
-endif
-
-# Android's libc began supporting shm in Oreo
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo true),true)
-LOCAL_CFLAGS += -DHAVE_SYS_SHM_H
-endif
-
 ifeq ($(strip $(MESA_ENABLE_ASM)),true)
 ifeq ($(TARGET_ARCH),x86)
 LOCAL_CFLAGS += \
@@ -110,19 +80,32 @@ LOCAL_CFLAGS += \

 endif
 endif
-ifeq ($(ARCH_ARM_HAVE_NEON),true)
-LOCAL_CFLAGS_arm += -DUSE_ARM_ASM
+
+ifeq ($(MESA_ENABLE_LLVM),true)
+  ifeq ($(MESA_ANDROID_MAJOR_VERSION),5)
+    LOCAL_CFLAGS += -DHAVE_LLVM=0x0305 -DMESA_LLVM_VERSION_PATCH=2
+    ELF_INCLUDES := external/elfutils/0.153/libelf
+  endif
+  ifeq ($(MESA_ANDROID_MAJOR_VERSION),6)
+    LOCAL_CFLAGS += -DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_PATCH=0
+    ELF_INCLUDES := external/elfutils/src/libelf
+  endif
+  ifeq ($(MESA_ANDROID_MAJOR_VERSION),7)
+    LOCAL_CFLAGS += -DHAVE_LLVM=0x0308 -DMESA_LLVM_VERSION_PATCH=0
+    ELF_INCLUDES := external/elfutils/libelf
+  endif
 endif
-LOCAL_CFLAGS_arm64 += -DUSE_AARCH64_ASM

 ifneq ($(LOCAL_IS_HOST_MODULE),true)
+# add libdrm if there are hardware drivers
+ifneq ($(filter-out swrast,$(MESA_GPU_DRIVERS)),)
 LOCAL_CFLAGS += -DHAVE_LIBDRM
 LOCAL_SHARED_LIBRARIES += libdrm
 endif
+endif

-LOCAL_CFLAGS_32 += -DDEFAULT_DRIVER_DIR=\"/vendor/lib/$(MESA_DRI_MODULE_REL_PATH)\"
-LOCAL_CFLAGS_64 += -DDEFAULT_DRIVER_DIR=\"/vendor/lib64/$(MESA_DRI_MODULE_REL_PATH)\"
-LOCAL_PROPRIETARY_MODULE := true
+LOCAL_CFLAGS_32 += -DDEFAULT_DRIVER_DIR=\"/system/lib/$(MESA_DRI_MODULE_REL_PATH)\"
+LOCAL_CFLAGS_64 += -DDEFAULT_DRIVER_DIR=\"/system/lib64/$(MESA_DRI_MODULE_REL_PATH)\"

 # uncomment to keep the debug symbols
 #LOCAL_STRIP_MODULE := false
--- a/Android.mk
+++ b/Android.mk
@@ -24,7 +24,7 @@
 # BOARD_GPU_DRIVERS should be defined.  The valid values are
 #
 #   classic drivers: i915 i965
-#   gallium drivers: swrast freedreno i915g nouveau kmsro r300g r600g radeonsi vc4 virgl vmwgfx etnaviv iris lima
+#   gallium drivers: swrast freedreno i915g nouveau r300g r600g radeonsi vc4 virgl vmwgfx
 #
 # The main target is libGLES_mesa.  For each classic driver enabled, a DRI
 # module will also be built.  DRI modules will be loaded by libGLES_mesa.
@@ -32,56 +32,27 @@
 MESA_TOP := $(call my-dir)

 MESA_ANDROID_MAJOR_VERSION := $(word 1, $(subst ., , $(PLATFORM_VERSION)))
-ifneq ($(filter 2 4, $(MESA_ANDROID_MAJOR_VERSION)),)
-$(error "Android 4.4 and earlier not supported")
-endif

 MESA_DRI_MODULE_REL_PATH := dri
 MESA_DRI_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/$(MESA_DRI_MODULE_REL_PATH)
 MESA_DRI_MODULE_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/$(MESA_DRI_MODULE_REL_PATH)
-MESA_DRI_LDFLAGS := -Wl,--build-id=sha1

 MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk
 MESA_PYTHON2 := python

-# Lists to convert driver names to boolean variables
-# in form of <driver name>.<boolean make variable>
-classic_drivers := i915.HAVE_I915_DRI i965.HAVE_I965_DRI
-gallium_drivers := \
-	swrast.HAVE_GALLIUM_SOFTPIPE \
-	freedreno.HAVE_GALLIUM_FREEDRENO \
-	i915g.HAVE_GALLIUM_I915 \
-	nouveau.HAVE_GALLIUM_NOUVEAU \
-	kmsro.HAVE_GALLIUM_KMSRO \
-	r300g.HAVE_GALLIUM_R300 \
-	r600g.HAVE_GALLIUM_R600 \
-	radeonsi.HAVE_GALLIUM_RADEONSI \
-	vmwgfx.HAVE_GALLIUM_VMWGFX \
-	vc4.HAVE_GALLIUM_VC4 \
-	virgl.HAVE_GALLIUM_VIRGL \
-	etnaviv.HAVE_GALLIUM_ETNAVIV \
-	iris.HAVE_GALLIUM_IRIS \
-	lima.HAVE_GALLIUM_LIMA
+classic_drivers := i915 i965
+gallium_drivers := swrast freedreno i915g nouveau r300g r600g radeonsi vmwgfx vc4 virgl

-ifeq ($(BOARD_GPU_DRIVERS),all)
-MESA_BUILD_CLASSIC := $(filter HAVE_%, $(subst ., , $(classic_drivers)))
-MESA_BUILD_GALLIUM := $(filter HAVE_%, $(subst ., , $(gallium_drivers)))
-else
-# Warn if we have any invalid driver names
-$(foreach d, $(BOARD_GPU_DRIVERS), \
-	$(if $(findstring $(d).,$(classic_drivers) $(gallium_drivers)), \
-		, \
-		$(warning invalid GPU driver: $(d)) \
-	) \
-)
-MESA_BUILD_CLASSIC := $(strip $(foreach d, $(BOARD_GPU_DRIVERS), $(patsubst $(d).%,%, $(filter $(d).%, $(classic_drivers)))))
-MESA_BUILD_GALLIUM := $(strip $(foreach d, $(BOARD_GPU_DRIVERS), $(patsubst $(d).%,%, $(filter $(d).%, $(gallium_drivers)))))
-endif
-ifeq ($(filter x86%,$(TARGET_ARCH)),)
-	MESA_BUILD_CLASSIC :=
-endif
+MESA_GPU_DRIVERS := $(strip $(BOARD_GPU_DRIVERS))

-$(foreach d, $(MESA_BUILD_CLASSIC) $(MESA_BUILD_GALLIUM), $(eval $(d) := true))
+# warn about invalid drivers
+invalid_drivers := $(filter-out \
+	$(classic_drivers) $(gallium_drivers), $(MESA_GPU_DRIVERS))
+ifneq ($(invalid_drivers),)
+$(warning invalid GPU drivers: $(invalid_drivers))
+# tidy up
+MESA_GPU_DRIVERS := $(filter-out $(invalid_drivers), $(MESA_GPU_DRIVERS))
+endif

 # host and target must be the same arch to generate matypes.h
 ifeq ($(TARGET_ARCH),$(HOST_ARCH))
@@ -90,27 +61,24 @@ else
 MESA_ENABLE_ASM := false
 endif

-ifneq ($(filter true, $(HAVE_GALLIUM_RADEONSI)),)
-MESA_ENABLE_LLVM := true
+ifneq ($(filter $(classic_drivers), $(MESA_GPU_DRIVERS)),)
+MESA_BUILD_CLASSIC := true
+else
+MESA_BUILD_CLASSIC := false
 endif

-define mesa-build-with-llvm
-  $(if $(filter $(MESA_ANDROID_MAJOR_VERSION), 4 5), \
-    $(warning Unsupported LLVM version in Android $(MESA_ANDROID_MAJOR_VERSION)),) \
-  $(if $(filter 6,$(MESA_ANDROID_MAJOR_VERSION)), \
-    $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0307 -DMESA_LLVM_VERSION_STRING=\"3.7\")) \
-  $(if $(filter 7,$(MESA_ANDROID_MAJOR_VERSION)), \
-    $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0308 -DMESA_LLVM_VERSION_STRING=\"3.8\")) \
-  $(if $(filter 8,$(MESA_ANDROID_MAJOR_VERSION)), \
-    $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_STRING=\"3.9\")) \
-  $(if $(filter P,$(MESA_ANDROID_MAJOR_VERSION)), \
-    $(eval LOCAL_CFLAGS += -DHAVE_LLVM=0x0309 -DMESA_LLVM_VERSION_STRING=\"3.9\")) \
-  $(eval LOCAL_SHARED_LIBRARIES += libLLVM)
-endef
+ifneq ($(filter $(gallium_drivers), $(MESA_GPU_DRIVERS)),)
+MESA_BUILD_GALLIUM := true
+else
+MESA_BUILD_GALLIUM := false
+endif
+
+MESA_ENABLE_LLVM := $(if $(filter radeonsi,$(MESA_GPU_DRIVERS)),true,false)

 # add subdirectories
+ifneq ($(strip $(MESA_GPU_DRIVERS)),)
+
 SUBDIRS := \
-	src/freedreno \
 	src/gbm \
 	src/loader \
 	src/mapi \
@@ -119,12 +87,16 @@ SUBDIRS := \
 	src/util \
 	src/egl \
 	src/amd \
-	src/broadcom \
 	src/intel \
 	src/mesa/drivers/dri \
-	src/vulkan \
-	src/panfrost \
+	src/vulkan

 INC_DIRS := $(call all-named-subdir-makefiles,$(SUBDIRS))
+
+ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)
 INC_DIRS += $(call all-named-subdir-makefiles,src/gallium)
+endif
+
 include $(INC_DIRS)
+
+endif
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -10,7 +10,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/STATIC_LIBRARIES/libmesa_*_interm
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/i9?5_dri_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/libglapi_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/libGLES_mesa_intermediates)
-$(call add-clean-step, rm -rf $(HOST_OUT)/*/EXECUTABLES/mesa_*_intermediates)
-$(call add-clean-step, rm -rf $(HOST_OUT)/*/EXECUTABLES/glsl_compiler_intermediates)
-$(call add-clean-step, rm -rf $(HOST_OUT)/*/STATIC_LIBRARIES/libmesa_*_intermediates)
+$(call add-clean-step, rm -rf $(HOST_OUT_release)/*/EXECUTABLES/mesa_*_intermediates)
+$(call add-clean-step, rm -rf $(HOST_OUT_release)/*/EXECUTABLES/glsl_compiler_intermediates)
+$(call add-clean-step, rm -rf $(HOST_OUT_release)/*/STATIC_LIBRARIES/libmesa_*_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/*/SHARED_LIBRARIES/*_dri_intermediates)
--- a/Makefile.am
+++ b/Makefile.am
@@ -0,0 +1,73 @@
+# Copyright © 2012 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+SUBDIRS = src
+
+AM_DISTCHECK_CONFIGURE_FLAGS = \
+	--enable-dri \
+	--enable-dri3 \
+	--enable-egl \
+	--enable-gallium-tests \
+	--enable-gallium-osmesa \
+	--enable-llvm \
+	--enable-gbm \
+	--enable-gles1 \
+	--enable-gles2 \
+	--enable-glx \
+	--enable-glx-tls \
+	--enable-nine \
+	--enable-opencl \
+	--enable-opengl \
+	--enable-va \
+	--enable-vdpau \
+	--enable-xa \
+	--enable-xvmc \
+	--enable-llvm-shared-libs \
+	--with-platforms=x11,wayland,drm,surfaceless \
+	--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast \
+	--with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,freedreno,svga,swrast,vc4,virgl,swr,etnaviv,imx \
+	--with-vulkan-drivers=intel,radeon
+
+ACLOCAL_AMFLAGS = -I m4
+
+EXTRA_DIST = \
+	autogen.sh \
+	common.py \
+	docs \
+	doxygen \
+	scons \
+	SConstruct
+
+noinst_HEADERS = \
+	include/c99_alloca.h \
+	include/c99_compat.h \
+	include/c99_math.h \
+	include/c11 \
+	include/D3D9 \
+	include/GL/wglext.h \
+	include/HaikuGL \
+	include/no_extern_c.h \
+	include/pci_ids
+
+# We list some directories in EXTRA_DIST, but don't actually want to include
+# the .gitignore files in the tarball.
+dist-hook:
+	find $(distdir) -name .gitignore -exec $(RM) {} +
--- a/README.rst
+++ b/README.rst
@@ -1,60 +0,0 @@
-`Mesa <https://mesa3d.org>`_ - The 3D Graphics Library
-======================================================
-
-
-Source
------
-
-This repository lives at https://gitlab.freedesktop.org/mesa/mesa.
-Other repositories are likely forks, and code found there is not supported.
-
-
-Build & install
---------------
-
-You can find more information in our documentation (`docs/install.html
-<https://mesa3d.org/install.html>`_), but the recommended way is to use
-Meson (`docs/meson.html <https://mesa3d.org/meson.html>`_):
-
-.. code-block:: sh
-
-  $ mkdir build
-  $ cd build
-  $ meson ..
-  $ sudo ninja install
-
-
-Support
-------
-
-Many Mesa devs hang on IRC; if you're not sure which channel is
-appropriate, you should ask your question on `Freenode's #dri-devel
-<irc://chat.freenode.net#dri-devel>`_, someone will redirect you if
-necessary.
-Remember that not everyone is in the same timezone as you, so it might
-take a while before someone qualified sees your question.
-To figure out who you're talking to, or which nick to ping for your
-question, check out `Who's Who on IRC
-<https://dri.freedesktop.org/wiki/WhosWho/>`_.
-
-The next best option is to ask your question in an email to the
-mailing lists: `mesa-dev\@lists.freedesktop.org
-<https://lists.freedesktop.org/mailman/listinfo/mesa-dev>`_
-
-
-Bug reports
-----------
-
-If you think something isn't working properly, please file a bug report
-(`docs/bugs.html <https://mesa3d.org/bugs.html>`_).
-
-
-Contributing
------------
-
-Contributions are welcome, and step-by-step instructions can be found in our
-documentation (`docs/submittingpatches.html
-<https://mesa3d.org/submittingpatches.html>`_).
-
-Note that Mesa uses email mailing-lists for patches submission, review and
-discussions.
--- a/31
+++ b/31
@@ -72,18 +72,7 @@ F: src/loader/

 EGL
 R: Eric Engestrom <eric@engestrom.ch>
-R: Emil Velikov <emil.l.velikov@gmail.com>
 F: src/egl/
-F: include/EGL/
-
-HAIKU
-R: Alexander von Gluck IV <kallisti5@unixzen.com>
-F: include/HaikuGL/
-F: src/egl/drivers/haiku/
-F: src/gallium/state_trackers/hgl/
-F: src/gallium/targets/haiku-softpipe/
-F: src/gallium/winsys/sw/hgl/
-F: src/hgl/

 GALLIUM LOADER
 R: Emil Velikov <emil.l.velikov@gmail.com>
@@ -94,6 +83,14 @@ GALLIUM TARGETS
 R: Emil Velikov <emil.l.velikov@gmail.com>
 F: src/gallium/targets/

+AUTOCONF BUILD
+R: Emil Velikov <emil.l.velikov@gmail.com>
+F: autogen.sh
+F: configure.ac
+F: */Automake.inc
+F: */Makefile.*am
+F: */Makefile.sources
+
 SCONS BUILD
 F: scons/
 F: */SConscript*
@@ -106,13 +103,6 @@ F: CleanSpec.mk
 F: */Android.*mk
 F: */Makefile.sources

-MESON BUILD
-R: Dylan Baker <dylan@pnwbakers.com>
-R: Eric Engestrom <eric@engestrom.ch>
-F: */meson.build
-F: meson.build
-F: meson_options.txt
-
 ANDROID EGL SUPPORT
 R: Rob Herring <robh@kernel.org>
 R: Tomasz Figa <tfiga@chromium.org>
@@ -130,8 +120,3 @@ F:	src/gallium/drivers/freedreno/
 GLX
 R: Adam Jackson <ajax@redhat.com>
 F: src/glx/
-
-VULKAN
-R: Eric Engestrom <eric@engestrom.ch>
-F: src/vulkan/
-F: include/vulkan/
--- a/20
+++ b/20
@@ -27,13 +27,6 @@ import SCons.Util

 import common

-#######################################################################
-# Minimal scons version
-
-EnsureSConsVersion(2, 4)
-EnsurePythonVersion(2, 7)
-
-
 #######################################################################
 # Configuration options

@@ -57,10 +50,10 @@ except KeyError:
    pass
 else:
    targets = targets.split(',')
-    print('scons: warning: targets option is deprecated; pass the targets on their own such as')
-    print()
-    print('  scons %s' % ' '.join(targets))
-    print()
+    print 'scons: warning: targets option is deprecated; pass the targets on their own such as'
+    print
+    print '  scons %s' % ' '.join(targets)
+    print
    COMMAND_LINE_TARGETS.append(targets)


@@ -73,7 +66,7 @@ with open("VERSION") as f:
  mesa_version = f.read().strip()
 env.Append(CPPDEFINES = [
    ('PACKAGE_VERSION', '\\"%s\\"' % mesa_version),
-    ('PACKAGE_BUGREPORT', '\\"https://gitlab.freedesktop.org/mesa/mesa/issues\\"'),
+    ('PACKAGE_BUGREPORT', '\\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\\"'),
 ])

 # Includes
@@ -159,7 +152,8 @@ try:
 except ImportError:
    pass
 else:
-    aliases = sorted(default_ans.keys())
+    aliases = default_ans.keys()
+    aliases.sort()
    env.Help('\n')
    env.Help('Recognized targets:\n')
    for alias in aliases:
--- a/2
+++ b/2
@@ -1 +1 @@
-19.2.8
+17.1.2
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -33,41 +33,31 @@ branches:
 # - https://www.appveyor.com/blog/2014/06/04/shallow-clone-for-git-repositories
 clone_depth: 100

-# https://www.appveyor.com/docs/build-cache/
 cache:
- '%LOCALAPPDATA%\pip\Cache -> appveyor.yml'
- win_flex_bison-2.5.15.zip
- llvm-5.0.1-msvc2017-mtd.7z
+- win_flex_bison-2.5.9.zip
+- llvm-3.3.1-msvc2013-mtd.7z

-os: Visual Studio 2017
-
-init:
-# Appveyor defaults core.autocrlf to input instead of the default (true), but
-# that can hide problems processing CRLF text on Windows
- git config --global core.autocrlf true
+os: Visual Studio 2013

 environment:
-  WINFLEXBISON_VERSION: 2.5.15
-  LLVM_ARCHIVE: llvm-5.0.1-msvc2017-mtd.7z
+  WINFLEXBISON_ARCHIVE: win_flex_bison-2.5.9.zip
+  LLVM_ARCHIVE: llvm-3.3.1-msvc2013-mtd.7z

 install:
-# Check git config
- git config core.autocrlf
 # Check pip
 - python --version
 - python -m pip --version
 # Install Mako
- python -m pip install Mako==1.0.7
+- python -m pip install Mako==1.0.6
 # Install pywin32 extensions, needed by SCons
 - python -m pip install pypiwin32
 # Install python wheels, necessary to install SCons via pip
 - python -m pip install wheel
 # Install SCons
- python -m pip install scons==3.0.1
+- python -m pip install scons==2.5.1
 - scons --version
 # Install flex/bison
- set WINFLEXBISON_ARCHIVE=win_flex_bison-%WINFLEXBISON_VERSION%.zip
- if not exist "%WINFLEXBISON_ARCHIVE%" appveyor DownloadFile "https://github.com/lexxmark/winflexbison/releases/download/v%WINFLEXBISON_VERSION%/%WINFLEXBISON_ARCHIVE%"
+- if not exist "%WINFLEXBISON_ARCHIVE%" appveyor DownloadFile "https://downloads.sourceforge.net/project/winflexbison/old_versions/%WINFLEXBISON_ARCHIVE%"
 - 7z x -y -owinflexbison\ "%WINFLEXBISON_ARCHIVE%" > nul
 - set Path=%CD%\winflexbison;%Path%
 - win_flex --version
@@ -79,10 +69,10 @@ install:
 - set LLVM=%CD%\llvm

 build_script:
- scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=14.1 llvm=1
+- scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=12.0 llvm=1

 after_build:
- scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=14.1 llvm=1 check
+- scons -j%NUMBER_OF_PROCESSORS% MSVC_VERSION=12.0 llvm=1 check


 # It's possible to setup notification here, as described in
--- a/autogen.sh
+++ b/autogen.sh
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+srcdir=`dirname "$0"`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd "$srcdir"
+
+autoreconf --force --verbose --install || exit 1
+cd "$ORIGDIR" || exit $?
+
+if test -z "$NOCONFIGURE"; then
+    "$srcdir"/configure "$@"
+fi
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -1,51 +1,4 @@
-# warnings that are not useful
-da5ebe30105f70e3520ce3ae145793b755552569
-6b8cb087568699ca9a6e9e8b7bf49179e622b59f
-
-# Jason doesn't want this applied to 19.2 (it's a revert)
-d15fe8ca8262d502435c4f83985ac414f950bc5f
-
-# This doesn't apply to 19.2
-f833b4cada07b746a10ffa4d93fcd821920c3cb1
-d2db43fcad6a2ea2070ff5f7884411f4b7d3925c
-66f2aa6ccd0b226eebe2c1a46281160b0a54d522
-
-# The author requested that this not be applied to 19.2
-dcc0e23438f3e5929c2ef74d57e8207be25ecb41
-
-# This doesn't apply cleanly, and no one really cares about this file on stable
-# branches anyway.
-bcd9224728dcb8d8fe4bcddc4bd9b2c36fcfe9dd
-
-# De-nominated by its author due to alternate fix not being backported
-43041627445540afda1a05d11861935963660344
-
-# This is immediately reverted, so just don't apply
-19546108d3dd5541a189e36df4ea83b3f519e48f
-
-# The authors requested these not be applied to 19.2
-869e32593a9096b845dd6106f8f86e1c41fac968
-a2c3c65a31de90fdb55f76f2894860dfbafe2043
-bb0c5c487e63e88acbb792f092dd8f392bad8540
-937b9055698be0dfdb7d2e0673a989e2ecc05912
-21376cffb37018160ad3eef38b5a640ba1675a4f
-
-# This is reverted shortly after it was landed
-4432a2d14d80081d062f7939a950d65ea3a16eed
-
-# These aren't relevant for 19.2
-1a05811936dd8d0c3a367c6f00629624ef39d537
-911a8261419f48dcd756f78832fa5a5f4c5b8d93
-
-# This was manually backported
-2afeed301010917c4eae55dcd2544f9d329df934
-4b392ced2d744fccffe95490ff57e6b41033c266
-
-# This is not being backported to 19.2 due to causing build regressions for
-# downstream projects
-eaf43966027cf9654e91ca57aecc8f5a65b58f49
-
-# Invalid sha warnings
-023282a4f667695ea1dbbe9fbe1cd3a9d550a426
-2fca325ea65f068043d4c18c9cd0fe7f25bde8f7
-7564c5fc6d79a2ddec49a19f67183fb3be799fe5
+# This commit depends on 9fd9a7d0ba3 and 678d568c7b2, neither of which is in branch.
+b84b631c6381d9b36bca5d0e7cc67dd23af188c1 radeonsi: load patch_id for TES-as-ES when exporting for PS
+# This commit addressed an earlier commit 126d5ad which did not land in branch.
+9da104593386f6e8ddec8f0d9d288aceb8908fe1 radv: fix regression in descriptor set freeing.
--- a/bin/.editorconfig
+++ b/bin/.editorconfig
@@ -1,2 +1,3 @@
 [*.sh]
-indent_style = tab
+indent_style = space
+indent_size = 2
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -0,0 +1,9 @@
+config.guess
+config.sub
+install-sh
+/depcomp
+/missing
+ylwrap
+compile
+ar-lib
+/test-driver
--- a/bin/init.py
+++ b/bin/init.py
--- a/bin/bugzilla_mesa.sh
+++ b/bin/bugzilla_mesa.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+# This script is used to generate the list of fixed bugs that
+# appears in the release notes files, with HTML formatting.
+#
+# Note: This script could take a while until all details have
+#       been fetched from bugzilla.
+#
+# Usage examples:
+#
+# $ bin/bugzilla_mesa.sh mesa-9.0.2..mesa-9.0.3
+# $ bin/bugzilla_mesa.sh mesa-9.0.2..mesa-9.0.3 > bugfixes
+# $ bin/bugzilla_mesa.sh mesa-9.0.2..mesa-9.0.3 | tee bugfixes
+
+
+# regex pattern: trim before bug number
+trim_before='s/.*show_bug.cgi?id=\([0-9]*\).*/\1/'
+
+# regex pattern: reconstruct the url
+use_after='s,^,https://bugs.freedesktop.org/show_bug.cgi?id=,'
+
+echo "<ul>"
+echo ""
+
+# extract fdo urls from commit log
+git log $* | grep 'bugs.freedesktop.org/show_bug' | sed -e $trim_before | sort -n -u | sed -e $use_after |\
+while read url
+do
+	id=$(echo $url | cut -d'=' -f2)
+	summary=$(wget --quiet -O - $url | grep -e '<title>.*</title>' | sed -e 's/ *<title>[0-9]\+ &ndash; \(.*\)<\/title>/\1/')
+	echo "<li><a href=\"$url\">Bug $id</a> - $summary</li>"
+	echo ""
+done
+
+echo "</ul>"
--- a/bin/gen_release_notes.py
+++ b/bin/gen_release_notes.py
@@ -1,272 +0,0 @@
-#!/usr/bin/env python3
-# Copyright © 2019 Intel Corporation
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-"""Generates release notes for a given version of mesa."""
-
-import asyncio
-import datetime
-import os
-import pathlib
-import sys
-import textwrap
-import typing
-import urllib.parse
-
-import aiohttp
-from mako.template import Template
-from mako import exceptions
-
-
-CURRENT_GL_VERSION = '4.5'
-CURRENT_VK_VERSION = '1.1'
-
-TEMPLATE = Template(textwrap.dedent("""\
-    <%!
-        import html
-    %>
-    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-    <html lang="en">
-    <head>
-    <meta http-equiv="content-type" content="text/html; charset=utf-8">
-    <title>Mesa Release Notes</title>
-    <link rel="stylesheet" type="text/css" href="../mesa.css">
-    </head>
-    <body>
-
-    <div class="header">
-    <h1>The Mesa 3D Graphics Library</h1>
-    </div>
-
-    <iframe src="../contents.html"></iframe>
-    <div class="content">
-
-    <h1>Mesa ${next_version} Release Notes / ${today}</h1>
-
-    <p>
-    %if not bugfix:
-        Mesa ${next_version} is a new development release. People who are concerned
-        with stability and reliability should stick with a previous release or
-        wait for Mesa ${version[:-1]}1.
-    %else:
-        Mesa ${next_version} is a bug fix release which fixes bugs found since the ${version} release.
-    %endif
-    </p>
-    <p>
-    Mesa ${next_version} implements the OpenGL ${gl_version} API, but the version reported by
-    glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) /
-    glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used.
-    Some drivers don't support all the features required in OpenGL ${gl_version}. OpenGL
-    ${gl_version} is <strong>only</strong> available if requested at context creation.
-    Compatibility contexts may report a lower version depending on each driver.
-    </p>
-    <p>
-    Mesa ${next_version} implements the Vulkan ${vk_version} API, but the version reported by
-    the apiVersion property of the VkPhysicalDeviceProperties struct
-    depends on the particular driver being used.
-    </p>
-
-    <h2>SHA256 checksum</h2>
-    <pre>
-    TBD.
-    </pre>
-
-
-    <h2>New features</h2>
-
-    <ul>
-    %for f in features:
-        <li>${html.escape(f)}</li>
-    %endfor
-    </ul>
-
-    <h2>Bug fixes</h2>
-
-    <ul>
-    %for b in bugs:
-        <li>${html.escape(b)}</li>
-    %endfor
-    </ul>
-
-    <h2>Changes</h2>
-
-    <ul>
-    %for c, author in changes:
-      %if author:
-        <p>${html.escape(c)}</p>
-      %else:
-        <li>${html.escape(c)}</li>
-      %endif
-    %endfor
-    </ul>
-
-    </div>
-    </body>
-    </html>
-    """))
-
-
-async def gather_commits(version: str) -> str:
-    p = await asyncio.create_subprocess_exec(
-        'git', 'log', f'mesa-{version}..', '--grep', r'Closes: \(https\|#\).*',
-        stdout=asyncio.subprocess.PIPE)
-    out, _ = await p.communicate()
-    assert p.returncode == 0, f"git log didn't work: {version}"
-    return out.decode().strip()
-
-
-async def gather_bugs(version: str) -> typing.List[str]:
-    commits = await gather_commits(version)
-
-    issues: typing.List[str] = []
-    for commit in commits.split('\n'):
-        sha, message = commit.split(maxsplit=1)
-        p = await asyncio.create_subprocess_exec(
-            'git', 'log', '--max-count', '1', r'--format=%b', sha,
-            stdout=asyncio.subprocess.PIPE)
-        _out, _ = await p.communicate()
-        out = _out.decode().split('\n')
-        for line in reversed(out):
-            if line.startswith('Closes:'):
-                bug = line.lstrip('Closes:').strip()
-                break
-        else:
-            raise Exception('No closes found?')
-        if bug.startswith('h'):
-            # This means we have a bug in the form "Closes: https://..."
-            issues.append(os.path.basename(urllib.parse.urlparse(bug).path))
-        else:
-            issues.append(bug.lstrip('#'))
-
-    loop = asyncio.get_event_loop()
-    async with aiohttp.ClientSession(loop=loop) as session:
-        results = await asyncio.gather(*[get_bug(session, i) for i in issues])
-    typing.cast(typing.Tuple[str, ...], results)
-    return list(results)
-
-
-async def get_bug(session: aiohttp.ClientSession, bug_id: str) -> str:
-    """Query gitlab to get the name of the issue that was closed."""
-    # Mesa's gitlab id is 176,
-    url = 'https://gitlab.freedesktop.org/api/v4/projects/176/issues'
-    params = {'iids[]': bug_id}
-    async with session.get(url, params=params) as response:
-        content = await response.json()
-    return content[0]['title']
-
-
-async def get_shortlog(version: str) -> str:
-    """Call git shortlog."""
-    p = await asyncio.create_subprocess_exec('git', 'shortlog', f'mesa-{version}..',
-                                             stdout=asyncio.subprocess.PIPE)
-    out, _ = await p.communicate()
-    assert p.returncode == 0, 'error getting shortlog'
-    assert out is not None, 'just for mypy'
-    return out.decode()
-
-
-def walk_shortlog(log: str) -> typing.Generator[typing.Tuple[str, bool], None, None]:
-    for l in log.split('\n'):
-        if l.startswith(' '): # this means we have a patch description
-            yield l, False
-        else:
-            yield l, True
-
-
-def calculate_next_version(version: str, is_point: bool) -> str:
-    """Calculate the version about to be released."""
-    if '-' in version:
-        version = version.split('-')[0]
-    if is_point:
-        base = version.split('.')
-        base[2] = str(int(base[2]) + 1)
-        return '.'.join(base)
-    return version
-
-
-def calculate_previous_version(version: str, is_point: bool) -> str:
-    """Calculate the previous version to compare to.
-
-    In the case of -rc to final that verison is the previous .0 release,
-    (19.3.0 in the case of 20.0.0, for example). for point releases that is
-    the last point release. This value will be the same as the input value
-    for a point release, but different for a major release.
-    """
-    if '-' in version:
-        version = version.split('-')[0]
-    if is_point:
-        return version
-    base = version.split('.')
-    if base[1] == '0':
-        base[0] = str(int(base[0]) - 1)
-        base[1] = '3'
-    else:
-        base[1] = str(int(base[1]) - 1)
-    return '.'.join(base)
-
-
-def get_features(is_point_release: bool) -> typing.Generator[str, None, None]:
-    p = pathlib.Path(__file__).parent.parent / 'docs' / 'relnotes' / 'new_features.txt'
-    if p.exists():
-        if is_point_release:
-            print("WARNING: new features being introduced in a point release", file=sys.stderr)
-        with p.open('rt') as f:
-            for line in f:
-                yield line
-    else:
-        yield "None"
-
-
-async def main() -> None:
-    v = pathlib.Path(__file__).parent.parent / 'VERSION'
-    with v.open('rt') as f:
-        raw_version = f.read().strip()
-    is_point_release = '-rc' not in raw_version
-    assert '-devel' not in raw_version, 'Do not run this script on -devel'
-    version = raw_version.split('-')[0]
-    previous_version = calculate_previous_version(version, is_point_release)
-    next_version = calculate_next_version(version, is_point_release)
-
-    shortlog, bugs = await asyncio.gather(
-        get_shortlog(previous_version),
-        gather_bugs(previous_version),
-    )
-
-    final = pathlib.Path(__file__).parent.parent / 'docs' / 'relnotes' / f'{next_version}.html'
-    with final.open('wt') as f:
-        try:
-            f.write(TEMPLATE.render(
-                bugfix=is_point_release,
-                bugs=bugs,
-                changes=walk_shortlog(shortlog),
-                features=get_features(is_point_release),
-                gl_version=CURRENT_GL_VERSION,
-                next_version=next_version,
-                today=datetime.date.today(),
-                version=previous_version,
-                vk_version=CURRENT_VK_VERSION,
-            ))
-        except:
-            print(exceptions.text_error_template().render())
-
-
-if __name__ == "__main__":
-    loop = asyncio.get_event_loop()
-    loop.run_until_complete(main())
--- a/bin/gen_release_notes_test.py
+++ b/bin/gen_release_notes_test.py
@@ -1,62 +0,0 @@
-# Copyright © 2019 Intel Corporation
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-from unittest import mock
-
-import pytest
-
-from .gen_release_notes import *
-
-
-@pytest.mark.parametrize(
-    'current, is_point, expected',
-    [
-        ('19.2.0', True, '19.2.1'),
-        ('19.3.6', True, '19.3.7'),
-        ('20.0.0-rc4', False, '20.0.0'),
-    ])
-def test_next_version(current: str, is_point: bool, expected: str) -> None:
-    assert calculate_next_version(current, is_point) == expected
-
-
-@pytest.mark.parametrize(
-    'current, is_point, expected',
-    [
-        ('19.3.6', True, '19.3.6'),
-        ('20.0.0-rc4', False, '19.3.0'),
-    ])
-def test_previous_version(current: str, is_point: bool, expected: str) -> None:
-    assert calculate_previous_version(current, is_point) == expected
-
-
-@pytest.mark.asyncio
-async def test_get_shortlog():
-    # Certainly not perfect, but it's something
-    version = '19.2.0'
-    out = await get_shortlog(version)
-    assert out
-
-
-@pytest.mark.asyncio
-async def test_gather_commits():
-    # Certainly not perfect, but it's something
-    version = '19.2.0'
-    out = await gather_commits(version)
-    assert out
--- a/bin/get-fixes-pick-list.sh
+++ b/bin/get-fixes-pick-list.sh
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# Script for generating a list of candidates [referenced by a Fixes tag] for
+# cherry-picking to a stable branch
+#
+# Usage examples:
+#
+# $ bin/get-fixes-pick-list.sh
+# $ bin/get-fixes-pick-list.sh > picklist
+# $ bin/get-fixes-pick-list.sh | tee picklist
+
+# Use the last branchpoint as our limit for the search
+latest_branchpoint=`git merge-base origin/master HEAD`
+
+# List all the commits between day 1 and the branch point...
+git log --reverse --pretty=%H $latest_branchpoint > already_landed
+
+# ... and the ones cherry-picked.
+git log --reverse --grep="cherry picked from commit" $latest_branchpoint..HEAD |\
+	grep "cherry picked from commit" |\
+	sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//'  > already_picked
+
+# Grep for commits with Fixes tag
+git log --reverse --pretty=%H -i --grep="fixes:" $latest_branchpoint..origin/master |\
+while read sha
+do
+	# Check to see whether the patch is on the ignore list ...
+	if [ -f bin/.cherry-ignore ] ; then
+		if grep -q ^$sha bin/.cherry-ignore ; then
+			continue
+		fi
+	fi
+
+	# Skip if it has been already cherry-picked.
+	if grep -q ^$sha already_picked ; then
+		continue
+	fi
+
+	# For each one try to extract the tag
+	fixes_count=`git show $sha | grep -i "fixes:" | wc -l`
+	warn=`(test $fixes_count -gt 1 && echo $fixes_count) || echo 0`
+	while [ $fixes_count -gt 0 ] ; do
+		fixes=`git show $sha | grep -i "fixes:" | tail -n $fixes_count`
+		fixes_count=$(($fixes_count-1))
+		# The following sed/cut combination is borrowed from GregKH
+		id=`echo ${fixes} | sed -e 's/^[ \t]*//' | cut -f 2 -d ':' | sed -e 's/^[ \t]*//' | cut -f 1 -d ' '`
+
+		# Bail out if we cannot find suitable id.
+		# Any specific validation the $id is valid and not some junk, is
+		# implied with the follow up code
+		if [ "x$id" = x ] ; then
+			continue
+		fi
+
+		# Check if the offending commit is in branch.
+
+		# Be that cherry-picked ...
+		# ... or landed before the branchpoint.
+		if grep -q ^$id already_picked ||
+		   grep -q ^$id already_landed ; then
+
+			printf "Commit \"%s\" fixes %s\n" \
+			       "`git log -n1 --pretty=oneline $sha`" \
+			       "$id"
+			warn=$(($warn-1))
+		fi
+
+	done
+
+	if [ $warn -gt 0 ] ; then
+		printf "WARNING: Commit \"%s\" has more than one Fixes tag\n" \
+		       "`git log -n1 --pretty=oneline $sha`"
+	fi
+
+done
+
+rm -f already_picked
+rm -f already_landed
--- a/bin/get-pick-list.sh
+++ b/bin/get-pick-list.sh
@@ -7,107 +7,21 @@
 # $ bin/get-pick-list.sh
 # $ bin/get-pick-list.sh > picklist
 # $ bin/get-pick-list.sh | tee picklist
-#
-# The output is as follows:
-# [nomination_type] commit_sha commit summary
-
-is_stable_nomination()
-{
-	git show --pretty=medium --summary "$1" | grep -q -i -o "CC:.*mesa-stable"
-}
-
-is_typod_nomination()
-{
-	git show --pretty=medium --summary "$1" | grep -q -i -o "CC:.*mesa-dev"
-}
-
-fixes=
-
-# Helper to handle various mistypos of the fixes tag.
-# The tag string itself is passed as argument and normalised within.
-#
-# Resulting string in the global variable "fixes" and contains entries
-# in the form "fixes:$sha"
-is_sha_nomination()
-{
-	fixes=`git show --pretty=medium -s $1 | tr -d "\n" | \
-		sed -e 's/'"$2"'/\nfixes:/Ig' | \
-		grep -Eo 'fixes:[a-f0-9]{4,40}'`
-
-	fixes_count=`echo "$fixes" | grep "fixes:" | wc -l`
-	if test $fixes_count -eq 0; then
-		return 1
-	fi
-
-	# Throw a warning for each invalid sha
-	while test $fixes_count -gt 0; do
-		# Treat only the current line
-		id=`echo "$fixes" | tail -n $fixes_count | head -n 1 | cut -d : -f 2`
-		fixes_count=$(($fixes_count-1))
-		if ! git show $id >/dev/null 2>&1; then
-			echo WARNING: Commit $1 lists invalid sha $id
-		fi
-	done
-
-	return 0
-}
-
-# Checks if at least one of offending commits, listed in the global
-# "fixes", is in branch.
-sha_in_range()
-{
-	fixes_count=`echo "$fixes" | grep "fixes:" | wc -l`
-	while test $fixes_count -gt 0; do
-		# Treat only the current line
-		id=`echo "$fixes" | tail -n $fixes_count | head -n 1 | cut -d : -f 2`
-		fixes_count=$(($fixes_count-1))
-
-		# Be that cherry-picked ...
-		# ... or landed before the branchpoint.
-		if grep -q ^$id already_picked ||
-		   grep -q ^$id already_landed ; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-is_fixes_nomination()
-{
-	is_sha_nomination "$1" "fixes:[[:space:]]*"
-	if test $? -eq 0; then
-		return 0
-	fi
-	is_sha_nomination "$1" "fixes[[:space:]]\+"
-}
-
-is_brokenby_nomination()
-{
-	is_sha_nomination "$1" "broken by"
-}
-
-is_revert_nomination()
-{
-	is_sha_nomination "$1" "This reverts commit "
-}

 # Use the last branchpoint as our limit for the search
-latest_branchpoint=`git merge-base upstream/master HEAD`
+latest_branchpoint=`git merge-base origin/master HEAD`

-# List all the commits between day 1 and the branch point...
-git log --reverse --pretty=%H $latest_branchpoint > already_landed
-
-# ... and the ones cherry-picked.
-git log --reverse --pretty=medium --grep="cherry picked from commit" $latest_branchpoint..HEAD |\
+# Grep for commits with "cherry picked from commit" in the commit message.
+git log --reverse --grep="cherry picked from commit" $latest_branchpoint..HEAD |\
 	grep "cherry picked from commit" |\
 	sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked

-# Grep for potential candidates
-git log --reverse --pretty=%H -i --grep='^CC:.*mesa-stable\|^CC:.*mesa-dev\|\<fixes\>\|\<broken by\>\|This reverts commit' $latest_branchpoint..upstream/master |\
+# Grep for commits that were marked as a candidate for the stable tree.
+git log --reverse --pretty=%H -i --grep='^CC:.*mesa-stable' $latest_branchpoint..origin/master |\
 while read sha
 do
 	# Check to see whether the patch is on the ignore list.
-	if test -f bin/.cherry-ignore; then
+	if [ -f bin/.cherry-ignore ] ; then
 		if grep -q ^$sha bin/.cherry-ignore ; then
 			continue
 		fi
@@ -118,33 +32,7 @@ do
 		continue
 	fi

-	if is_fixes_nomination "$sha"; then
-		tag=fixes
-	elif is_brokenby_nomination "$sha"; then
-		tag=brokenby
-	elif is_revert_nomination "$sha"; then
-		tag=revert
-	elif is_stable_nomination "$sha"; then
-		tag=stable
-	elif is_typod_nomination "$sha"; then
-		tag=typod
-	else
-		continue
-	fi
-
-	case "$tag" in
-	fixes | brokenby | revert )
-		if ! sha_in_range; then
-			continue
-		fi
-		;;
-	* )
-		;;
-	esac
-
-	printf "[ %8s ] " "$tag"
-	git --no-pager show --no-patch --pretty=oneline $sha
+	git log -n1 --pretty=oneline $sha | cat
 done

 rm -f already_picked
-rm -f already_landed
--- a/bin/get-typod-pick-list.sh
+++ b/bin/get-typod-pick-list.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+# Script for generating a list of candidates which have typos in the nomination line
+#
+# Usage examples:
+#
+# $ bin/get-typod-pick-list.sh
+# $ bin/get-typod-pick-list.sh > picklist
+# $ bin/get-typod-pick-list.sh | tee picklist
+
+# NB:
+# This script intentionally _never_ checks for specific version tag
+# Should we consider folding it with the original get-pick-list.sh
+
+# Use the last branchpoint as our limit for the search
+latest_branchpoint=`git merge-base origin/master HEAD`
+
+# Grep for commits with "cherry picked from commit" in the commit message.
+git log --reverse --grep="cherry picked from commit" $latest_branchpoint..HEAD |\
+	grep "cherry picked from commit" |\
+	sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
+
+# Grep for commits that were marked as a candidate for the stable tree.
+git log --reverse --pretty=%H -i --grep='^CC:.*mesa-dev' $latest_branchpoint..origin/master |\
+while read sha
+do
+	# Check to see whether the patch is on the ignore list.
+	if [ -f bin/.cherry-ignore ] ; then
+		if grep -q ^$sha bin/.cherry-ignore ; then
+			continue
+		fi
+	fi
+
+	# Check to see if it has already been picked over.
+	if grep -q ^$sha already_picked ; then
+		continue
+	fi
+
+	git log -n1 --pretty=oneline $sha | cat
+done
+
+rm -f already_picked
--- a/bin/git_sha1_gen.py
+++ b/bin/git_sha1_gen.py
@@ -1,50 +0,0 @@
-"""
-Generate the contents of the git_sha1.h file.
-The output of this script goes to stdout.
-"""
-
-
-import argparse
-import os
-import os.path
-import subprocess
-import sys
-
-
-def get_git_sha1():
-    """Try to get the git SHA1 with git rev-parse."""
-    git_dir = os.path.join(os.path.dirname(sys.argv[0]), '..', '.git')
-    try:
-        git_sha1 = subprocess.check_output([
-            'git',
-            '--git-dir=' + git_dir,
-            'rev-parse',
-            'HEAD',
-        ], stderr=open(os.devnull, 'w')).decode("ascii")
-    except:
-        # don't print anything if it fails
-        git_sha1 = ''
-    return git_sha1
-
-def write_if_different(contents):
-    """
-    Avoid touching the output file if it doesn't need modifications
-    Useful to avoid triggering rebuilds when nothing has changed.
-    """
-    if os.path.isfile(args.output):
-        with open(args.output, 'r') as file:
-            if file.read() == contents:
-                return
-    with open(args.output, 'w') as file:
-        file.write(contents)
-
-parser = argparse.ArgumentParser()
-parser.add_argument('--output', help='File to write the #define in',
-                    required=True)
-args = parser.parse_args()
-
-git_sha1 = os.environ.get('MESA_GIT_SHA1_OVERRIDE', get_git_sha1())[:10]
-if git_sha1:
-    write_if_different('#define MESA_GIT_SHA1 " (git-' + git_sha1 + ')"')
-else:
-    write_if_different('#define MESA_GIT_SHA1 ""')
--- a/bin/install_megadrivers.py
+++ b/bin/install_megadrivers.py
@@ -1,83 +0,0 @@
-# encoding=utf-8
-# Copyright © 2017-2018 Intel Corporation
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-"""Script to install megadriver symlinks for meson."""
-
-from __future__ import print_function
-import argparse
-import os
-
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('megadriver')
-    parser.add_argument('libdir')
-    parser.add_argument('drivers', nargs='+')
-    args = parser.parse_args()
-
-    if os.path.isabs(args.libdir):
-        destdir = os.environ.get('DESTDIR')
-        if destdir:
-            to = os.path.join(destdir, args.libdir[1:])
-        else:
-            to = args.libdir
-    else:
-        to = os.path.join(os.environ['MESON_INSTALL_DESTDIR_PREFIX'], args.libdir)
-
-    master = os.path.join(to, os.path.basename(args.megadriver))
-
-    if not os.path.exists(to):
-        if os.path.lexists(to):
-            os.unlink(to)
-        os.makedirs(to)
-
-    for driver in args.drivers:
-        abs_driver = os.path.join(to, driver)
-
-        if os.path.lexists(abs_driver):
-            os.unlink(abs_driver)
-        print('installing {} to {}'.format(args.megadriver, abs_driver))
-        os.link(master, abs_driver)
-
-        try:
-            ret = os.getcwd()
-            os.chdir(to)
-
-            name, ext = os.path.splitext(driver)
-            while ext != '.so':
-                if os.path.lexists(name):
-                    os.unlink(name)
-                os.symlink(driver, name)
-                name, ext = os.path.splitext(name)
-        finally:
-            os.chdir(ret)
-
-    # Remove meson-created master .so and symlinks
-    os.unlink(master)
-    name, ext = os.path.splitext(master)
-    while ext != '.so':
-        if os.path.lexists(name):
-            os.unlink(name)
-        name, ext = os.path.splitext(name)
-
-
-if __name__ == '__main__':
-    main()
--- a/bin/meson-cmd-extract.py
+++ b/bin/meson-cmd-extract.py
@@ -1,88 +0,0 @@
-#!/usr/bin/env python3
-# Copyright © 2019 Intel Corporation
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-"""This script reads a meson build directory and gives back the command line it
-was configured with.
-
-This only works for meson 0.49.0 and newer.
-"""
-
-import argparse
-import ast
-import configparser
-import pathlib
-import sys
-
-
-def parse_args() -> argparse.Namespace:
-    """Parse arguments."""
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        'build_dir',
-        help='Path the meson build directory')
-    args = parser.parse_args()
-    return args
-
-
-def load_config(path: pathlib.Path) -> configparser.ConfigParser:
-    """Load config file."""
-    conf = configparser.ConfigParser()
-    with path.open() as f:
-        conf.read_file(f)
-    return conf
-
-
-def build_cmd(conf: configparser.ConfigParser) -> str:
-    """Rebuild the command line."""
-    args = []
-    for k, v in conf['options'].items():
-        if ' ' in v:
-            args.append(f'-D{k}="{v}"')
-        else:
-            args.append(f'-D{k}={v}')
-
-    cf = conf['properties'].get('cross_file')
-    if cf:
-        args.append('--cross-file={}'.format(cf))
-    nf = conf['properties'].get('native_file')
-    if nf:
-        # this will be in the form "['str', 'str']", so use ast.literal_eval to
-        # convert it to a list of strings.
-        nf = ast.literal_eval(nf)
-        args.extend(['--native-file={}'.format(f) for f in nf])
-    return ' '.join(args)
-
-
-def main():
-    args = parse_args()
-    path = pathlib.Path(args.build_dir, 'meson-private', 'cmd_line.txt')
-    if not path.exists():
-        print('Cannot find the necessary file to rebuild command line. '
-              'Is your meson version >= 0.49.0?', file=sys.stderr)
-        sys.exit(1)
-
-    conf = load_config(path)
-    cmd = build_cmd(conf)
-    print(cmd)
-
-
-if __name__ == '__main__':
-    main()
--- a/bin/meson-options.py
+++ b/bin/meson-options.py
@@ -1,63 +0,0 @@
-#!/usr/bin/env python3
-
-from os import get_terminal_size
-from textwrap import wrap
-from mesonbuild import coredata
-from mesonbuild import optinterpreter
-
-(COLUMNS, _) = get_terminal_size()
-
-def describe_option(option_name: str, option_default_value: str,
-                    option_type: str, option_message: str) -> None:
-    print('name:    ' + option_name)
-    print('default: ' + option_default_value)
-    print('type:    ' + option_type)
-    for line in wrap(option_message, width=COLUMNS - 9):
-        print('         ' + line)
-    print('---')
-
-oi = optinterpreter.OptionInterpreter('')
-oi.process('meson_options.txt')
-
-for (name, value) in oi.options.items():
-    if isinstance(value, coredata.UserStringOption):
-        describe_option(name,
-                        value.value,
-                        'string',
-                        "You can type what you want, but make sure it makes sense")
-    elif isinstance(value, coredata.UserBooleanOption):
-        describe_option(name,
-                        'true' if value.value else 'false',
-                        'boolean',
-                        "You can set it to 'true' or 'false'")
-    elif isinstance(value, coredata.UserIntegerOption):
-        describe_option(name,
-                        str(value.value),
-                        'integer',
-                        "You can set it to any integer value between '{}' and '{}'".format(value.min_value, value.max_value))
-    elif isinstance(value, coredata.UserUmaskOption):
-        describe_option(name,
-                        str(value.value),
-                        'umask',
-                        "You can set it to 'preserve' or a value between '0000' and '0777'")
-    elif isinstance(value, coredata.UserComboOption):
-        choices = '[' + ', '.join(["'" + v + "'" for v in value.choices]) + ']'
-        describe_option(name,
-                        value.value,
-                        'combo',
-                        "You can set it to any one of those values: " + choices)
-    elif isinstance(value, coredata.UserArrayOption):
-        choices = '[' + ', '.join(["'" + v + "'" for v in value.choices]) + ']'
-        value = '[' + ', '.join(["'" + v + "'" for v in value.value]) + ']'
-        describe_option(name,
-                        value,
-                        'array',
-                        "You can set it to one or more of those values: " + choices)
-    elif isinstance(value, coredata.UserFeatureOption):
-        describe_option(name,
-                        value.value,
-                        'feature',
-                        "You can set it to 'auto', 'enabled', or 'disabled'")
-    else:
-        print(name + ' is an option of a type unknown to this script')
-        print('---')
--- a/bin/meson.build
+++ b/bin/meson.build
@@ -1,22 +0,0 @@
-# Copyright © 2017 Eric Engestrom
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-git_sha1_gen_py = files('git_sha1_gen.py')
-symbols_check = find_program('symbols-check.py')
--- a/bin/meson_get_version.py
+++ b/bin/meson_get_version.py
@@ -1,35 +0,0 @@
-#!/usr/bin/env python
-# encoding=utf-8
-# Copyright © 2017 Intel Corporation
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-from __future__ import print_function
-import os
-
-
-def main():
-    filename = os.path.join(os.environ['MESON_SOURCE_ROOT'], 'VERSION')
-    with open(filename) as f:
-        version = f.read().strip()
-    print(version, end='')
-
-
-if __name__ == '__main__':
-    main()
--- a/bin/perf-annotate-jit.py
+++ b/bin/perf-annotate-jit.py
@@ -133,7 +133,7 @@ class PerfParser(LineParser):

    def __init__(self, infile, symbol):
        LineParser.__init__(self, infile)
-        self.symbol = symbol
+	self.symbol = symbol

    def readline(self):
        # Override LineParser.readline to ignore comment lines
@@ -155,7 +155,7 @@ class PerfParser(LineParser):
        addresses.sort()
        total_samples = 0

-        sys.stdout.write('%s:\n' % self.symbol)
+	sys.stdout.write('%s:\n' % self.symbol)
        for address, instr in asm:
            try:
                sample = samples.pop(address)
--- a/bin/post_version.py
+++ b/bin/post_version.py
@@ -1,117 +0,0 @@
-#!/usr/bin/env python3
-# Copyright © 2019 Intel Corporation
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-"""Update the main page, release notes, and calendar."""
-
-import argparse
-import calendar
-import datetime
-import pathlib
-from lxml import (
-    etree,
-    html,
-)
-
-
-def calculate_previous_version(version: str, is_point: bool) -> str:
-    """Calculate the previous version to compare to.
-
-    In the case of -rc to final that verison is the previous .0 release,
-    (19.3.0 in the case of 20.0.0, for example). for point releases that is
-    the last point release. This value will be the same as the input value
-    for a poiont release, but different for a major release.
-    """
-    if '-' in version:
-        version = version.split('-')[0]
-    if is_point:
-        return version
-    base = version.split('.')
-    if base[1] == '0':
-        base[0] = str(int(base[0]) - 1)
-        base[1] = '3'
-    else:
-        base[1] = str(int(base[1]) - 1)
-    return '.'.join(base)
-
-
-def is_point_release(version: str) -> bool:
-    return not version.endswith('.0')
-
-
-def update_index(is_point: bool, version: str, previous_version: str) -> None:
-    p = pathlib.Path(__file__).parent.parent / 'docs' / 'index.html'
-    with p.open('rt') as f:
-        tree = html.parse(f)
-
-    news = tree.xpath('.//h1')[0]
-
-    date = datetime.date.today()
-    month = calendar.month_name[date.month]
-    header = etree.Element('h2')
-    header.text = f"{month} {date.day}, {date.year}"
-
-    body = etree.Element('p')
-    a = etree.SubElement(
-        body, 'a', attrib={'href': f'relnotes/{previous_version}.html'})
-    a.text = f"Mesa {previous_version}"
-    if is_point:
-        a.tail = " is released. This is a bug fix release."
-    else:
-        a.tail = (" is released. This is a new development release. "
-                  "See the release notes for mor information about this release.")
-
-    root = news.getparent()
-    index = root.index(news) + 1
-    root.insert(index, body)
-    root.insert(index, header)
-
-    tree.write(p.as_posix(), method='html')
-
-
-def update_release_notes(previous_version: str) -> None:
-    p = pathlib.Path(__file__).parent.parent / 'docs' / 'relnotes.html'
-    with p.open('rt') as f:
-        tree = html.parse(f)
-
-    li = etree.Element('li')
-    a = etree.SubElement(li, 'a', href=f'relnotes/{previous_version}.html')
-    a.text = f'{previous_version} release notes'
-
-    ul = tree.xpath('.//ul')[0]
-    ul.insert(0, li)
-
-    tree.write(p.as_posix(), method='html')
-
-
-def main() -> None:
-    parser = argparse.ArgumentParser()
-    parser.add_argument('version', help="The released version.")
-    args = parser.parse_args()
-
-    is_point = is_point_release(args.version)
-    previous_version = calculate_previous_version(args.version, is_point)
-
-    update_index(is_point, args.version, previous_version)
-    update_release_notes(previous_version)
-
-
-if __name__ == "__main__":
-    main()
--- a/bin/shortlog_mesa.sh
+++ b/bin/shortlog_mesa.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# This script is used to generate the list of changes that
+# appears in the release notes files, with HTML formatting.
+#
+# Usage examples:
+#
+# $ bin/shortlog_mesa.sh mesa-9.0.2..mesa-9.0.3
+# $ bin/shortlog_mesa.sh mesa-9.0.2..mesa-9.0.3 > changes
+# $ bin/shortlog_mesa.sh mesa-9.0.2..mesa-9.0.3 | tee changes
+
+
+in_log=0
+
+git shortlog $* | while read l
+do
+    if [ $in_log -eq 0 ]; then
+	echo '<p>'$l'</p>'
+	echo '<ul>'
+	in_log=1
+    elif echo "$l" | egrep -q '^$' ; then
+	echo '</ul>'
+	echo
+	in_log=0
+    else
+        mesg=$(echo $l | sed 's/ (cherry picked from commit [0-9a-f]\+)//;s/\&/&amp;/g;s/</\&lt;/g;s/>/\&gt;/g')
+	echo '  <li>'${mesg}'</li>'
+    fi
+done
--- a/bin/symbols-check.py
+++ b/bin/symbols-check.py
@@ -1,130 +0,0 @@
-#!/usr/bin/env python
-
-import argparse
-import os
-import platform
-import subprocess
-
-# This list contains symbols that _might_ be exported for some platforms
-PLATFORM_SYMBOLS = [
-    '__bss_end__',
-    '__bss_start__',
-    '__bss_start',
-    '__end__',
-    '_bss_end__',
-    '_edata',
-    '_end',
-    '_fini',
-    '_init',
-]
-
-
-def get_symbols(nm, lib):
-    '''
-    List all the (non platform-specific) symbols exported by the library
-    '''
-    symbols = []
-    platform_name = platform.system()
-    output = subprocess.check_output([nm, '-gP', lib],
-                                     stderr=open(os.devnull, 'w')).decode("ascii")
-    for line in output.splitlines():
-        fields = line.split()
-        if len(fields) == 2 or fields[1] == 'U':
-            continue
-        symbol_name = fields[0]
-        if platform_name == 'Linux':
-            if symbol_name in PLATFORM_SYMBOLS:
-                continue
-        elif platform_name == 'Darwin':
-            assert symbol_name[0] == '_'
-            symbol_name = symbol_name[1:]
-        symbols.append(symbol_name)
-
-    return symbols
-
-
-def main():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--symbols-file',
-                        action='store',
-                        required=True,
-                        help='path to file containing symbols')
-    parser.add_argument('--lib',
-                        action='store',
-                        required=True,
-                        help='path to library')
-    parser.add_argument('--nm',
-                        action='store',
-                        required=True,
-                        help='path to binary (or name in $PATH)')
-    args = parser.parse_args()
-
-    try:
-        lib_symbols = get_symbols(args.nm, args.lib)
-    except:
-        # We can't run this test, but we haven't technically failed it either
-        # Return the GNU "skip" error code
-        exit(77)
-    mandatory_symbols = []
-    optional_symbols = []
-    with open(args.symbols_file) as symbols_file:
-        qualifier_optional = '(optional)'
-        for line in symbols_file.readlines():
-
-            # Strip comments
-            line = line.split('#')[0]
-            line = line.strip()
-            if not line:
-                continue
-
-            # Line format:
-            # [qualifier] symbol
-            qualifier = None
-            symbol = None
-
-            fields = line.split()
-            if len(fields) == 1:
-                symbol = fields[0]
-            elif len(fields) == 2:
-                qualifier = fields[0]
-                symbol = fields[1]
-            else:
-                print(args.symbols_file + ': invalid format: ' + line)
-                exit(1)
-
-            # The only supported qualifier is 'optional', which means the
-            # symbol doesn't have to be exported by the library
-            if qualifier and not qualifier == qualifier_optional:
-                print(args.symbols_file + ': invalid qualifier: ' + qualifier)
-                exit(1)
-
-            if qualifier == qualifier_optional:
-                optional_symbols.append(symbol)
-            else:
-                mandatory_symbols.append(symbol)
-
-    unknown_symbols = []
-    for symbol in lib_symbols:
-        if symbol in mandatory_symbols:
-            continue
-        if symbol in optional_symbols:
-            continue
-        unknown_symbols.append(symbol)
-
-    missing_symbols = [
-        sym for sym in mandatory_symbols if sym not in lib_symbols
-    ]
-
-    for symbol in unknown_symbols:
-        print(args.lib + ': unknown symbol exported: ' + symbol)
-
-    for symbol in missing_symbols:
-        print(args.lib + ': missing symbol: ' + symbol)
-
-    if unknown_symbols or missing_symbols:
-        exit(1)
-    exit(0)
-
-
-if __name__ == '__main__':
-    main()
--- a/build-support/conftest.dyn
+++ b/build-support/conftest.dyn
@@ -1,3 +0,0 @@
-{
-	radeon_drm_winsys_create;
-};
--- a/build-support/conftest.map
+++ b/build-support/conftest.map
@@ -1,6 +0,0 @@
-VERSION_1 {
-    global:
-        main;
-    local:
-        *;
-};
--- a/common.py
+++ b/common.py
@@ -17,9 +17,6 @@ import SCons.Script.SConscript
 host_platform = _platform.system().lower()
 if host_platform.startswith('cygwin'):
    host_platform = 'cygwin'
-# MSYS2 default platform selection.
-if host_platform.startswith('mingw'):
-    host_platform = 'windows'

 # Search sys.argv[] for a "platform=foo" argument since we don't have
 # an 'env' variable at this point.
@@ -52,18 +49,9 @@ if 'PROCESSOR_ARCHITECTURE' in os.environ:
 else:
    host_machine = _platform.machine()
 host_machine = _machine_map.get(host_machine, 'generic')
-# MSYS2 default machine selection.
-if _platform.system().lower().startswith('mingw') and 'MSYSTEM' in os.environ:
-    if os.environ['MSYSTEM'] == 'MINGW32':
-        host_machine = 'x86'
-    if os.environ['MSYSTEM'] == 'MINGW64':
-        host_machine = 'x86_64'

 default_machine = host_machine
 default_toolchain = 'default'
-# MSYS2 default toolchain selection.
-if _platform.system().lower().startswith('mingw'):
-    default_toolchain = 'mingw'

 if target_platform == 'windows' and host_platform != 'windows':
    default_machine = 'x86'
@@ -98,7 +86,7 @@ def AddOptions(opts):
        from SCons.Options.EnumOption import EnumOption
    opts.Add(EnumOption('build', 'build type', 'debug',
                        allowed_values=('debug', 'checked', 'profile',
-                                        'release')))
+                                        'release', 'opt')))
    opts.Add(BoolOption('verbose', 'verbose output', 'no'))
    opts.Add(EnumOption('machine', 'use machine-specific assembly code',
                        default_machine,
@@ -111,13 +99,17 @@ def AddOptions(opts):
                        'enable static code analysis where available', 'no'))
    opts.Add(BoolOption('asan', 'enable Address Sanitizer', 'no'))
    opts.Add('toolchain', 'compiler toolchain', default_toolchain)
+    opts.Add(BoolOption('gles', 'EXPERIMENTAL: enable OpenGL ES support',
+                        'no'))
    opts.Add(BoolOption('llvm', 'use LLVM', default_llvm))
    opts.Add(BoolOption('openmp', 'EXPERIMENTAL: compile with openmp (swrast)',
                        'no'))
    opts.Add(BoolOption('debug', 'DEPRECATED: debug build', 'yes'))
    opts.Add(BoolOption('profile', 'DEPRECATED: profile build', 'no'))
    opts.Add(BoolOption('quiet', 'DEPRECATED: profile build', 'yes'))
+    opts.Add(BoolOption('texture_float',
+                        'enable floating-point textures and renderbuffers',
+                        'no'))
    opts.Add(BoolOption('swr', 'Build OpenSWR', 'no'))
    if host_platform == 'windows':
        opts.Add('MSVC_VERSION', 'Microsoft Visual C/C++ version')
-        opts.Add('MSVC_USE_SCRIPT', 'Microsoft Visual C/C++ vcvarsall script', True)
--- a/configure.ac
+++ b/configure.ac
--- a/docs/application-issues.html
+++ b/docs/application-issues.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
@@ -48,25 +48,23 @@ start-up because of an extension string buffer-overflow problem.

 <p>
 The problem is a modern OpenGL driver will return a very long string
-for the <code>glGetString(GL_EXTENSIONS)</code> query and if the application
+for the glGetString(GL_EXTENSIONS) query and if the application
 naively copies the string into a fixed-size buffer it can overflow the
 buffer and crash the application.
 </p>

 <p>
-The work-around is to set the <code>MESA_EXTENSION_MAX_YEAR</code>
-environment variable to the approximate release year of the game.
-This will cause the <code>glGetString(GL_EXTENSIONS)</code> query to only report
-extensions older than the given year.
+The work-around is to set the MESA_EXTENSION_MAX_YEAR environment variable
+to the approximate release year of the game.
+This will cause the glGetString(GL_EXTENSIONS) query to only report extensions
+older than the given year.
 </p>

 <p>
 For example, if the game was released in 2001, do
-</p>
 <pre>
 export MESA_EXTENSION_MAX_YEAR=2001
 </pre>
-<p>
 before running the game.
 </p>

--- a/docs/autoconf.html
+++ b/docs/autoconf.html
@@ -0,0 +1,257 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8">
+  <title>Compilation and Installation using Autoconf</title>
+  <link rel="stylesheet" type="text/css" href="mesa.css">
+</head>
+<body>
+
+<div class="header">
+  <h1>The Mesa 3D Graphics Library</h1>
+</div>
+
+<iframe src="contents.html"></iframe>
+<div class="content">
+
+<h1>Compilation and Installation using Autoconf</h1>
+
+<ol>
+<li><p><a href="#basic">Basic Usage</a></li>
+<li><p><a href="#driver">Driver Options</a>
+  <ul>
+  <li><a href="#xlib">Xlib Driver Options</a></li>
+  <li><a href="#dri">DRI Driver Options</a></li>
+  <li><a href="#osmesa">OSMesa Driver Options</a></li>
+  </ul>
+</ol>
+
+
+<h2 id="basic">1. Basic Usage</h2>
+
+<p>
+The autoconf generated configure script can be used to guess your
+platform and change various options for building Mesa. To use the
+configure script, type:
+</p>
+
+<pre>
+    ./configure
+</pre>
+
+<p>
+To see a short description of all the options, type <code>./configure
+--help</code>. If you are using a development snapshot and the configure
+script does not exist, type <code>./autogen.sh</code> to generate it
+first. If you know the options you want to pass to
+<code>configure</code>, you can pass them to <code>autogen.sh</code>. It
+will run <code>configure</code> with these options after it is
+generated. Once you have run <code>configure</code> and set the options
+to your preference, type:
+</p>
+
+<pre>
+    make
+</pre>
+
+<p>
+This will produce libGL.so and/or several other libraries depending on the
+options you have chosen. Later, if you want to rebuild for a different
+configuration run <code>make realclean</code> before rebuilding.
+</p>
+
+<p>
+Some of the generic autoconf options are used with Mesa:
+</p>
+<dl>
+<dt><code>--prefix=PREFIX</code></dt>
+<dd><p>This is the root directory where
+files will be installed by <code>make install</code>. The default is
+<code>/usr/local</code>.</p>
+</dd>
+
+<dt><code>--exec-prefix=EPREFIX</code></dt>
+<dd><p>This is the root directory
+where architecture-dependent files will be installed. In Mesa, this is
+only used to derive the directory for the libraries. The default is
+<code>${prefix}</code>.</p>
+</dd>
+
+<dt><code>--libdir=LIBDIR</code></dt>
+<dd><p>This option specifies the directory
+where the GL libraries will be installed. The default is
+<code>${exec_prefix}/lib</code>. It also serves as the name of the
+library staging area in the source tree. For instance, if the option
+<code>--libdir=/usr/local/lib64</code> is used, the libraries will be
+created in a <code>lib64</code> directory at the top of the Mesa source
+tree.</p>
+</dd>
+
+<dt><code>--sysconfdir=DIR</code></dt>
+<dd><p>This option specifies the directory where the configuration
+files will be installed. The default is <code>${prefix}/etc</code>.
+Currently there's only one config file provided when dri drivers are
+enabled - it's <code>drirc</code>.</p>
+</dd>
+
+<dt><code>--enable-static, --disable-shared</code></dt>
+<dd><p>By default, Mesa
+will build shared libraries. Either of these options will force static
+libraries to be built. It is not currently possible to build static and
+shared libraries in a single pass.</p>
+</dd>
+
+<dt><code>CC, CFLAGS, CXX, CXXFLAGS</code></dt>
+<dd><p>These environment variables
+control the C and C++ compilers used during the build. By default,
+<code>gcc</code> and <code>g++</code> are used and the debug/optimisation
+level is left unchanged.</p>
+</dd>
+
+<dt><code>LDFLAGS</code></dt>
+<dd><p>An environment variable specifying flags to
+pass when linking programs. These should be empty and
+<code>PKG_CONFIG_PATH</code> is recommended to be used instead. If needed
+it can be used to direct the linker to use libraries in nonstandard
+directories. For example, <code>LDFLAGS="-L/usr/X11R6/lib"</code>.</p>
+</dd>
+
+<dt><code>PKG_CONFIG_PATH</code></dt>
+<dd><p>The
+<code>pkg-config</code> utility is a hard requirement for configuring and
+building mesa. It is used to search for external libraries
+on the system. This environment variable is used to control the search
+path for <code>pkg-config</code>. For instance, setting
+<code>PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig</code> will search for
+package metadata in <code>/usr/X11R6</code> before the standard
+directories.</p>
+</dd>
+</dl>
+
+<p>
+There are also a few general options for altering the Mesa build:
+</p>
+<dl>
+<dt><code>--enable-debug</code></dt>
+<dd><p>This option will set the compiler debug/optimisation levels (if the user
+hasn't already set them via the CFLAGS/CXXFLAGS) and macros to aid in
+debugging the Mesa libraries.</p>
+
+<p>Note that enabling this option can lead to noticeable loss of performance.</p>
+
+<dt><code>--disable-asm</code></dt>
+<dd><p>There are assembly routines
+available for a few architectures. These will be used by default if
+one of these architectures is detected. This option ensures that
+assembly will not be used.</p>
+</dd>
+
+<dt><code>--build=</code></dt>
+<dt><code>--host=</code></dt>
+<dd><p>By default, the build will compile code for the architecture that
+it's running on. In order to build cross-compile Mesa on a x86-64 machine
+that is to run on a i686, one would need to set the options to:</p>
+
+<p><code>--build=x86_64-pc-linux-gnu --host=i686-pc-linux-gnu</code></p>
+
+Note that these can vary from distribution to distribution. For more
+information check with the
+<a href="https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Specifying-Target-Triplets.html">
+autoconf manual</a>.
+Note that you will need to correctly set <code>PKG_CONFIG_PATH</code> as well.
+
+
+<p>In some cases a single compiler is capable of handling both architectures
+(multilib) in that case one would need to set the <code>CC,CXX</code> variables
+appending the correct machine options. Seek your compiler documentation for
+further information -
+<a href="https://gcc.gnu.org/onlinedocs/gcc/Submodel-Options.html"> gcc
+machine dependent options</a></p>
+
+<p>In addition to specifying correct <code>PKG_CONFIG_PATH</code> for the target
+architecture, the following should be sufficient to configure multilib Mesa</p>
+
+<code>./configure CC="gcc -m32" CXX="g++ -m32" --build=x86_64-pc-linux-gnu --host=i686-pc-linux-gnu ...</code>
+</dd>
+</dl>
+
+
+<h2 id="driver">2. GL Driver Options</h2>
+
+<p>
+There are several different driver modes that Mesa can use. These are
+described in more detail in the <a href="install.html">basic
+installation instructions</a>. The Mesa driver is controlled through the
+configure options <code>--enable-glx</code> and <code>--enable-osmesa</code>
+</p>
+
+<h3 id="xlib">Xlib</h3><p>
+It uses Xlib as a software renderer to do all rendering. It corresponds
+to the option <code>--enable-glx=xlib</code> or <code>--enable-glx=gallium-xlib</code>.
+
+<h3 id="dri">DRI</h3><p>This mode uses the DRI hardware drivers for
+accelerated OpenGL rendering. To enable use <code>--enable-glx=dri
+--enable-dri</code>.
+
+<!-- DRI specific options -->
+<dl>
+<dt><code>--with-dri-driverdir=DIR</code>
+<dd><p> This option specifies the
+location the DRI drivers will be installed to and the location libGL
+will search for DRI drivers. The default is <code>${libdir}/dri</code>.
+<dt><code>--with-dri-drivers=DRIVER,DRIVER,...</code>
+<dd><p> This option
+allows a specific set of DRI drivers to be built. For example,
+<code>--with-dri-drivers="swrast,i965,radeon,nouveau"</code>. By
+default, the drivers will be chosen depending on the target platform.
+See the directory <code>src/mesa/drivers/dri</code> in the source tree
+for available drivers. Beware that the swrast DRI driver is used by both
+libGL and the X.Org xserver GLX module to do software rendering, so you
+may run into problems if it is not available.
+<!-- This explanation might be totally bogus. Kristian? -->
+<dt><code>--disable-driglx-direct</code>
+<dd><p> Disable direct rendering in
+GLX. Normally, direct hardware rendering through the DRI drivers and
+indirect software rendering are enabled in GLX. This option disables
+direct rendering entirely. It can be useful on architectures where
+kernel DRM modules are not available.
+<dt><code>--enable-glx-tls</code> <dd><p>
+Enable Thread Local Storage (TLS) in
+GLX.
+<dt><code>--with-expat=DIR</code>
+<dd><p><strong>DEPRECATED</strong>, use <code>PKG_CONFIG_PATH</code> instead.</p>
+<p>The DRI-enabled libGL uses expat to
+parse the DRI configuration files in <code>${sysconfdir}/drirc</code> and
+<code>~/.drirc</code>. This option allows a specific expat installation
+to be used. For example, <code>--with-expat=/usr/local</code> will
+search for expat headers and libraries in <code>/usr/local/include</code>
+and <code>/usr/local/lib</code>, respectively.
+</dl>
+
+<h3 id="osmesa">OSMesa </h3><p> No libGL is built in this
+mode. Instead, the driver code is built into the Off-Screen Mesa
+(OSMesa) library. See the <a href="osmesa.html">Off-Screen Rendering</a>
+page for more details.  It corresponds to the option
+<code>--enable-osmesa</code>.
+
+<!-- OSMesa specific options -->
+<dl>
+<dt><code>--with-osmesa-bits=BITS</code>
+<dd><p> This option allows the size
+of the color channel in bits to be specified. By default, an 8-bit
+channel will be used, and the driver will be named libOSMesa. Other
+options are 16- and 32-bit color channels, which will add the bit size
+to the library name. For example, <code>--with-osmesa-bits=16</code>
+will create the libOSMesa16 library with a 16-bit color channel.
+</dl>
+
+
+<h2 id="library">3. Library Options</h2>
+
+<p>
+The configure script provides more fine grained control over the libraries
+that will be built.
+
+</div>
+</body>
+</html>
--- a/docs/bugs.html
+++ b/docs/bugs.html
@@ -2,19 +2,19 @@
 <html lang="en">
 <head>
  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>Report a Bug</title>
+  <title>Mesa Bug Reporting</title>
  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
 <div class="content">

-<h1>Report a Bug</h1>
+<h1>Bug Database</h1>

 <p>
 The Mesa bug database is hosted on
@@ -24,8 +24,8 @@ The old bug database on SourceForge is no longer used.

 <p>
 To file a Mesa bug, go to
-<a href="https://gitlab.freedesktop.org/mesa/mesa/issues">
-GitLab on freedesktop.org</a>
+<a href="https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa">
+Bugzilla on freedesktop.org</a>
 </p>

 <p>
@@ -37,14 +37,11 @@ Please follow these bug reporting guidelines:
 the problem.
 <li>Check if your bug is already reported in the database.
 <li>Monitor your bug report for requests for additional information, etc.
-<li>Attach the output of running glxinfo or wglinfo.
-This will tell us the Mesa version, which device driver you're using, etc.
 <li>If you're reporting a crash, try to use your debugger (gdb) to get a stack
 trace. Also, recompile Mesa in debug mode to get more detailed information.
 <li>Describe in detail how to reproduce the bug, especially with games
 and applications that the Mesa developers might not be familiar with.
-<li>Provide an <a href="https://github.com/apitrace/apitrace">apitrace</a>
-or simple GLUT-based test program if possible.
+<li>Provide a simple GLUT-based test program if possible
 </ul>

 <p>
--- a/docs/codingstyle.html
+++ b/docs/codingstyle.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
@@ -48,19 +48,19 @@ For example:
   }
 </pre>

-<li>Put a space before/after operators.  For example, <code>a = b + c;</code>
-and not <code>a=b+c;</code>
+<li>Put a space before/after operators.  For example, <tt>a = b + c;</tt>
+and not <tt>a=b+c;</tt>

 <li>This GNU indent command generally does the right thing for formatting:
 <pre>
   indent -br -i3 -npcs --no-tabs infile.c -o outfile.c
 </pre>

-<li>
-<p>Use comments wherever you think it would be helpful for other developers.
+<li>Use comments wherever you think it would be helpful for other developers.
 Several specific cases and style examples follow.  Note that we roughly
-follow <a href="http://www.doxygen.nl">Doxygen</a> conventions.
-</p>
+follow <a href="https://www.stack.nl/~dimitri/doxygen/">Doxygen</a> conventions.
+<br>
+<br>
 Single-line comments:
 <pre>
   /* null-out pointer to prevent dangling reference below */
@@ -83,7 +83,7 @@ We try to quote the OpenGL specification where prudent:
    *     "An INVALID_OPERATION error is generated for any of the following
    *     conditions:
    *
-    *     * &lt;length&gt; is zero."
+    *     * <length> is zero."
    *
    * Additionally, page 94 of the PDF of the OpenGL 4.5 core spec
    * (30.10.2014) also says this, so it's no longer allowed for desktop GL,
@@ -94,7 +94,7 @@ Function comment example:
 <pre>
   /**
    * Create and initialize a new buffer object.  Called via the
-    * ctx-&gt;Driver.CreateObject() driver callback function.
+    * ctx->Driver.CreateObject() driver callback function.
    * \param  name  integer name of the object
    * \param  type  one of GL_FOO, GL_BAR, etc.
    * \return  pointer to new object or NULL if error
@@ -120,23 +120,22 @@ the opening brace goes on the next line by itself (see above.)
   _mesa_foo_bar()  - an internal non-static Mesa function
 </pre>

-<li>Constants, macros and enum names are <code>ALL_UPPERCASE</code>, with _
-between words.
-<li>Mesa usually uses camel case for local variables (Ex:
-<code>localVarname</code>) while gallium typically uses underscores (Ex:
-<code>local_var_name</code>).
+<li>Constants, macros and enum names are ALL_UPPERCASE, with _ between
+words.
+<li>Mesa usually uses camel case for local variables (Ex: "localVarname")
+while gallium typically uses underscores (Ex: "local_var_name").
 <li>Global variables are almost never used because Mesa should be thread-safe.

 <li>Booleans.  Places that are not directly visible to the GL API
-should prefer the use of <code>bool</code>, <code>true</code>, and
-<code>false</code> over <code>GLboolean</code>, <code>GL_TRUE</code>, and
-<code>GL_FALSE</code>.  In C code, this may mean that
-<code>#include &lt;stdbool.h&gt;</code> needs to be added.  The
-<code>try_emit_*</code> methods in <code>src/mesa/program/ir_to_mesa.cpp</code>
-and <code>src/mesa/state_tracker/st_glsl_to_tgsi.cpp</code> can serve as
-examples.
+should prefer the use of <tt>bool</tt>, <tt>true</tt>, and
+<tt>false</tt> over <tt>GLboolean</tt>, <tt>GL_TRUE</tt>, and
+<tt>GL_FALSE</tt>.  In C code, this may mean that
+<tt>#include &lt;stdbool.h&gt;</tt> needs to be added.  The
+<tt>try_emit_</tt>* methods in src/mesa/program/ir_to_mesa.cpp and
+src/mesa/state_tracker/st_glsl_to_tgsi.cpp can serve as examples.

 </ul>
+</p>

 </div>
 </body>
--- a/docs/conform.html
+++ b/docs/conform.html
@@ -2,19 +2,19 @@
 <html lang="en">
 <head>
  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>Conformance Testing</title>
+  <title>Conformance</title>
  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
 <div class="content">

-<h1>Conformance Testing</h1>
+<h1>Conformance</h1>

 <p>
 The SGI OpenGL conformance tests verify correct operation of OpenGL
--- a/docs/contents.html
+++ b/docs/contents.html
@@ -12,10 +12,6 @@
      background-color: #cccccc;
      color: black;
    }
-    h2 {
-      font-size: inherit;
-      font-weight: bold;
-    }
    a:link {
      color: #000;
    }
@@ -27,56 +23,58 @@
 </head>
 <body>

-<h2>Documentation</h2>
+<b>Documentation</b>
 <ul>
 <li><a href="intro.html" target="_parent">Introduction</a>
 <li><a href="index.html" target="_parent">News</a>
 <li><a href="developers.html" target="_parent">Developers</a>
 <li><a href="systems.html" target="_parent">Platforms and Drivers</a>
-<li><a href="license.html" target="_parent">License and Copyright</a>
-<li><a href="faq.html" target="_parent">Frequently Asked Questions</a>
+<li><a href="license.html" target="_parent">License &amp; Copyright</a>
+<li><a href="faq.html" target="_parent">FAQ</a>
 <li><a href="relnotes.html" target="_parent">Release Notes</a>
 <li><a href="thanks.html" target="_parent">Acknowledgements</a>
 <li><a href="conform.html" target="_parent">Conformance Testing</a>
+<li>more docs below...
 </ul>

-<h2>Download and Install</h2>
+<b>Download / Install</b>
 <ul>
-<li><a href="download.html" target="_parent">Downloading and Unpacking</a>
-<li><a href="install.html" target="_parent">Compiling and Installing</a>
+<li><a href="download.html" target="_parent">Downloading / Unpacking</a>
+<li><a href="install.html" target="_parent">Compiling / Installing</a>
  <ul>
-    <li><a href="meson.html" target="_parent">Meson</a></li>
+    <li><a href="autoconf.html" target="_parent">Autoconf</a></li>
  </ul>
 </li>
 <li><a href="precompiled.html" target="_parent">Precompiled Libraries</a>
 </ul>

-<h2>Need help?</h2>
+<b>Resources</b>
 <ul>
 <li><a href="lists.html" target="_parent">Mailing Lists</a>
-<li><a href="bugs.html" target="_parent">Report a bug</a>
+<li><a href="bugs.html" target="_parent">Bug Database</a>
 <li><a href="webmaster.html" target="_parent">Webmaster</a>
 <li><a href="https://dri.freedesktop.org/" target="_parent">Mesa/DRI Wiki</a>
 </ul>

-<h2>User Topics</h2>
+<b>User Topics</b>
 <ul>
 <li><a href="shading.html" target="_parent">Shading Language</a>
 <li><a href="egl.html" target="_parent">EGL</a>
 <li><a href="opengles.html" target="_parent">OpenGL ES</a>
 <li><a href="envvars.html" target="_parent">Environment Variables</a>
-<li><a href="osmesa.html" target="_parent">Off-screen Rendering</a>
+<li><a href="osmesa.html" target="_parent">Off-Screen Rendering</a>
 <li><a href="debugging.html" target="_parent">Debugging Tips</a>
 <li><a href="perf.html" target="_parent">Performance Tips</a>
 <li><a href="extensions.html" target="_parent">Mesa Extensions</a>
-<li><a href="llvmpipe.html" target="_parent">Gallium LLVMpipe Driver</a>
-<li><a href="vmware-guest.html" target="_parent">VMware SVGA3D Guest Driver</a>
-<li><a href="postprocess.html" target="_parent">Gallium Post-processing</a>
+<li><a href="mangling.html" target="_parent">GL Function Name Mangling</a>
+<li><a href="llvmpipe.html" target="_parent">Gallium llvmpipe driver</a>
+<li><a href="vmware-guest.html" target="_parent">VMware SVGA3D guest driver</a>
+<li><a href="postprocess.html" target="_parent">Gallium post-processing</a>
 <li><a href="application-issues.html" target="_parent">Application Issues</a>
 <li><a href="viewperf.html" target="_parent">Viewperf Issues</a>
 </ul>

-<h2>Developer Topics</h2>
+<b>Developer Topics</b>
 <ul>
 <li><a href="repository.html" target="_parent">Source Code Repository</a>
 <li><a href="sourcetree.html" target="_parent">Source Code Tree</a>
@@ -84,25 +82,25 @@
 <li><a href="helpwanted.html" target="_parent">Help Wanted</a>
 <li><a href="devinfo.html" target="_parent">Development Notes</a>
 <li><a href="codingstyle.html" target="_parent">Coding Style</a>
-<li><a href="submittingpatches.html" target="_parent">Submitting Patches</a>
-<li><a href="releasing.html" target="_parent">Releasing Process</a>
-<li><a href="release-calendar.html" target="_parent">Release Calendar</a>
+<li><a href="submittingpatches.html" target="_parent">Submitting patches</a>
+<li><a href="releasing.html" target="_parent">Releasing process</a>
 <li><a href="sourcedocs.html" target="_parent">Source Documentation</a>
 <li><a href="dispatch.html" target="_parent">GL Dispatch</a>
 </ul>

-<h2>Links</h2>
+<b>Links</b>
 <ul>
-<li><a href="https://www.opengl.org" target="_parent">OpenGL Website</a>
-<li><a href="https://dri.freedesktop.org" target="_parent">DRI Website</a>
+<li><a href="https://www.opengl.org" target="_parent">OpenGL website</a>
+<li><a href="https://dri.freedesktop.org" target="_parent">DRI website</a>
 <li><a href="https://www.freedesktop.org" target="_parent">freedesktop.org</a>
-<li><a href="https://planet.freedesktop.org" target="_parent">Developer Blogs</a>
+<li><a href="https://planet.freedesktop.org" target="_parent">Developer blogs</a>
 </ul>

-<h2>Hosted by:</h2>
-<dl>
-<dd><a href="https://www.freedesktop.org" target="_parent">freedesktop.org</a>
-</dl>
+<b>Hosted by:</b>
+<br>
+<blockquote>
+<a href="https://freedesktop.org" target="_parent">freedesktop.org</a>
+</blockquote>

 </body>
 </html>
--- a/docs/debugging.html
+++ b/docs/debugging.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
@@ -20,22 +20,26 @@
   Normally Mesa (and OpenGL) records but does not notify the user of
   errors.  It is up to the application to call
   <code>glGetError</code> to check for errors.  Mesa supports an
-   environment variable, <code>MESA_DEBUG</code>, to help with debugging.  If
-   <code>MESA_DEBUG</code> is defined, a message will be printed to stdout
-   whenever an error occurs.
+   environment variable, MESA_DEBUG, to help with debugging.  If
+   MESA_DEBUG is defined, a message will be printed to stdout whenever
+   an error occurs.
 </p>

 <p>
-   More extensive error checking is done in DEBUG builds
-   (<code>--buildtype debug</code> for meson, <code>build=debug</code> for scons).
+   More extensive error checking is done when Mesa is compiled with the
+   DEBUG symbol defined.  You'll have to edit the Make-config file and
+   add -DDEBUG to the CFLAGS line for your system configuration.  You may
+   also want to replace any optimization flags with the -g flag so you can
+   use your debugger.  After you've edited Make-config type 'make clean'
+   before recompiling.
 </p>
 <p>
-   In your debugger you can set a breakpoint in <code>_mesa_error()</code> to trap
-   Mesa errors.
+   In your debugger you can set a breakpoint in _mesa_error() to trap Mesa
+   errors.
 </p>
 <p>
   There is a display list printing/debugging facility.  See the end of
-   <code>src/dlist.c</code> for details.
+   src/dlist.c for details.
 </p>

 </div>
--- a/docs/developers.html
+++ b/docs/developers.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
--- a/docs/devinfo.html
+++ b/docs/devinfo.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
@@ -25,12 +25,11 @@

 <p>
 To add a new GL extension to Mesa you have to do at least the following.
-</p>

 <ul>
 <li>
-   If <code>glext.h</code> doesn't define the extension, edit
-   <code>include/GL/gl.h</code> and add code like this:
+   If glext.h doesn't define the extension, edit include/GL/gl.h and add
+   code like this:
   <pre>
     #ifndef GL_EXT_the_extension_name
     #define GL_EXT_the_extension_name 1
@@ -41,18 +40,18 @@ To add a new GL extension to Mesa you have to do at least the following.
   </pre>
 </li>
 <li>
-   In the <code>src/mapi/glapi/gen/</code> directory, add the new extension
-   functions and enums to the <code>gl_API.xml</code> file.
+   In the src/mapi/glapi/gen/ directory, add the new extension functions and
+   enums to the gl_API.xml file.
   Then, a bunch of source files must be regenerated by executing the
   corresponding Python scripts.
 </li>
 <li>
-   Add a new entry to the <code>gl_extensions</code> struct in
-   <code>mtypes.h</code> if the extension requires driver capabilities not
-   already exposed by another extension.
+   Add a new entry to the <code>gl_extensions</code> struct in mtypes.h
+   if the extension requires driver capabilities not already exposed by
+   another extension.
 </li>
 <li>
-   Add a new entry to the <code>src/mesa/main/extensions_table.h</code> file.
+   Add a new entry to the src/mesa/main/extensions_table.h file.
 </li>
 <li>
   From this point, the best way to proceed is to find another extension,
@@ -60,22 +59,21 @@ To add a new GL extension to Mesa you have to do at least the following.
   as an example.
 </li>
 <li>
-   If the new extension adds new GL state, the functions in
-   <code>get.c</code>, <code>enable.c</code> and <code>attrib.c</code>
-   will most likely require new code.
+   If the new extension adds new GL state, the functions in get.c, enable.c
+   and attrib.c will most likely require new code.
 </li>
 <li>
   To determine if the new extension is active in the current context,
-   use the auto-generated <code>_mesa_has_##name_str()</code> function
-   defined in <code>src/mesa/main/extensions.h</code>.
+   use the auto-generated _mesa_has_##name_str() function defined in
+   src/mesa/main/extensions.h.
 </li>
 <li>
-   The dispatch tests <code>check_table.cpp</code> and
-   <code>dispatch_sanity.cpp</code> should be updated with details about
-   the new extensions functions. These tests are run using
-   <code>meson test</code>.
+   The dispatch tests check_table.cpp and dispatch_sanity.cpp
+   should be updated with details about the new extensions functions. These
+   tests are run using 'make check'
 </li>
 </ul>
+</p>



--- a/docs/dispatch.html
+++ b/docs/dispatch.html
@@ -2,19 +2,19 @@
 <html lang="en">
 <head>
  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>GL Dispatch</title>
+  <title>GL Dispatch in Mesa</title>
  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
 <div class="content">

-<h1>GL Dispatch</h1>
+<h1>GL Dispatch in Mesa</h1>

 <p>Several factors combine to make efficient dispatch of OpenGL functions
 fairly complicated.  This document attempts to explain some of the issues
@@ -30,28 +30,28 @@ of the GL related state for the application.  Every texture, every buffer
 object, every enable, and much, much more is stored in the context.  Since
 an application can have more than one context, the context to be used is
 selected by a window-system dependent function such as
-<code>glXMakeContextCurrent</code>.</p>
+<tt>glXMakeContextCurrent</tt>.</p>

 <p>In environments that implement OpenGL with X-Windows using GLX, every GL
-function, including the pointers returned by <code>glXGetProcAddress</code>, are
+function, including the pointers returned by <tt>glXGetProcAddress</tt>, are
 <em>context independent</em>.  This means that no matter what context is
-currently active, the same <code>glVertex3fv</code> function is used.</p>
+currently active, the same <tt>glVertex3fv</tt> function is used.</p>

 <p>This creates the first bit of dispatch complexity.  An application can
 have two GL contexts.  One context is a direct rendering context where
 function calls are routed directly to a driver loaded within the
 application's address space.  The other context is an indirect rendering
 context where function calls are converted to GLX protocol and sent to a
-server.  The same <code>glVertex3fv</code> has to do the right thing depending
+server.  The same <tt>glVertex3fv</tt> has to do the right thing depending
 on which context is current.</p>

 <p>Highly optimized drivers or GLX protocol implementations may want to
 change the behavior of GL functions depending on current state.  For
-example, <code>glFogCoordf</code> may operate differently depending on whether
+example, <tt>glFogCoordf</tt> may operate differently depending on whether
 or not fog is enabled.</p>

 <p>In multi-threaded environments, it is possible for each thread to have a
-different GL context current.  This means that poor old <code>glVertex3fv</code>
+different GL context current.  This means that poor old <tt>glVertex3fv</tt>
 has to know which GL context is current in the thread where it is being
 called.</p>

@@ -64,18 +64,18 @@ dispatch table stores pointers to functions that actually implement
 specific GL functions.  Each time a new context is made current in a thread,
 these pointers a updated.</p>

-<p>The implementation of functions such as <code>glVertex3fv</code> becomes
+<p>The implementation of functions such as <tt>glVertex3fv</tt> becomes
 conceptually simple:</p>

 <ul>
 <li>Fetch the current dispatch table pointer.</li>
-<li>Fetch the pointer to the real <code>glVertex3fv</code> function from the
+<li>Fetch the pointer to the real <tt>glVertex3fv</tt> function from the
 table.</li>
 <li>Call the real function.</li>
 </ul>

 <p>This can be implemented in just a few lines of C code.  The file
-<code>src/mesa/glapi/glapitemp.h</code> contains code very similar to this.</p>
+<tt>src/mesa/glapi/glapitemp.h</tt> contains code very similar to this.</p>

 <blockquote>
 <table border="1">
@@ -93,9 +93,9 @@ void glVertex3f(GLfloat x, GLfloat y, GLfloat z)
 overhead that it adds to every GL function call.</p>

 <p>In a multithreaded environment, a naive implementation of
-<code>GET_DISPATCH</code> involves a call to <code>pthread_getspecific</code> or a
+<tt>GET_DISPATCH</tt> involves a call to <tt>pthread_getspecific</tt> or a
 similar function.  Mesa provides a wrapper function called
-<code>_glapi_get_dispatch</code> that is used by default.</p>
+<tt>_glapi_get_dispatch</tt> that is used by default.</p>

 <h2>3. Optimizations</h2>

@@ -109,7 +109,7 @@ each can or cannot be used are listed.</p>
 <p>The vast majority of OpenGL applications use the API in a single threaded
 manner.  That is, the application has only one thread that makes calls into
 the GL.  In these cases, not only do the calls to
-<code>pthread_getspecific</code> hurt performance, but they are completely
+<tt>pthread_getspecific</tt> hurt performance, but they are completely
 unnecessary!  It is possible to detect this common case and avoid these
 calls.</p>

@@ -118,15 +118,15 @@ of the executing thread.  If the same thread ID is always seen, Mesa knows
 that the application is, from OpenGL's point of view, single threaded.</p>

 <p>As long as an application is single threaded, Mesa stores a pointer to
-the dispatch table in a global variable called <code>_glapi_Dispatch</code>.
+the dispatch table in a global variable called <tt>_glapi_Dispatch</tt>.
 The pointer is also stored in a per-thread location via
-<code>pthread_setspecific</code>.  When Mesa detects that an application has
-become multithreaded, <code>NULL</code> is stored in <code>_glapi_Dispatch</code>.</p>
+<tt>pthread_setspecific</tt>.  When Mesa detects that an application has
+become multithreaded, <tt>NULL</tt> is stored in <tt>_glapi_Dispatch</tt>.</p>

 <p>Using this simple mechanism the dispatch functions can detect the
-multithreaded case by comparing <code>_glapi_Dispatch</code> to <code>NULL</code>.
-The resulting implementation of <code>GET_DISPATCH</code> is slightly more
-complex, but it avoids the expensive <code>pthread_getspecific</code> call in
+multithreaded case by comparing <tt>_glapi_Dispatch</tt> to <tt>NULL</tt>.
+The resulting implementation of <tt>GET_DISPATCH</tt> is slightly more
+complex, but it avoids the expensive <tt>pthread_getspecific</tt> call in
 the common case.</p>

 <blockquote>
@@ -134,9 +134,9 @@ the common case.</p>
 <tr><td><pre>
 #define GET_DISPATCH() \
    (_glapi_Dispatch != NULL) \
-        ? _glapi_Dispatch : pthread_getspecific(&amp;_glapi_Dispatch_key)
+        ? _glapi_Dispatch : pthread_getspecific(&_glapi_Dispatch_key)
 </pre></td></tr>
-<tr><td>Improved <code>GET_DISPATCH</code> Implementation</td></tr></table>
+<tr><td>Improved <tt>GET_DISPATCH</tt> Implementation</td></tr></table>
 </blockquote>

 <h3>3.2. ELF TLS</h3>
@@ -144,14 +144,14 @@ the common case.</p>
 <p>Starting with the 2.4.20 Linux kernel, each thread is allocated an area
 of per-thread, global storage.  Variables can be put in this area using some
 extensions to GCC.  By storing the dispatch table pointer in this area, the
-expensive call to <code>pthread_getspecific</code> and the test of
-<code>_glapi_Dispatch</code> can be avoided.</p>
+expensive call to <tt>pthread_getspecific</tt> and the test of
+<tt>_glapi_Dispatch</tt> can be avoided.</p>

 <p>The dispatch table pointer is stored in a new variable called
-<code>_glapi_tls_Dispatch</code>.  A new variable name is used so that a single
+<tt>_glapi_tls_Dispatch</tt>.  A new variable name is used so that a single
 libGL can implement both interfaces.  This allows the libGL to operate with
 direct rendering drivers that use either interface.  Once the pointer is
-properly declared, <code>GET_DISPACH</code> becomes a simple variable
+properly declared, <tt>GET_DISPACH</tt> becomes a simple variable
 reference.</p>

 <blockquote>
@@ -162,12 +162,12 @@ extern __thread struct _glapi_table *_glapi_tls_Dispatch

 #define GET_DISPATCH() _glapi_tls_Dispatch
 </pre></td></tr>
-<tr><td>TLS <code>GET_DISPATCH</code> Implementation</td></tr></table>
+<tr><td>TLS <tt>GET_DISPATCH</tt> Implementation</td></tr></table>
 </blockquote>

 <p>Use of this path is controlled by the preprocessor define
-<code>USE_ELF_TLS</code>.  Any platform capable of using ELF TLS should use this
-as the default dispatch method.</p>
+<tt>GLX_USE_TLS</tt>.  Any platform capable of using TLS should use this as
+the default dispatch method.</p>

 <h3>3.3. Assembly Language Dispatch Stubs</h3>

@@ -185,13 +185,13 @@ ways that the dispatch table pointer can be accessed.  There are four
 different methods that can be used:</p>

 <ol>
-<li>Using <code>_glapi_Dispatch</code> directly in builds for non-multithreaded
+<li>Using <tt>_glapi_Dispatch</tt> directly in builds for non-multithreaded
 environments.</li>
-<li>Using <code>_glapi_Dispatch</code> and <code>_glapi_get_dispatch</code> in
+<li>Using <tt>_glapi_Dispatch</tt> and <tt>_glapi_get_dispatch</tt> in
 multithreaded environments.</li>
-<li>Using <code>_glapi_Dispatch</code> and <code>pthread_getspecific</code> in
+<li>Using <tt>_glapi_Dispatch</tt> and <tt>pthread_getspecific</tt> in
 multithreaded environments.</li>
-<li>Using <code>_glapi_tls_Dispatch</code> directly in TLS enabled
+<li>Using <tt>_glapi_tls_Dispatch</tt> directly in TLS enabled
 multithreaded environments.</li>
 </ol>

@@ -204,13 +204,13 @@ terribly relevant.</p>
 few preprocessor defines.</p>

 <ul>
-<li>If <code>USE_ELF_TLS</code> is defined, method #3 is used.</li>
-<li>If <code>HAVE_PTHREAD</code> is defined, method #2 is used.</li>
+<li>If <tt>GLX_USE_TLS</tt> is defined, method #3 is used.</li>
+<li>If <tt>HAVE_PTHREAD</tt> is defined, method #2 is used.</li>
 <li>If none of the preceding are defined, method #1 is used.</li>
 </ul>

 <p>Two different techniques are used to handle the various different cases.
-On x86 and SPARC, a macro called <code>GL_STUB</code> is used.  In the preamble
+On x86 and SPARC, a macro called <tt>GL_STUB</tt> is used.  In the preamble
 of the assembly source file different implementations of the macro are
 selected based on the defined preprocessor variables.  The assembly code
 then consists of a series of invocations of the macros such as:
@@ -220,7 +220,7 @@ then consists of a series of invocations of the macros such as:
 <tr><td><pre>
 GL_STUB(Color3fv, _gloffset_Color3fv)
 </pre></td></tr>
-<tr><td>SPARC Assembly Implementation of <code>glColor3fv</code></td></tr></table>
+<tr><td>SPARC Assembly Implementation of <tt>glColor3fv</tt></td></tr></table>
 </blockquote>

 <p>The benefit of this technique is that changes to the calling pattern
@@ -231,32 +231,32 @@ changed lines in the assembly code.</p>
 implementation does not change based on the parameters passed to the
 function.  For example, since x86 passes all parameters on the stack, no
 additional code is needed to save and restore function parameters around a
-call to <code>pthread_getspecific</code>.  Since x86-64 passes parameters in
+call to <tt>pthread_getspecific</tt>.  Since x86-64 passes parameters in
 registers, varying amounts of code needs to be inserted around the call to
-<code>pthread_getspecific</code> to save and restore the GL function's
+<tt>pthread_getspecific</tt> to save and restore the GL function's
 parameters.</p>

 <p>The other technique, used by platforms like x86-64 that cannot use the
-first technique, is to insert <code>#ifdef</code> within the assembly
+first technique, is to insert <tt>#ifdef</tt> within the assembly
 implementation of each function.  This makes the assembly file considerably
-larger (e.g., 29,332 lines for <code>glapi_x86-64.S</code> versus 1,155 lines for
-<code>glapi_x86.S</code>) and causes simple changes to the function
+larger (e.g., 29,332 lines for <tt>glapi_x86-64.S</tt> versus 1,155 lines for
+<tt>glapi_x86.S</tt>) and causes simple changes to the function
 implementation to generate many lines of diffs.  Since the assembly files
 are typically generated by scripts (see <a href="#autogen">below</a>), this
 isn't a significant problem.</p>

 <p>Once a new assembly file is created, it must be inserted in the build
 system.  There are two steps to this.  The file must first be added to
-<code>src/mesa/sources</code>.  That gets the file built and linked.  The second
-step is to add the correct <code>#ifdef</code> magic to
-<code>src/mesa/glapi/glapi_dispatch.c</code> to prevent the C version of the
+<tt>src/mesa/sources</tt>.  That gets the file built and linked.  The second
+step is to add the correct <tt>#ifdef</tt> magic to
+<tt>src/mesa/glapi/glapi_dispatch.c</tt> to prevent the C version of the
 dispatch functions from being built.</p>

 <h3 id="fixedsize">3.4. Fixed-Length Dispatch Stubs</h3>

-<p>To implement <code>glXGetProcAddress</code>, Mesa stores a table that
+<p>To implement <tt>glXGetProcAddress</tt>, Mesa stores a table that
 associates function names with pointers to those functions.  This table is
-stored in <code>src/mesa/glapi/glprocs.h</code>.  For different reasons on
+stored in <tt>src/mesa/glapi/glprocs.h</tt>.  For different reasons on
 different platforms, storing all of those pointers is inefficient.  On most
 platforms, including all known platforms that support TLS, we can avoid this
 added overhead.</p>
@@ -267,8 +267,8 @@ calculated by multiplying the size of the dispatch stub by the offset of the
 function in the table.  This value is then added to the address of the first
 dispatch stub.</p>

-<p>This path is activated by adding the correct <code>#ifdef</code> magic to
-<code>src/mesa/glapi/glapi.c</code> just before <code>glprocs.h</code> is
+<p>This path is activated by adding the correct <tt>#ifdef</tt> magic to
+<tt>src/mesa/glapi/glapi.c</tt> just before <tt>glprocs.h</tt> is
 included.</p>

 <h2 id="autogen">4. Automatic Generation of Dispatch Stubs</h2>
--- a/docs/download.html
+++ b/docs/download.html
@@ -2,63 +2,77 @@
 <html lang="en">
 <head>
  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>Downloading and Unpacking</title>
+  <title>Getting Mesa</title>
  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
 <div class="content">

-<h1>Downloading and Unpacking</h1>
-
-<h2>Downloading</h2>
+<h1>Downloading</h1>

 <p>
 Primary Mesa download site:
 <a href="ftp://ftp.freedesktop.org/pub/mesa/">ftp.freedesktop.org</a> (FTP)
 or <a href="https://mesa.freedesktop.org/archive/">mesa.freedesktop.org</a>
-(HTTPS).
+(HTTP).
 </p>

 <p>
 Starting with the first release of 2017, Mesa's version scheme is
-year-based. Filenames are in the form <code>mesa-Y.N.P.tar.gz</code>, where
-<code>Y</code> is the year (two digits), <code>N</code> is an incremental number
-(starting at 0) and <code>P</code> is the patch number (0 for the first
+year-based. Filenames are in the form <tt>mesa-Y.N.P.tar.gz</tt>, where
+<tt>Y</tt> is the year (two digits), <tt>N</tt> is an incremental number
+(starting at 0) and <tt>P</tt> is the patch number (0 for the first
 release, 1 for the first patch after that).
 </p>

 <p>
 When a new release is coming, release candidates (betas) may be found
 in the same directory, and are recognisable by the
-<code>mesa-Y.N.P-<b>rc</b>X.tar.gz</code> filename.
+<tt>mesa-Y.N.P-<b>rc</b>X.tar.gz</tt> filename.
 </p>


-<h2>Unpacking</h2>
+<h1>Unpacking</h1>

 <p>
-Mesa releases are available in two formats: <code>.tar.xz</code> and <code>.tar.gz</code>.
+Mesa releases are available in two formats: <tt>.tar.xz</tt> and <tt>.tar.gz</tt>.
 </p>

 <p>
 To unpack the tarball:
-</p>
 <pre>
 	tar xf mesa-Y.N.P.tar.xz
 </pre>
-<p>or</p>
+or
 <pre>
 	tar xf mesa-Y.N.P.tar.gz
 </pre>
+</p>


-<h2>Contents</h2>
+<h1>Contents</h1>
+
+<p>
+After unpacking you'll have these files and directories (among others):
+</p>
+<pre>
+autogen.sh	- Autoconf script for *nix systems
+scons/		- SCons script for Windows builds
+include/	- GL header (include) files
+bin/		- shell scripts for making shared libraries, etc
+docs/		- documentation
+src/		- source code for libraries
+src/mesa	- sources for the main Mesa library and device drivers
+src/gallium     - sources for Gallium and Gallium drivers
+src/glx		- sources for building libGL with full GLX and DRI support
+</pre>
+

 <p>
 Proceed to the <a href="install.html">compilation and installation
@@ -66,7 +80,7 @@ instructions</a>.
 </p>


-<h2>Demos, GLUT, and GLU</h2>
+<h1>Demos, GLUT, and GLU</h1>

 <p>
 A package of SGI's GLU library is available
@@ -88,9 +102,9 @@ In the past, GLUT, GLU and the Mesa demos were released in conjunction with
 Mesa releases.  But since GLUT, GLU and the demos change infrequently, they
 were split off into their own git repositories:

-<a href="https://gitlab.freedesktop.org/mesa/glut">GLUT</a>,
-<a href="https://gitlab.freedesktop.org/mesa/glu">GLU</a> and
-<a href="https://gitlab.freedesktop.org/mesa/demos">Demos</a>,
+<a href="https://cgit.freedesktop.org/mesa/glut/">GLUT</a>,
+<a href="https://cgit.freedesktop.org/mesa/glu/">GLU</a> and
+<a href="https://cgit.freedesktop.org/mesa/demos/">Demos</a>,
 </p>

 </div>
--- a/docs/egl.html
+++ b/docs/egl.html
@@ -2,19 +2,19 @@
 <html lang="en">
 <head>
  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>EGL</title>
+  <title>Mesa EGL</title>
  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
 <div class="content">

-<h1>EGL</h1>
+<h1>Mesa EGL</h1>

 <p>The current version of EGL in Mesa implements EGL 1.4.  More information
 about EGL can be found at
@@ -33,16 +33,13 @@ directly dispatched to the drivers.</p>

 <ol>
 <li>
-<p>Configure your build with the desired client APIs and enable
-the driver for your hardware.  For example:</p>
+<p>Run <code>configure</code> with the desired client APIs and enable
+the driver for your hardware.  For example</p>

 <pre>
-$ meson configure \
-        -D egl=true \
-        -D gles1=true \
-        -D gles2=true \
-        -D dri-drivers=... \
-        -D gallium-drivers=...
+  $ ./configure --enable-gles1 --enable-gles2 \
+                --with-dri-drivers=... \
+                --with-gallium-drivers=...
 </pre>

 <p>The main library and OpenGL is enabled by default.  The first two options
@@ -64,7 +61,7 @@ or more EGL drivers.</p>
 time</p>

 <dl>
-<dt><code>-D egl=true</code></dt>
+<dt><code>--enable-egl</code></dt>
 <dd>

 <p>By default, EGL is enabled.  When disabled, the main library and the drivers
@@ -72,11 +69,19 @@ will not be built.</p>

 </dd>

-<dt><code>-D platforms=...</code></dt>
+<dt><code>--with-egl-driver-dir</code></dt>
+<dd>
+
+<p>The directory EGL drivers should be installed to.  If not specified, EGL
+drivers will be installed to <code>${libdir}/egl</code>.</p>
+
+</dd>
+
+<dt><code>--with-platforms</code></dt>
 <dd>

 <p>List the platforms (window systems) to support.  Its argument is a comma
-separated string such as <code>-D platforms=x11,drm</code>.  It decides
+separated string such as <code>--with-platforms=x11,drm</code>.  It decides
 the platforms a driver may support.  The first listed platform is also used by
 the main library to decide the native platform.</p>

@@ -85,13 +90,15 @@ the main library to decide the native platform.</p>
 and <code>haiku</code>.
 The <code>android</code> platform can either be built as a system
 component, part of AOSP, using <code>Android.mk</code> files, or
-cross-compiled using appropriate options.
+cross-compiled using appropriate <code>configure</code> options.
+The <code>haiku</code> platform can only be built with SCons.
 Unless for special needs, the build system should
 select the right platforms automatically.</p>

 </dd>

-<dt><code>-D gles1=true</code> and <code>-D gles2=true</code></dt>
+<dt><code>--enable-gles1</code></dt>
+<dt><code>--enable-gles2</code></dt>
 <dd>

 <p>These options enable OpenGL ES support in OpenGL.  The result is one big
@@ -99,7 +106,7 @@ internal library that supports multiple APIs.</p>

 </dd>

-<dt><code>-D shared-glapi=true</code></dt>
+<dt><code>--enable-shared-glapi</code></dt>
 <dd>

 <p>By default, <code>libGL</code> has its own copy of <code>libglapi</code>.
@@ -123,13 +130,44 @@ mesa/demos repository.</p>
 runtime</p>

 <dl>
+<dt><code>EGL_DRIVERS_PATH</code></dt>
+<dd>
+
+<p>By default, the main library will look for drivers in the directory where
+the drivers are installed to.  This variable specifies a list of
+colon-separated directories where the main library will look for drivers, in
+addition to the default directory.  This variable is ignored for setuid/setgid
+binaries.</p>
+
+<p>This variable is usually set to test an uninstalled build.  For example, one
+may set</p>
+
+<pre>
+  $ export LD_LIBRARY_PATH=$mesa/lib
+  $ export EGL_DRIVERS_PATH=$mesa/lib/egl
+</pre>
+
+<p>to test a build without installation</p>
+
+</dd>
+
+<dt><code>EGL_DRIVER</code></dt>
+<dd>
+
+<p>This variable specifies a full path to or the name of an EGL driver.  It
+forces the specified EGL driver to be loaded.  It comes in handy when one wants
+to test a specific driver.  This variable is ignored for setuid/setgid
+binaries.</p>
+
+</dd>
+
 <dt><code>EGL_PLATFORM</code></dt>
 <dd>

 <p>This variable specifies the native platform.  The valid values are the same
-as those for <code>-D platforms=...</code>.  When the variable is not set,
+as those for <code>--with-platforms</code>.  When the variable is not set,
 the main library uses the first platform listed in
-<code>-D platforms=...</code> as the native platform.</p>
+<code>--with-platforms</code> as the native platform.</p>

 <p>Extensions like <code>EGL_MESA_drm_display</code> define new functions to
 create displays for non-native platforms.  These extensions are usually used by
@@ -161,7 +199,6 @@ the X server directly using (XCB-)DRI2 protocol.</p>
 <p>This driver can share DRI drivers with <code>libGL</code>.</p>

 </dd>
-</dl>

 <h2>Packaging</h2>

--- a/docs/envvars.html
+++ b/docs/envvars.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
@@ -25,206 +25,112 @@ sometimes be useful for debugging end-user issues.

 <h2>LibGL environment variables</h2>

-<dl>
-<dt><code>LIBGL_DEBUG</code></dt>
-<dd>If defined debug information will be printed to stderr.
-    If set to <code>verbose</code> additional information will be
-    printed.</dd>
-<dt><code>LIBGL_DRIVERS_PATH</code></dt>
-<dd>colon-separated list of paths to search for DRI drivers</dd>
-<dt><code>LIBGL_ALWAYS_INDIRECT</code></dt>
-<dd>if set to <code>true</code>, forces an indirect rendering
-    context/connection.</dd>
-<dt><code>LIBGL_ALWAYS_SOFTWARE</code></dt>
-<dd>if set to <code>true</code>, always use software rendering</dd>
-<dt><code>LIBGL_NO_DRAWARRAYS</code></dt>
-<dd>if set to <code>true</code>, do not use DrawArrays GLX protocol
-    (for debugging)</dd>
-<dt><code>LIBGL_SHOW_FPS</code></dt>
-<dd>print framerate to stdout based on the number of
-    <code>glXSwapBuffers</code> calls per second.</dd>
-<dt><code>LIBGL_DRI3_DISABLE</code></dt>
-<dd>disable DRI3 if set to <code>true</code>.</dd>
-</dl>
+<ul>
+<li>LIBGL_DEBUG - If defined debug information will be printed to stderr.
+   If set to 'verbose' additional information will be printed.
+<li>LIBGL_DRIVERS_PATH - colon-separated list of paths to search for DRI drivers
+<li>LIBGL_ALWAYS_INDIRECT - forces an indirect rendering context/connection.
+<li>LIBGL_ALWAYS_SOFTWARE - if set, always use software rendering
+<li>LIBGL_NO_DRAWARRAYS - if set do not use DrawArrays GLX protocol (for debugging)
+<li>LIBGL_SHOW_FPS - print framerate to stdout based on the number of glXSwapBuffers
+    calls per second.
+<li>LIBGL_DRI3_DISABLE - disable DRI3 if set (the value does not matter)
+</ul>
+
+

 <h2>Core Mesa environment variables</h2>

-<dl>
-<dt><code>MESA_NO_ASM</code></dt>
-<dd>if set, disables all assembly language optimizations</dd>
-<dt><code>MESA_NO_MMX</code></dt>
-<dd>if set, disables Intel MMX optimizations</dd>
-<dt><code>MESA_NO_3DNOW</code></dt>
-<dd>if set, disables AMD 3DNow! optimizations</dd>
-<dt><code>MESA_NO_SSE</code></dt>
-<dd>if set, disables Intel SSE optimizations</dd>
-<dt><code>MESA_NO_ERROR</code></dt>
-<dd>if set to 1, error checking is disabled as per <code>KHR_no_error</code>.
-    This will result in undefined behaviour for invalid use of the api, but
-    can reduce CPU use for apps that are known to be error free.</dd>
-<dt><code>MESA_DEBUG</code></dt>
-<dd>if set, error messages are printed to stderr.  For example,
-    if the application generates a <code>GL_INVALID_ENUM</code> error, a
-    corresponding error message indicating where the error occurred, and
-    possibly why, will be printed to stderr. For release builds,
-    <code>MESA_DEBUG</code> defaults to off (no debug output).
-    <code>MESA_DEBUG</code> accepts the following comma-separated list of
-    named flags, which adds extra behaviour to just set
-    <code>MESA_DEBUG=1</code>:
-    <dl>
-      <dt><code>silent</code></dt>
-      <dd>turn off debug messages. Only useful for debug builds.</dd>
-      <dt><code>flush</code></dt>
-      <dd>flush after each drawing command</dd>
-      <dt><code>incomplete_tex</code></dt>
-      <dd>extra debug messages when a texture is incomplete</dd>
-      <dt><code>incomplete_fbo</code></dt>
-      <dd>extra debug messages when a fbo is incomplete</dd>
-      <dt><code>context</code></dt>
-      <dd>create a debug context (see <code>GLX_CONTEXT_DEBUG_BIT_ARB</code>)
-          and print error and performance messages to stderr (or
-          <code>MESA_LOG_FILE</code>).</dd>
-    </dl>
-</dd>
-<dt><code>MESA_LOG_FILE</code></dt>
-<dd>specifies a file name for logging all errors, warnings,
-    etc., rather than stderr</dd>
-<dt><code>MESA_TEX_PROG</code></dt>
-<dd>if set, implement conventional texture env modes with
-    fragment programs (intended for developers only)</dd>
-<dt><code>MESA_TNL_PROG</code></dt>
-<dd>if set, implement conventional vertex transformation operations with
-    vertex programs (intended for developers only). Setting this variable
-    automatically sets the <code>MESA_TEX_PROG</code> variable as well.</dd>
-<dt><code>MESA_EXTENSION_OVERRIDE</code></dt>
-<dd>can be used to enable/disable extensions. A value such as
-    <code>GL_EXT_foo -GL_EXT_bar</code> will enable the
-    <code>GL_EXT_foo</code> extension and disable the
-    <code>GL_EXT_bar</code> extension.</dd>
-<dt><code>MESA_EXTENSION_MAX_YEAR</code></dt>
-<dd>The <code>GL_EXTENSIONS</code> string returned by Mesa is sorted by
-    extension year. If this variable is set to year X, only extensions
-    defined on or before year X will be reported. This is to work-around a
-    bug in some games where the extension string is copied into a fixed-size
-    buffer without truncating. If the extension string is too long, the
-    buffer overrun can cause the game to crash. This is a work-around for
-    that.</dd>
-<dt><code>MESA_GL_VERSION_OVERRIDE</code></dt>
-<dd>changes the value returned by
-<code>glGetString(GL_VERSION)</code> and possibly the GL API type.
 <ul>
-  <li>The format should be <code>MAJOR.MINOR[FC|COMPAT]</code>
-  <li><code>FC</code> is an optional suffix that indicates a forward
-      compatible context. This is only valid for versions &gt;= 3.0.
-  <li><code>COMPAT</code> is an optional suffix that indicates a
-      compatibility context or <code>GL_ARB_compatibility</code> support.
-      This is only valid for versions &gt;= 3.1.
-  <li>GL versions &lt;= 3.0 are set to a compatibility (non-Core)
-      profile
-  <li>GL versions = 3.1, depending on the driver, it may or may not
-      have the <code>ARB_compatibility</code> extension enabled.
-  <li>GL versions &gt;= 3.2 are set to a Core profile
-  <li>Examples:
-  <dl>
-    <dt><code>2.1</code></dt>
-    <dd>select a compatibility (non-Core) profile with GL version 2.1.</dd>
-    <dt><code>3.0</code></dt>
-    <dd>select a compatibility (non-Core) profile with GL version 3.0.</dd>
-    <dt><code>3.0FC</code></dt>
-    <dd>select a Core+Forward Compatible profile with GL version 3.0.</dd>
-    <dt><code>3.1</code></dt>
-    <dd>select GL version 3.1 with <code>GL_ARB_compatibility</code>
-        enabled per the driver default.</dd>
-    <dt><code>3.1FC</code></dt>
-    <dd>select GL version 3.1 with forward compatibility and
-        <code>GL_ARB_compatibility</code> disabled.</dd>
-    <dt><code>3.1COMPAT</code></dt>
-    <dd>select GL version 3.1 with <code>GL_ARB_compatibility</code>
-        enabled.</dd>
-    <dt><code>X.Y</code></dt>
-    <dd>override GL version to X.Y without changing the profile.</dd>
-    <dt><code>X.YFC</code></dt>
-    <dd>select a Core+Forward Compatible profile with GL version X.Y.</dd>
-    <dt><code>X.YCOMPAT</code></dt>
-    <dd>select a Compatibility profile with GL version X.Y.</dd>
-  </dl>
-  <li>Mesa may not really implement all the features of the given
-      version. (for developers only)
+<li>MESA_NO_ASM - if set, disables all assembly language optimizations
+<li>MESA_NO_MMX - if set, disables Intel MMX optimizations
+<li>MESA_NO_3DNOW - if set, disables AMD 3DNow! optimizations
+<li>MESA_NO_SSE - if set, disables Intel SSE optimizations
+<li>MESA_DEBUG - if set, error messages are printed to stderr.  For example,
+   if the application generates a GL_INVALID_ENUM error, a corresponding error
+   message indicating where the error occurred, and possibly why, will be
+   printed to stderr.<br>
+
+   For release builds, MESA_DEBUG defaults to off (no debug output).
+
+   MESA_DEBUG accepts the following comma-separated list of named
+   flags, which adds extra behaviour to just set MESA_DEBUG=1:
+   <ul>
+     <li>silent - turn off debug messages. Only useful for debug builds.</li>
+     <li>flush - flush after each drawing command</li>
+     <li>incomplete_tex - extra debug messages when a texture is incomplete</li>
+     <li>incomplete_fbo - extra debug messages when a fbo is incomplete</li>
+     <li>context - create a debug context (see GLX_CONTEXT_DEBUG_BIT_ARB) and
+         print error and performance messages to stderr (or MESA_LOG_FILE).</li>
+   </ul>
+<li>MESA_LOG_FILE - specifies a file name for logging all errors, warnings,
+etc., rather than stderr
+<li>MESA_TEX_PROG - if set, implement conventional texture env modes with
+fragment programs (intended for developers only)
+<li>MESA_TNL_PROG - if set, implement conventional vertex transformation
+operations with vertex programs (intended for developers only).
+Setting this variable automatically sets the MESA_TEX_PROG variable as well.
+<li>MESA_EXTENSION_OVERRIDE - can be used to enable/disable extensions.
+A value such as "GL_EXT_foo -GL_EXT_bar" will enable the GL_EXT_foo extension
+and disable the GL_EXT_bar extension.
+<li>MESA_EXTENSION_MAX_YEAR - The GL_EXTENSIONS string returned by Mesa is sorted
+by extension year.
+If this variable is set to year X, only extensions defined on or before year
+X will be reported.
+This is to work-around a bug in some games where the extension string is
+copied into a fixed-size buffer without truncating.
+If the extension string is too long, the buffer overrun can cause the game
+to crash.
+This is a work-around for that.
+<li>MESA_GL_VERSION_OVERRIDE - changes the value returned by
+glGetString(GL_VERSION) and possibly the GL API type.
+<ul>
+<li> The format should be MAJOR.MINOR[FC]
+<li> FC is an optional suffix that indicates a forward compatible context.
+This is only valid for versions &gt;= 3.0.
+<li> GL versions &lt; 3.0 are set to a compatibility (non-Core) profile
+<li> GL versions = 3.0, see below
+<li> GL versions &gt; 3.0 are set to a Core profile
+<li> Examples: 2.1, 3.0, 3.0FC, 3.1, 3.1FC
+<ul>
+<li> 2.1 - select a compatibility (non-Core) profile with GL version 2.1
+<li> 3.0 - select a compatibility (non-Core) profile with GL version 3.0
+<li> 3.0FC - select a Core+Forward Compatible profile with GL version 3.0
+<li> 3.1 - select a Core profile with GL version 3.1
+<li> 3.1FC - select a Core+Forward Compatible profile with GL version 3.1
 </ul>
-</dd>
-<dt><code>MESA_GLES_VERSION_OVERRIDE</code></dt>
-<dd>changes the value returned by <code>glGetString(GL_VERSION)</code>
-    for OpenGL ES.
-<ul>
-<li> The format should be <code>MAJOR.MINOR</code>
-<li> Examples: <code>2.0</code>, <code>3.0</code>, <code>3.1</code>
 <li> Mesa may not really implement all the features of the given version.
 (for developers only)
 </ul>
-</dd>
-<dt><code>MESA_GLSL_VERSION_OVERRIDE</code></dt>
-<dd>changes the value returned by
-    <code>glGetString(GL_SHADING_LANGUAGE_VERSION)</code>.
-    Valid values are integers, such as <code>130</code>.  Mesa will not
-    really implement all the features of the given language version if
-    it's higher than what's normally reported. (for developers only)
-</dd>
-<dt><code>MESA_GLSL_CACHE_DISABLE</code></dt>
-<dd>if set to <code>true</code>, disables the GLSL shader cache</dd>
-<dt><code>MESA_GLSL_CACHE_MAX_SIZE</code></dt>
-<dd>if set, determines the maximum size of the on-disk cache of compiled GLSL
-    programs. Should be set to a number optionally followed by <code>K</code>,
-    <code>M</code>, or <code>G</code> to specify a size in kilobytes,
-    megabytes, or gigabytes. By default, gigabytes will be assumed. And if
-    unset, a maximum size of 1GB will be used. Note: A separate cache might
-    be created for each architecture that Mesa is installed for on your
-    system. For example under the default settings you may end up with a 1GB
-    cache for x86_64 and another 1GB cache for i386.</dd>
-<dt><code>MESA_GLSL_CACHE_DIR</code></dt>
-<dd>if set, determines the directory to be used for the on-disk cache of
-    compiled GLSL programs. If this variable is not set, then the cache will
-    be stored in <code>$XDG_CACHE_HOME/mesa_shader_cache</code> (if that
-    variable is set), or else within <code>.cache/mesa_shader_cache</code>
-    within the user's home directory.
-</dd>
-<dt><code>MESA_GLSL</code></dt>
-<dd><a href="shading.html#envvars">shading language compiler options</a></dd>
-<dt><code>MESA_NO_MINMAX_CACHE</code></dt>
-<dd>when set, the minmax index cache is globally disabled.</dd>
-<dt><code>MESA_SHADER_CAPTURE_PATH</code></dt>
-<dd>see <a href="shading.html#capture">Capturing Shaders</a></dd>
-<dt><code>MESA_SHADER_DUMP_PATH</code> and <code>MESA_SHADER_READ_PATH</code></dt>
-<dd>see <a href="shading.html#replacement">Experimenting with Shader Replacements</a></dd>
-<dt><code>MESA_VK_VERSION_OVERRIDE</code></dt>
-<dd>changes the Vulkan physical device version
-    as returned in <code>VkPhysicalDeviceProperties::apiVersion</code>.
-  <ul>
-    <li>The format should be <code>MAJOR.MINOR[.PATCH]</code></li>
-    <li>This will not let you force a version higher than the driver's
-        instance version as advertised by
-        <code>vkEnumerateInstanceVersion</code></li>
-    <li>This can be very useful for debugging but some features may not be
-        implemented correctly. (For developers only)</li>
-  </ul>
-</dd>
-</dl>
-
-
-<h2>NIR passes enviroment variables</h2>
-<p>
-The following are only applicable for drivers that uses NIR, as they
-modify the behaviour for the common NIR_PASS and NIR_PASS_V macros,
-that wrap calls to NIR lowering/optimizations.
-</p>
-
-<dl>
-  <dt><code>NIR_PRINT</code></dt>
-  <dd>If defined, the resulting NIR shader will be printed out at each succesful NIR lowering/optimization call.</dd>
-  <dt><code>NIR_TEST_CLONE</code></dt>
-  <dd>If defined, cloning a NIR shader would be tested at each succesful NIR lowering/optimization call.</dd>
-  <dt><code>NIR_TEST_SERIALIZE</code></dt>
-  <dd>If defined, serialize and deserialize a NIR shader would be tested at each succesful NIR lowering/optimization call.</dd>
-</dl>
+<li>MESA_GLES_VERSION_OVERRIDE - changes the value returned by
+glGetString(GL_VERSION) for OpenGL ES.
+<ul>
+<li> The format should be MAJOR.MINOR
+<li> Examples: 2.0, 3.0, 3.1
+<li> Mesa may not really implement all the features of the given version.
+(for developers only)
+</ul>
+<li>MESA_GLSL_VERSION_OVERRIDE - changes the value returned by
+glGetString(GL_SHADING_LANGUAGE_VERSION). Valid values are integers, such as
+"130".  Mesa will not really implement all the features of the given language version
+if it's higher than what's normally reported. (for developers only)
+<li>MESA_GLSL_CACHE_DISABLE - if set, disables the GLSL shader cache
+<li>MESA_GLSL_CACHE_MAX_SIZE - if set, determines the maximum size of
+the on-disk cache of compiled GLSL programs. Should be set to a number
+optionally followed by 'K', 'M', or 'G' to specify a size in
+kilobytes, megabytes, or gigabytes. By default, gigabytes will be
+assumed. And if unset, a maximum size of 1GB will be used. Note: A separate
+cache might be created for each architecture that Mesa is installed for on
+your system. For example under the default settings you may end up with a 1GB
+cache for x86_64 and another 1GB cache for i386.
+<li>MESA_GLSL_CACHE_DIR - if set, determines the directory to be used
+for the on-disk cache of compiled GLSL programs. If this variable is
+not set, then the cache will be stored in $XDG_CACHE_HOME/mesa (if
+that variable is set), or else within .cache/mesa within the user's
+home directory.
+<li>MESA_GLSL - <a href="shading.html#envvars">shading language compiler options</a>
+<li>MESA_NO_MINMAX_CACHE - when set, the minmax index cache is globally disabled.
+</ul>


 <h2>Mesa Xlib driver environment variables</h2>
@@ -233,137 +139,79 @@ that wrap calls to NIR lowering/optimizations.
 The following are only applicable to the Mesa Xlib software driver.
 See the <a href="xlibdriver.html">Xlib software driver page</a> for details.
 </p>
-<dl>
-<dt><code>MESA_RGB_VISUAL</code></dt>
-<dd>specifies the X visual and depth for RGB mode</dd>
-<dt><code>MESA_CI_VISUAL</code></dt>
-<dd>specifies the X visual and depth for CI mode</dd>
-<dt><code>MESA_BACK_BUFFER</code></dt>
-<dd>specifies how to implement the back color buffer, either
-    <code>pixmap</code> or <code>ximage</code></dd>
-<dt><code>MESA_GAMMA</code></dt>
-<dd>gamma correction coefficients for red, green, blue channels</dd>
-<dt><code>MESA_XSYNC</code></dt>
-<dd>enable synchronous X behavior (for debugging only)</dd>
-<dt><code>MESA_GLX_FORCE_CI</code></dt>
-<dd>if set, force GLX to treat 8bpp visuals as CI visuals</dd>
-<dt><code>MESA_GLX_FORCE_ALPHA</code></dt>
-<dd>if set, forces RGB windows to have an alpha channel.</dd>
-<dt><code>MESA_GLX_DEPTH_BITS</code></dt>
-<dd>specifies default number of bits for depth buffer.</dd>
-<dt><code>MESA_GLX_ALPHA_BITS</code></dt>
-<dd>specifies default number of bits for alpha channel.</dd>
-</dl>
+<ul>
+<li>MESA_RGB_VISUAL - specifies the X visual and depth for RGB mode
+<li>MESA_CI_VISUAL - specifies the X visual and depth for CI mode
+<li>MESA_BACK_BUFFER - specifies how to implement the back color buffer,
+    either "pixmap" or "ximage"
+<li>MESA_GAMMA - gamma correction coefficients for red, green, blue channels
+<li>MESA_XSYNC - enable synchronous X behavior (for debugging only)
+<li>MESA_GLX_FORCE_CI - if set, force GLX to treat 8bpp visuals as CI visuals
+<li>MESA_GLX_FORCE_ALPHA - if set, forces RGB windows to have an alpha channel.
+<li>MESA_GLX_DEPTH_BITS - specifies default number of bits for depth buffer.
+<li>MESA_GLX_ALPHA_BITS - specifies default number of bits for alpha channel.
+</ul>


 <h2>i945/i965 driver environment variables (non-Gallium)</h2>

-<dl>
-<dt><code>INTEL_NO_HW</code></dt>
-<dd>if set to 1, prevents batches from being submitted to the hardware.
-    This is useful for debugging hangs, etc.</dd>
-<dt><code>INTEL_DEBUG</code></dt>
-<dd>a comma-separated list of named flags, which do various things:
-<dl>
-   <dt><code>ann</code></dt>
-   <dd>annotate IR in assembly dumps</dd>
-   <dt><code>aub</code></dt>
-   <dd>dump batches into an AUB trace for use with simulation tools</dd>
-   <dt><code>bat</code></dt>
-   <dd>emit batch information</dd>
-   <dt><code>blit</code></dt>
-   <dd>emit messages about blit operations</dd>
-   <dt><code>blorp</code></dt>
-   <dd>emit messages about the blorp operations (blits &amp; clears)</dd>
-   <dt><code>buf</code></dt>
-   <dd>emit messages about buffer objects</dd>
-   <dt><code>clip</code></dt>
-   <dd>emit messages about the clip unit (for old gens, includes the CLIP program)</dd>
-   <dt><code>color</code></dt>
-   <dd>use color in output</dd>
-   <dt><code>cs</code></dt>
-   <dd>dump shader assembly for compute shaders</dd>
-   <dt><code>do32</code></dt>
-   <dd>generate compute shader SIMD32 programs even if workgroup size doesn't exceed the SIMD16 limit</dd>
-   <dt><code>dri</code></dt>
-   <dd>emit messages about the DRI interface</dd>
-   <dt><code>fbo</code></dt>
-   <dd>emit messages about framebuffers</dd>
-   <dt><code>fs</code></dt>
-   <dd>dump shader assembly for fragment shaders</dd>
-   <dt><code>gs</code></dt>
-   <dd>dump shader assembly for geometry shaders</dd>
-   <dt><code>hex</code></dt>
-   <dd>print instruction hex dump with the disassembly</dd>
-   <dt><code>l3</code></dt>
-   <dd>emit messages about the new L3 state during transitions</dd>
-   <dt><code>miptree</code></dt>
-   <dd>emit messages about miptrees</dd>
-   <dt><code>no8</code></dt>
-   <dd>don't generate SIMD8 fragment shader</dd>
-   <dt><code>no16</code></dt>
-   <dd>suppress generation of 16-wide fragment shaders. useful for debugging broken shaders</dd>
-   <dt><code>nocompact</code></dt>
-   <dd>disable instruction compaction</dd>
-   <dt><code>nodualobj</code></dt>
-   <dd>suppress generation of dual-object geometry shader code</dd>
-   <dt><code>norbc</code></dt>
-   <dd>disable single sampled render buffer compression</dd>
-   <dt><code>optimizer</code></dt>
-   <dd>dump shader assembly to files at each optimization pass and iteration that make progress</dd>
-   <dt><code>perf</code></dt>
-   <dd>emit messages about performance issues</dd>
-   <dt><code>perfmon</code></dt>
-   <dd>emit messages about <code>AMD_performance_monitor</code></dd>
-   <dt><code>pix</code></dt>
-   <dd>emit messages about pixel operations</dd>
-   <dt><code>prim</code></dt>
-   <dd>emit messages about drawing primitives</dd>
-   <dt><code>reemit</code></dt>
-   <dd>mark all state dirty on each draw call</dd>
-   <dt><code>sf</code></dt>
-   <dd>emit messages about the strips &amp; fans unit (for old gens, includes the SF program)</dd>
-   <dt><code>shader_time</code></dt>
-   <dd>record how much GPU time is spent in each shader</dd>
-   <dt><code>spill_fs</code></dt>
-   <dd>force spilling of all registers in the scalar backend (useful to debug spilling code)</dd>
-   <dt><code>spill_vec4</code></dt>
-   <dd>force spilling of all registers in the vec4 backend (useful to debug spilling code)</dd>
-   <dt><code>state</code></dt>
-   <dd>emit messages about state flag tracking</dd>
-   <dt><code>submit</code></dt>
-   <dd>emit batchbuffer usage statistics</dd>
-   <dt><code>sync</code></dt>
-   <dd>after sending each batch, emit a message and wait for that batch to finish rendering</dd>
-   <dt><code>tcs</code></dt>
-   <dd>dump shader assembly for tessellation control shaders</dd>
-   <dt><code>tes</code></dt>
-   <dd>dump shader assembly for tessellation evaluation shaders</dd>
-   <dt><code>tex</code></dt>
-   <dd>emit messages about textures.</dd>
-   <dt><code>urb</code></dt>
-   <dd>emit messages about URB setup</dd>
-   <dt><code>vert</code></dt>
-   <dd>emit messages about vertex assembly</dd>
-   <dt><code>vs</code></dt>
-   <dd>dump shader assembly for vertex shaders</dd>
-</dl>
-</dd>
-<dt><code>INTEL_SCALAR_VS</code> (or <code>TCS</code>, <code>TES</code>,
-    <code>GS</code>)</dt>
-<dd>force scalar/vec4 mode for a shader stage (Gen8-9 only)</dd>
-<dt><code>INTEL_PRECISE_TRIG</code></dt>
-<dd>if set to 1, true or yes, then the driver prefers accuracy over
-    performance in trig functions.</dd>
-</dl>
+<ul>
+<li>INTEL_NO_HW - if set to 1, prevents batches from being submitted to the hardware.
+   This is useful for debugging hangs, etc.</li>
+<li>INTEL_DEBUG - a comma-separated list of named flags, which do various things:
+<ul>
+   <li>color - use color in output</li>
+   <li>tex - emit messages about textures.</li>
+   <li>state - emit messages about state flag tracking</li>
+   <li>blit - emit messages about blit operations</li>
+   <li>miptree - emit messages about miptrees</li>
+   <li>perf - emit messages about performance issues</li>
+   <li>perfmon - emit messages about AMD_performance_monitor</li>
+   <li>bat - emit batch information</li>
+   <li>pix - emit messages about pixel operations</li>
+   <li>buf - emit messages about buffer objects</li>
+   <li>fbo - emit messages about framebuffers</li>
+   <li>fs - dump shader assembly for fragment shaders</li>
+   <li>gs - dump shader assembly for geometry shaders</li>
+   <li>sync - after sending each batch, emit a message and wait for that batch to finish rendering</li>
+   <li>prim - emit messages about drawing primitives</li>
+   <li>vert - emit messages about vertex assembly</li>
+   <li>dri - emit messages about the DRI interface</li>
+   <li>sf - emit messages about the strips &amp; fans unit (for old gens, includes the SF program)</li>
+   <li>stats - enable statistics counters. you probably actually want perfmon or intel_gpu_top instead.</li>
+   <li>urb - emit messages about URB setup</li>
+   <li>vs - dump shader assembly for vertex shaders</li>
+   <li>clip - emit messages about the clip unit (for old gens, includes the CLIP program)</li>
+   <li>aub - dump batches into an AUB trace for use with simulation tools</li>
+   <li>shader_time - record how much GPU time is spent in each shader</li>
+   <li>no16 - suppress generation of 16-wide fragment shaders. useful for debugging broken shaders</li>
+   <li>blorp - emit messages about the blorp operations (blits &amp; clears)</li>
+   <li>nodualobj - suppress generation of dual-object geometry shader code</li>
+   <li>optimizer - dump shader assembly to files at each optimization pass and iteration that make progress</li>
+   <li>ann - annotate IR in assembly dumps</li>
+   <li>no8 - don't generate SIMD8 fragment shader</li>
+   <li>vec4 - force vec4 mode in vertex shader</li>
+   <li>spill_fs - force spilling of all registers in the scalar backend (useful to debug spilling code)</li>
+   <li>spill_vec4 - force spilling of all registers in the vec4 backend (useful to debug spilling code)</li>
+   <li>cs - dump shader assembly for compute shaders</li>
+   <li>hex - print instruction hex dump with the disassembly</li>
+   <li>nocompact - disable instruction compaction</li>
+   <li>tcs - dump shader assembly for tessellation control shaders</li>
+   <li>tes - dump shader assembly for tessellation evaluation shaders</li>
+   <li>l3 - emit messages about the new L3 state during transitions</li>
+   <li>do32 - generate compute shader SIMD32 programs even if workgroup size doesn't exceed the SIMD16 limit</li>
+   <li>norbc - disable single sampled render buffer compression</li>
+</ul>
+<li>INTEL_PRECISE_TRIG - if set to 1, true or yes, then the driver prefers
+   accuracy over performance in trig functions.</li>
+</ul>


 <h2>Radeon driver environment variables (radeon, r200, and r300g)</h2>

-<dl>
-<dt><code>RADEON_NO_TCL</code></dt>
-<dd>if set, disable hardware-accelerated Transform/Clip/Lighting.</dd>
-</dl>
+<ul>
+<li>RADEON_NO_TCL - if set, disable hardware-accelerated Transform/Clip/Lighting.
+</ul>


 <h2>EGL environment variables</h2>
@@ -376,170 +224,111 @@ Mesa EGL supports different sets of environment variables.  See the

 <h2>Gallium environment variables</h2>

-<dl>
-<dt><code>GALLIUM_HUD</code></dt>
-<dd>draws various information on the screen, like framerate,
+<ul>
+<li>GALLIUM_HUD - draws various information on the screen, like framerate,
    cpu load, driver statistics, performance counters, etc.
-    Set <code>GALLIUM_HUD=help</code> and run e.g.
-    <code>glxgears</code> for more info.</dd>
-<dt><code>GALLIUM_HUD_PERIOD</code></dt>
-<dd>sets the hud update rate in seconds (float). Use zero
-    to update every frame. The default period is 1/2 second.</dd>
-<dt><code>GALLIUM_HUD_VISIBLE</code></dt>
-<dd>control default visibility, defaults to true.</dd>
-<dt><code>GALLIUM_HUD_TOGGLE_SIGNAL</code></dt>
-<dd>toggle visibility via user specified signal.
+    Set GALLIUM_HUD=help and run e.g. glxgears for more info.
+<li>GALLIUM_HUD_PERIOD - sets the hud update rate in seconds (float). Use zero
+    to update every frame. The default period is 1/2 second.
+<li>GALLIUM_HUD_VISIBLE - control default visibility, defaults to true.
+<li>GALLIUM_HUD_TOGGLE_SIGNAL - toggle visibility via user specified signal.
    Especially useful to toggle hud at specific points of application and
    disable for unencumbered viewing the rest of the time. For example, set
-    <code>GALLIUM_HUD_VISIBLE</code> to <code>false</code> and
-    <code>GALLIUM_HUD_TOGGLE_SIGNAL</code> to <code>10</code>
-    (<code>SIGUSR1</code>).
-    Use <code>kill -10 &lt;pid&gt;</code> to toggle the hud as desired.</dd>
-<dt><code>GALLIUM_HUD_DUMP_DIR</code></dt>
-<dd>specifies a directory for writing the displayed hud values into files.</dd>
-<dt><code>GALLIUM_DRIVER</code></dt>
-<dd>useful in combination with <code>LIBGL_ALWAYS_SOFTWARE=true</code> for
-    choosing one of the software renderers <code>softpipe</code>,
-    <code>llvmpipe</code> or <code>swr</code>.</dd>
-<dt><code>GALLIUM_LOG_FILE</code></dt>
-<dd>specifies a file for logging all errors, warnings, etc.
-    rather than stderr.</dd>
-<dt><code>GALLIUM_PRINT_OPTIONS</code></dt>
-<dd>if non-zero, print all the Gallium environment variables which are
-    used, and their current values.</dd>
-<dt><code>GALLIUM_DUMP_CPU</code></dt>
-<dd>if non-zero, print information about the CPU on start-up</dd>
-<dt><code>TGSI_PRINT_SANITY</code></dt>
-<dd>if set, do extra sanity checking on TGSI shaders and
-    print any errors to stderr.</dd>
-<dt><code>DRAW_FSE</code></dt>
-<dd>???</dd>
-<dt><code>DRAW_NO_FSE</code></dt>
-<dd>???</dd>
-<dt><code>DRAW_USE_LLVM</code></dt>
-<dd>if set to zero, the draw module will not use LLVM to execute
-    shaders, vertex fetch, etc.</dd>
-<dt><code>ST_DEBUG</code></dt>
-<dd>controls debug output from the Mesa/Gallium state tracker.
-    Setting to <code>tgsi</code>, for example, will print all the TGSI
-    shaders. See <code>src/mesa/state_tracker/st_debug.c</code> for other
-    options.</dd>
-</dl>
+    GALLIUM_HUD_VISIBLE to false and GALLIUM_HUD_TOGGLE_SIGNAL to 10 (SIGUSR1).
+    Use kill -10 <pid> to toggle the hud as desired.
+<li>GALLIUM_HUD_DUMP_DIR - specifies a directory for writing the displayed
+    hud values into files.
+<li>GALLIUM_DRIVER - useful in combination with LIBGL_ALWAYS_SOFTWARE=1 for
+    choosing one of the software renderers "softpipe", "llvmpipe" or "swr".
+<li>GALLIUM_LOG_FILE - specifies a file for logging all errors, warnings, etc.
+    rather than stderr.
+<li>GALLIUM_PRINT_OPTIONS - if non-zero, print all the Gallium environment
+    variables which are used, and their current values.
+<li>GALLIUM_DUMP_CPU - if non-zero, print information about the CPU on start-up
+<li>TGSI_PRINT_SANITY - if set, do extra sanity checking on TGSI shaders and
+    print any errors to stderr.
+<LI>DRAW_FSE - ???
+<LI>DRAW_NO_FSE - ???
+<li>DRAW_USE_LLVM - if set to zero, the draw module will not use LLVM to execute
+    shaders, vertex fetch, etc.
+<li>ST_DEBUG - controls debug output from the Mesa/Gallium state tracker.
+Setting to "tgsi", for example, will print all the TGSI shaders.
+See src/mesa/state_tracker/st_debug.c for other options.
+</ul>

 <h3>Clover state tracker environment variables</h3>

-<dl>
-<dt><code>CLOVER_EXTRA_BUILD_OPTIONS</code></dt>
-<dd>allows specifying additional compiler and linker
+<ul>
+<li>CLOVER_EXTRA_BUILD_OPTIONS - allows specifying additional compiler and linker
    options. Specified options are appended after the options set by the OpenCL
-    program in <code>clBuildProgram</code>.</dd>
-<dt><code>CLOVER_EXTRA_COMPILE_OPTIONS</code></dt>
-<dd>allows specifying additional compiler
+    program in clBuildProgram.
+<li>CLOVER_EXTRA_COMPILE_OPTIONS - allows specifying additional compiler
    options. Specified options are appended after the options set by the OpenCL
-    program in <code>clCompileProgram</code>.</dd>
-<dt><code>CLOVER_EXTRA_LINK_OPTIONS</code></dt>
-<dd>allows specifying additional linker
+    program in clCompileProgram.
+<li>CLOVER_EXTRA_LINK_OPTIONS - allows specifying additional linker
    options. Specified options are appended after the options set by the OpenCL
-    program in <code>clLinkProgram</code>.</dd>
-</dl>
+    program in clLinkProgram.
+</ul>


 <h3>Softpipe driver environment variables</h3>
-<dl>
-<dt><code>SOFTPIPE_DUMP_FS</code></dt>
-<dd>if set, the softpipe driver will print fragment shaders to stderr</dd>
-<dt><code>SOFTPIPE_DUMP_GS</code></dt>
-<dd>if set, the softpipe driver will print geometry shaders to stderr</dd>
-<dt><code>SOFTPIPE_NO_RAST</code></dt>
-<dd>if set, rasterization is no-op'd.  For profiling purposes.</dd>
-<dt><code>SOFTPIPE_USE_LLVM</code></dt>
-<dd>if set, the softpipe driver will try to use LLVM JIT for
-    vertex shading processing.</dd>
-</dl>
+<ul>
+<li>SOFTPIPE_DUMP_FS - if set, the softpipe driver will print fragment shaders
+    to stderr
+<li>SOFTPIPE_DUMP_GS - if set, the softpipe driver will print geometry shaders
+    to stderr
+<li>SOFTPIPE_NO_RAST - if set, rasterization is no-op'd.  For profiling purposes.
+<li>SOFTPIPE_USE_LLVM - if set, the softpipe driver will try to use LLVM JIT for
+    vertex shading processing.
+</ul>


 <h3>LLVMpipe driver environment variables</h3>
-<dl>
-<dt><code>LP_NO_RAST</code></dt>
-<dd>if set LLVMpipe will no-op rasterization</dd>
-<dt><code>LP_DEBUG</code></dt>
-<dd>a comma-separated list of debug options is accepted.  See the
-    source code for details.</dd>
-<dt><code>LP_PERF</code></dt>
-<dd>a comma-separated list of options to selectively no-op various
-    parts of the driver.  See the source code for details.</dd>
-<dt><code>LP_NUM_THREADS</code></dt>
-<dd>an integer indicating how many threads to use for rendering.
+<ul>
+<li>LP_NO_RAST - if set LLVMpipe will no-op rasterization
+<li>LP_DEBUG - a comma-separated list of debug options is accepted.  See the
+    source code for details.
+<li>LP_PERF - a comma-separated list of options to selectively no-op various
+    parts of the driver.  See the source code for details.
+<li>LP_NUM_THREADS - an integer indicating how many threads to use for rendering.
    Zero turns off threading completely.  The default value is the number of CPU
-    cores present.</dd>
-</dl>
+    cores present.
+</ul>

 <h3>VMware SVGA driver environment variables</h3>
-<dl>
-<dt><code>SVGA_FORCE_SWTNL</code></dt>
-<dd>force use of software vertex transformation</dd>
-<dt><code>SVGA_NO_SWTNL</code></dt>
-<dd>don't allow software vertex transformation fallbacks (will often result
-    in incorrect rendering).</dd>
-<dt><code>SVGA_DEBUG</code></dt>
-<dd>for dumping shaders, constant buffers, etc.  See the code for
-    details.</dd>
-<dt><code>SVGA_EXTRA_LOGGING</code></dt>
-<dd>if set, enables extra logging to the <code>vmware.log</code> file,
-    such as the OpenGL program's name and command line arguments.</dd>
-<dt><code>SVGA_NO_LOGGING</code></dt>
-<dd>if set, disables logging to the <code>vmware.log</code> file. This is
-    useful when using Valgrind because it otherwise crashes when
-    initializing the host log feature.</dd>
-</dl>
-<p>See the driver code for other, lesser-used variables.</p>
+<ul>
+<li>SVGA_FORCE_SWTNL - force use of software vertex transformation
+<li>SVGA_NO_SWTNL - don't allow software vertex transformation fallbacks
+(will often result in incorrect rendering).
+<li>SVGA_DEBUG - for dumping shaders, constant buffers, etc.  See the code
+for details.
+<li>See the driver code for other, lesser-used variables.
+</ul>

-<h3>WGL environment variables</h3>
-<dl>
-<dt><code>WGL_SWAP_INTERVAL</code></dt>
-<dd>to set a swap interval, equivalent to calling
-    <code>wglSwapIntervalEXT()</code> in an application.  If this
-    environment variable is set, application calls to
-    <code>wglSwapIntervalEXT()</code> will have no effect.</dd>
-</dl>

 <h3>VA-API state tracker environment variables</h3>
-<dl>
-<dt><code>VAAPI_MPEG4_ENABLED</code></dt>
-<dd>enable MPEG4 for VA-API, disabled by default.</dd>
-</dl>
+<ul>
+<li>VAAPI_MPEG4_ENABLED - enable MPEG4 for VA-API, disabled by default.
+</ul>


 <h3>VC4 driver environment variables</h3>
-<dl>
-<dt><code>VC4_DEBUG</code></dt>
-<dd>a comma-separated list of named flags, which do various things:
-<dl>
-   <dt><code>cl</code></dt>
-   <dd>dump command list during creation</dd>
-   <dt><code>qpu</code></dt>
-   <dd>dump generated QPU instructions</dd>
-   <dt><code>qir</code></dt>
-   <dd>dump QPU IR during program compile</dd>
-   <dt><code>nir</code></dt>
-   <dd>dump NIR during program compile</dd>
-   <dt><code>tgsi</code></dt>
-   <dd>dump TGSI during program compile</dd>
-   <dt><code>shaderdb</code></dt>
-   <dd>dump program compile information for shader-db analysis</dd>
-   <dt><code>perf</code></dt>
-   <dd>print during performance-related events</dd>
-   <dt><code>norast</code></dt>
-   <dd>skip actual hardware execution of commands</dd>
-   <dt><code>always_flush</code></dt>
-   <dd>flush after each draw call</dd>
-   <dt><code>always_sync</code></dt>
-   <dd>wait for finish after each flush</dd>
-   <dt><code>dump</code></dt>
-   <dd>write a GPU command stream trace file (VC4 simulator only)</dd>
-</dl>
-</dd>
-</dl>
+<ul>
+<li>VC4_DEBUG - a comma-separated list of named flags, which do various things:
+<ul>
+   <li>cl - dump command list during creation</li>
+   <li>qpu - dump generated QPU instructions</li>
+   <li>qir - dump QPU IR during program compile</li>
+   <li>nir - dump NIR during program compile</li>
+   <li>tgsi - dump TGSI during program compile</li>
+   <li>shaderdb - dump program compile information for shader-db analysis</li>
+   <li>perf - print during performance-related events</li>
+   <li>norast - skip actual hardware execution of commands</li>
+   <li>always_flush - flush after each draw call</li>
+   <li>always_sync - wait for finish after each flush</li>
+   <li>dump - write a GPU command stream trace file (VC4 simulator only)</li>
+</ul>
+</ul>


 <p>
--- a/docs/extensions.html
+++ b/docs/extensions.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
@@ -23,7 +23,7 @@ The specifications follow.


 <ul>
-<li><a href="specs/OLD/MESA_agp_offset.spec">MESA_agp_offset.spec</a>
+<li><a href="specs/MESA_agp_offset.spec">MESA_agp_offset.spec</a>
 <li><a href="specs/MESA_copy_sub_buffer.spec">MESA_copy_sub_buffer.spec</a>
 <li><a href="specs/MESA_drm_image.spec">MESA_drm_image.spec</a>
 <li><a href="specs/MESA_multithread_makecurrent.spec">MESA_multithread_makecurrent.spec</a>
@@ -33,7 +33,7 @@ The specifications follow.
 <li><a href="specs/OLD/MESA_program_debug.spec">MESA_program_debug.spec</a> (obsolete)
 <li><a href="specs/MESA_release_buffers.spec">MESA_release_buffers.spec</a>
 <li><a href="specs/OLD/MESA_resize_buffers.spec">MESA_resize_buffers.spec</a> (obsolete)
-<li><a href="specs/OLD/MESA_set_3dfx_mode.spec">MESA_set_3dfx_mode.spec</a>
+<li><a href="specs/MESA_set_3dfx_mode.spec">MESA_set_3dfx_mode.spec</a>
 <li><a href="specs/MESA_shader_debug.spec">MESA_shader_debug.spec</a>
 <li><a href="specs/OLD/MESA_sprite_point.spec">MESA_sprite_point.spec</a> (obsolete)
 <li><a href="specs/MESA_swap_control.spec">MESA_swap_control.spec</a>
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -2,32 +2,42 @@
 <html lang="en">
 <head>
  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>Frequently Asked Questions</title>
+  <title>Mesa FAQ</title>
  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
 <div class="content">

-<h1>Frequently Asked Questions</h1>
-Last updated: 19 September 2018
+<center>
+<h1>Mesa Frequently Asked Questions</h1>
+Last updated: 9 October 2012
+</center>

+<br>
+<br>
 <h2>Index</h2>
-<ol>
-  <li><a href="#part1">High-level Questions and Answers</a></li>
-  <li><a href="#part2">Compilation and Installation Problems</a></li>
-  <li><a href="#part3">Runtime / Rendering Problems</a></li>
-  <li><a href="#part4">Developer Questions</a></li>
-</ol>
+<a href="#part1">1. High-level Questions and Answers</a>
+<br>
+<a href="#part2">2. Compilation and Installation Problems</a>
+<br>
+<a href="#part3">3. Runtime / Rendering Problems</a>
+<br>
+<a href="#part4">4. Developer Questions</a>
+<br>
+<br>
+<br>

-<h2 id="part1">1. High-level Questions and Answers</h2>

-<h3>1.1 What is Mesa?</h3>
+
+<h1 id="part1">1. High-level Questions and Answers</h1>
+
+<h2>1.1 What is Mesa?</h2>
 <p>
 Mesa is an open-source implementation of the OpenGL specification.
 OpenGL is a programming library for writing interactive 3D applications.
@@ -96,17 +106,17 @@ the Xlib API:
 <li>The GLX wire protocol is not supported and there's no OpenGL extension
    loaded by the X server.
 <li>There is no hardware acceleration.
-<li>The OpenGL library, <code>libGL.so</code>, contains everything (the
-    programming API, the GLX functions and all the rendering code).
+<li>The OpenGL library, libGL.so, contains everything (the programming API,
+    the GLX functions and all the rendering code).
 </ul>
 <p>
 Alternately, Mesa acts as the core for a number of OpenGL hardware drivers
 within the DRI (Direct Rendering Infrastructure):
 <ul>
-<li>The <code>libGL.so</code> library provides the GL and GLX API functions,
-    a GLX protocol encoder, and a device driver loader.
-<li>The device driver modules (such as <code>r200_dri.so</code>) contain
-    a built-in copy of the core Mesa code.
+<li>The libGL.so library provides the GL and GLX API functions, a GLX
+    protocol encoder, and a device driver loader.
+<li>The device driver modules (such as r200_dri.so) contain a built-in
+    copy of the core Mesa code.
 <li>The X server loads the GLX module.
    The GLX module decodes incoming GLX protocol and dispatches the commands
    to a rendering module.
@@ -126,7 +136,7 @@ Just follow the Mesa <a href="install.html">compilation instructions</a>.

 <h2>1.6 Are there other open-source implementations of OpenGL?</h2>
 <p>
-Yes, SGI's <a href="http://web.archive.org/web/20171010115110_/http://oss.sgi.com/projects/ogl-sample/index.html">
+Yes, SGI's <a href="http://oss.sgi.com/projects/ogl-sample/index.html">
 OpenGL Sample Implementation (SI)</a> is available.
 The SI was written during the time that OpenGL was originally designed.
 Unfortunately, development of the SI has stagnated.
@@ -138,9 +148,8 @@ Mesa is much more up to date with modern features and extensions.
 an open-source implementation of OpenGL ES for mobile devices.

 <p>
-<a href="http://web.archive.org/web/20130830162848/http://www.dsbox.com/minigl.html">miniGL</a>
-is a subset of OpenGL for PalmOS devices. The website is gone, but the source
-code can still be found on <a href="https://sourceforge.net/projects/minigl/">sourceforge.net</a>.
+<a href="http://www.dsbox.com/minigl.html">miniGL</a>
+is a subset of OpenGL for PalmOS devices.

 <p>
 <a href="http://bellard.org/TinyGL/">TinyGL</a>
@@ -170,16 +179,22 @@ popular and feature-complete.
 </p>


-<h2 id="part2">2. Compilation and Installation Problems</h2>

-<h3>2.1 What's the easiest way to install Mesa?</h3>
+<br>
+<br>
+
+
+<h1 id="part2">2. Compilation and Installation Problems</h1>
+
+
+<h2>2.1 What's the easiest way to install Mesa?</h2>
 <p>
 If you're using a Linux-based system, your distro CD most likely already
 has Mesa packages (like RPM or DEB) which you can easily install.
 </p>


-<h3>2.2 I get undefined symbols such as bgnpolygon, v3f, etc...</h3>
+<h2>2.2 I get undefined symbols such as bgnpolygon, v3f, etc...</h2>
 <p>
 You're application is written in IRIS GL, not OpenGL.
 IRIS GL was the predecessor to OpenGL and is a different thing (almost)
@@ -188,72 +203,63 @@ Mesa's not the solution.
 </p>


-<h3>2.3 Where is the GLUT library?</h3>
+<h2>2.3 Where is the GLUT library?</h2>
 <p>
-GLUT (OpenGL Utility Toolkit) is no longer in the separate
-<code>MesaGLUT-x.y.z.tar.gz</code> file.
+GLUT (OpenGL Utility Toolkit) is no longer in the separate MesaGLUT-x.y.z.tar.gz file.
 If you don't already have GLUT installed, you should grab 
 <a href="http://freeglut.sourceforge.net/">freeglut</a>.
 </p>


-<h3>2.4 Where is the GLw library?</h3>
+<h2>2.4 Where is the GLw library?</h2>
 <p>
-GLw (OpenGL widget library) is now available from a separate <a href="https://gitlab.freedesktop.org/mesa/glw">git repository</a>.  Unless you're using very old Xt/Motif applications with OpenGL, you shouldn't need it.
+GLw (OpenGL widget library) is now available from a separate <a href="https://cgit.freedesktop.org/mesa/glw/">git repository</a>.  Unless you're using very old Xt/Motif applications with OpenGL, you shouldn't need it.
 </p>


 <h2>2.5 What's the proper place for the libraries and headers?</h2>
 <p>
 On Linux-based systems you'll want to follow the
-<a href="https://www.khronos.org/registry/OpenGL/ABI/">Linux ABI</a> standard.
+<a href="http://oss.sgi.com/projects/ogl-sample/ABI/index.html">Linux ABI</a> standard.
 Basically you'll want the following:
 </p>
-<dl>
-<dt><code>/usr/include/GL/gl.h</code></dt>
-<dd>the main OpenGL header</dd>
-<dt><code>/usr/include/GL/glu.h</code></dt>
-<dd>the OpenGL GLU (utility) header</dd>
-<dt><code>/usr/include/GL/glx.h</code></dt>
-<dd>the OpenGL GLX header</dd>
-<dt><code>/usr/include/GL/glext.h</code></dt>
-<dd>the OpenGL extensions header</dd>
-<dt><code>/usr/include/GL/glxext.h</code></dt>
-<dd>the OpenGL GLX extensions header</dd>
-<dt><code>/usr/include/GL/osmesa.h</code></dt>
-<dd>the Mesa off-screen rendering header</dd>
-<dt><code>/usr/lib/libGL.so</code></dt>
-<dd>a symlink to <code>libGL.so.1</code></dd>
-<dt><code>/usr/lib/libGL.so.1</code></dt>
-<dd>a symlink to <code>libGL.so.1.xyz</code></dd>
-<dt><code>/usr/lib/libGL.so.xyz</code></dt>
-<dd>the actual OpenGL/Mesa library.  xyz denotes the
+<ul>
+<li>/usr/include/GL/gl.h - the main OpenGL header
+</li><li>/usr/include/GL/glu.h - the OpenGL GLU (utility) header
+</li><li>/usr/include/GL/glx.h - the OpenGL GLX header
+</li><li>/usr/include/GL/glext.h - the OpenGL extensions header
+</li><li>/usr/include/GL/glxext.h - the OpenGL GLX extensions header
+</li><li>/usr/include/GL/osmesa.h - the Mesa off-screen rendering header
+</li><li>/usr/lib/libGL.so - a symlink to libGL.so.1
+</li><li>/usr/lib/libGL.so.1 - a symlink to libGL.so.1.xyz
+</li><li>/usr/lib/libGL.so.xyz - the actual OpenGL/Mesa library.  xyz denotes the
 Mesa version number.
-</dd>
-</dl>
+</li></ul>
 <p>
-When configuring Mesa, there are three meson options that affect the install
+When configuring Mesa, there are three autoconf options that affect the install
 location that you should take care with: <code>--prefix</code>,
-<code>--libdir</code>, and <code>-D dri-drivers-path</code>. To install Mesa
+<code>--libdir</code>, and <code>--with-dri-driverdir</code>. To install Mesa
 into the system location where it will be available for all programs to use, set
 <code>--prefix=/usr</code>. Set <code>--libdir</code> to where your Linux
 distribution installs system libraries, usually either <code>/usr/lib</code> or
-<code>/usr/lib64</code>. Set <code>-D dri-drivers-path</code> to the directory
+<code>/usr/lib64</code>. Set <code>--with-dri-driverdir</code> to the directory
 where your Linux distribution installs DRI drivers. To find your system's DRI
 driver directory, try executing <code>find /usr -type d -name dri</code>. For
 example, if the <code>find</code> command listed <code>/usr/lib64/dri</code>,
-then set <code>-D dri-drivers-path=/usr/lib64/dri</code>.
+then set <code>--with-dri-driverdir=/usr/lib64/dri</code>.
 </p>
 <p>
 After determining the correct values for the install location, configure Mesa
-with <code>meson configure --prefix=/usr --libdir=xxx -D dri-drivers-path=xxx</code>
-and then install with <code>sudo ninja install</code>.
+with <code>./configure --prefix=/usr --libdir=xxx --with-dri-driverdir=xxx</code>
+and then install with <code>sudo make install</code>.
 </p>
+<br>
+<br>


-<h2 id="part3">3. Runtime / Rendering Problems</h2>
+<h1 id="part3">3. Runtime / Rendering Problems</h1>

-<h3>3.1 Rendering is slow / why isn't my graphics hardware being used?</h3>
+<h2>3.1 Rendering is slow / why isn't my graphics hardware being used?</h2>
 <p>
 If Mesa can't use its hardware accelerated drivers it falls back on one of its software renderers.
 (eg. classic swrast, softpipe or llvmpipe)
@@ -274,57 +280,60 @@ If your DRI-based driver isn't working, go to the
 </p>


-<h3>3.2 I'm seeing errors in depth (Z) buffering.  Why?</h3>
+<h2>3.2 I'm seeing errors in depth (Z) buffering.  Why?</h2>
 <p>
 Make sure the ratio of the far to near clipping planes isn't too great.
 Look
-<a href="https://www.opengl.org/archives/resources/faq/technical/depthbuffer.htm#0040">here</a>
+<a href="https://www.opengl.org/resources/faq/technical/depthbuffer.htm#0040">here</a>
 for details.
 </p>
 <p>
 Mesa uses a 16-bit depth buffer by default which is smaller and faster
 to clear than a 32-bit buffer but not as accurate.
 If you need a deeper you can modify the parameters to
-<code>glXChooseVisual</code> in your code.
+<code> glXChooseVisual</code> in your code.
 </p>


-<h3>3.3 Why Isn't depth buffering working at all?</h3>
+<h2>3.3 Why Isn't depth buffering working at all?</h2>
 <p>
-Be sure you're requesting a depth buffered-visual.  If you set the
-<code>MESA_DEBUG</code> environment variable it will warn you about trying
-to enable depth testing when you don't have a depth buffer.
+Be sure you're requesting a depth buffered-visual.  If you set the MESA_DEBUG
+environment variable it will warn you about trying to enable depth testing
+when you don't have a depth buffer.
 </p>
 <p>Specifically, make sure <code>glutInitDisplayMode</code> is being called
 with <code>GLUT_DEPTH</code> or <code>glXChooseVisual</code> is being
-called with a non-zero value for <code>GLX_DEPTH_SIZE</code>.
+called with a non-zero value for GLX_DEPTH_SIZE.
 </p>
 <p>This discussion applies to stencil buffers, accumulation buffers and
 alpha channels too.
 </p>


-<h3>3.4 Why does <code>glGetString()</code> always return <code>NULL</code>?</h3>
+<h2>3.4 Why does glGetString() always return NULL?</h2>
 <p>
 Be sure you have an active/current OpenGL rendering context before
-calling <code>glGetString</code>.
+calling glGetString.
 </p>


-<h3>3.5 <code>GL_POINTS</code> and <code>GL_LINES</code> don't touch the
-right pixels</h3>
+<h2>3.5 GL_POINTS and GL_LINES don't touch the right pixels</h2>
 <p>
-If you're trying to draw a filled region by using <code>GL_POINTS</code> or
-<code>GL_LINES</code> and seeing holes or gaps it's because of a float-to-int
-rounding problem. But this is not a bug. See Appendix H of the OpenGL
-Programming Guide - "OpenGL Correctness Tips". Basically, applying a
-translation of (0.375, 0.375, 0.0) to your coordinates will fix the problem.
+If you're trying to draw a filled region by using GL_POINTS or GL_LINES
+and seeing holes or gaps it's because of a float-to-int rounding problem.
+But this is not a bug.
+See Appendix H of the OpenGL Programming Guide - "OpenGL Correctness Tips".
+Basically, applying a translation of (0.375, 0.375, 0.0) to your coordinates
+will fix the problem.
 </p>

+<br>
+<br>

-<h2 id="part4">4. Developer Questions</h2>

-<h3>4.1 How can I contribute?</h3>
+<h1 id="part4">4. Developer Questions</h1>
+
+<h2>4.1 How can I contribute?</h2>
 <p>
 First, join the <a href="lists.html">mesa-dev mailing list</a>.
 That's where Mesa development is discussed.
@@ -338,7 +347,7 @@ You should read it.
 extensions, writing hardware drivers (for the DRI), and code optimization.
 </p>

-<h3>4.2 How do I write a new device driver?</h3>
+<h2>4.2 How do I write a new device driver?</h2>
 <p>
 Unfortunately, writing a device driver isn't easy.
 It requires detailed understanding of OpenGL, the Mesa code, and your
@@ -362,19 +371,20 @@ the archives) is a good way to get information.
 </p>


-<h3>4.3 Why isn't <code>GL_EXT_texture_compression_s3tc</code> implemented in
-Mesa?</h3>
+<h2>4.3 Why isn't GL_EXT_texture_compression_s3tc implemented in Mesa?</h2>
 <p>
-Oh but it is! Prior to 2nd October 2017, the Mesa project did not include s3tc
-support due to intellectual property (IP) and/or patent issues around the s3tc
-algorithm.
+The <a href="http://oss.sgi.com/projects/ogl-sample/registry/EXT/texture_compression_s3tc.txt">specification for the extension</a>
+indicates that there are intellectual property (IP) and/or patent issues
+to be dealt with.
+</p>
+<p>We've been unsuccessful in getting a response from S3 (or whoever owns
+the IP nowadays) to indicate whether or not an open source project can
+implement the extension (specifically the compression/decompression
+algorithms).
 </p>
 <p>
-As of Mesa 17.3.0, Mesa now officially supports s3tc, as the patent has expired.
-</p>
-<p>
-In versions prior to this, a 3rd party <a href="https://dri.freedesktop.org/wiki/S3TC">
-plug-in library</a> was required.
+In the mean time, a 3rd party <a href="https://dri.freedesktop.org/wiki/S3TC">
+plug-in library</a> is available.
 </p>

 </div>
--- a/docs/favicon.ico
+++ b/docs/favicon.ico
--- a/docs/favicon.png
+++ b/docs/favicon.png
--- a/docs/features.txt
+++ b/docs/features.txt
@@ -24,19 +24,16 @@ not started

 # OpenGL Core and Compatibility context support

-Some drivers do not support the Compatibility profile or the
-ARB_compatibility extensions.  If an application does not request a
-specific version without the forward-compatiblity flag, such drivers
-will be limited to OpenGL 3.0.  If an application requests OpenGL 3.1,
-it will get a context that may or may not have the ARB_compatibility
-extension enabled.  Some of the later GL features are exposed in the 3.0
-context as extensions.
+OpenGL 3.1 and later versions are only supported with the Core profile.
+There are no plans to support GL_ARB_compatibility. The last supported OpenGL
+version with all deprecated features is 3.0. Some of the later GL features
+are exposed in the 3.0 context as extensions.


 Feature                                                 Status
 ------------------------------------------------------- ------------------------

-GL 3.0, GLSL 1.30 --- all DONE: freedreno, i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe, swr, virgl
+GL 3.0, GLSL 1.30 --- all DONE: freedreno, i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe, swr

  glBindFragDataLocation, glGetFragDataLocation         DONE
  GL_NV_conditional_render (Conditional rendering)      DONE ()
@@ -63,12 +60,12 @@ GL 3.0, GLSL 1.30 --- all DONE: freedreno, i965, nv50, nvc0, r600, radeonsi, llv
  glVertexAttribI commands                              DONE
  Depth format cube textures                            DONE ()
  GLX_ARB_create_context (GLX 1.4 is required)          DONE
-  Multisample anti-aliasing                             DONE (freedreno/a5xx+, freedreno (*), llvmpipe (*), softpipe (*), swr (*))
+  Multisample anti-aliasing                             DONE (freedreno (*), llvmpipe (*), softpipe (*), swr (*))

-(*) freedreno (a2xx-a4xx), llvmpipe, softpipe, and swr have fake Multisample anti-aliasing support
+(*) freedreno, llvmpipe, softpipe, and swr have fake Multisample anti-aliasing support


-GL 3.1, GLSL 1.40 --- all DONE: freedreno, i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe, swr, virgl
+GL 3.1, GLSL 1.40 --- all DONE: freedreno, i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe, swr

  Forward compatible context support/deprecations       DONE ()
  GL_ARB_draw_instanced (Instanced drawing)             DONE ()
@@ -81,7 +78,7 @@ GL 3.1, GLSL 1.40 --- all DONE: freedreno, i965, nv50, nvc0, r600, radeonsi, llv
  GL_EXT_texture_snorm (Signed normalized textures)     DONE ()


-GL 3.2, GLSL 1.50 --- all DONE: i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe, swr, virgl
+GL 3.2, GLSL 1.50 --- all DONE: i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe, swr

  Core/compatibility profiles                           DONE
  Geometry shaders                                      DONE ()
@@ -90,13 +87,13 @@ GL 3.2, GLSL 1.50 --- all DONE: i965, nv50, nvc0, r600, radeonsi, llvmpipe, soft
  GL_ARB_fragment_coord_conventions (Frag shader coord) DONE (freedreno)
  GL_ARB_provoking_vertex (Provoking vertex)            DONE (freedreno)
  GL_ARB_seamless_cube_map (Seamless cubemaps)          DONE (freedreno)
-  GL_ARB_texture_multisample (Multisample textures)     DONE (freedreno/a5xx+)
+  GL_ARB_texture_multisample (Multisample textures)     DONE ()
  GL_ARB_depth_clamp (Frag depth clamp)                 DONE (freedreno)
  GL_ARB_sync (Fence objects)                           DONE (freedreno)
  GLX_ARB_create_context_profile                        DONE


-GL 3.3, GLSL 3.30 --- all DONE: i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe, virgl
+GL 3.3, GLSL 3.30 --- all DONE: i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe

  GL_ARB_blend_func_extended                            DONE (freedreno/a3xx, swr)
  GL_ARB_explicit_attrib_location                       DONE (all drivers that support GLSL)
@@ -105,162 +102,146 @@ GL 3.3, GLSL 3.30 --- all DONE: i965, nv50, nvc0, r600, radeonsi, llvmpipe, soft
  GL_ARB_shader_bit_encoding                            DONE (freedreno, swr)
  GL_ARB_texture_rgb10_a2ui                             DONE (freedreno, swr)
  GL_ARB_texture_swizzle                                DONE (freedreno, swr)
-  GL_ARB_timer_query                                    DONE (freedreno, swr)
+  GL_ARB_timer_query                                    DONE (swr)
  GL_ARB_instanced_arrays                               DONE (freedreno, swr)
  GL_ARB_vertex_type_2_10_10_10_rev                     DONE (freedreno, swr)


-GL 4.0, GLSL 4.00 --- all DONE: i965/gen7+, nvc0, r600, radeonsi, virgl
+GL 4.0, GLSL 4.00 --- all DONE: i965/gen7+, nvc0, r600, radeonsi

  GL_ARB_draw_buffers_blend                             DONE (freedreno, i965/gen6+, nv50, llvmpipe, softpipe, swr)
-  GL_ARB_draw_indirect                                  DONE (freedreno, i965/gen7+, llvmpipe, softpipe, swr)
+  GL_ARB_draw_indirect                                  DONE (i965/gen7+, llvmpipe, softpipe, swr)
  GL_ARB_gpu_shader5                                    DONE (i965/gen7+)
-  - 'precise' qualifier                                 DONE (softpipe)
+  - 'precise' qualifier                                 DONE
  - Dynamically uniform sampler array indices           DONE (softpipe)
-  - Dynamically uniform UBO array indices               DONE (freedreno, softpipe)
-  - Implicit signed -> unsigned conversions             DONE (softpipe)
-  - Fused multiply-add                                  DONE (softpipe)
-  - Packing/bitfield/conversion functions               DONE (freedreno, softpipe)
-  - Enhanced textureGather                              DONE (freedreno, softpipe)
+  - Dynamically uniform UBO array indices               DONE ()
+  - Implicit signed -> unsigned conversions             DONE
+  - Fused multiply-add                                  DONE ()
+  - Packing/bitfield/conversion functions               DONE (softpipe)
+  - Enhanced textureGather                              DONE (softpipe)
  - Geometry shader instancing                          DONE (llvmpipe, softpipe)
-  - Geometry shader multiple streams                    DONE (softpipe)
+  - Geometry shader multiple streams                    DONE ()
  - Enhanced per-sample shading                         DONE ()
-  - Interpolation functions                             DONE (softpipe)
-  - New overload resolution rules                       DONE (softpipe)
-  GL_ARB_gpu_shader_fp64                                DONE (i965/gen7+, llvmpipe, softpipe, swr)
-  GL_ARB_sample_shading                                 DONE (freedreno/a6xx, i965/gen6+, nv50)
-  GL_ARB_shader_subroutine                              DONE (freedreno, i965/gen6+, nv50, llvmpipe, softpipe, swr)
+  - Interpolation functions                             DONE ()
+  - New overload resolution rules                       DONE
+  GL_ARB_gpu_shader_fp64                                DONE (i965/gen7+, llvmpipe, softpipe)
+  GL_ARB_sample_shading                                 DONE (i965/gen6+, nv50)
+  GL_ARB_shader_subroutine                              DONE (i965/gen6+, nv50, llvmpipe, softpipe, swr)
  GL_ARB_tessellation_shader                            DONE (i965/gen7+)
-  GL_ARB_texture_buffer_object_rgb32                    DONE (freedreno, i965/gen6+, llvmpipe, softpipe, swr)
-  GL_ARB_texture_cube_map_array                         DONE (i965/gen6+, nv50, llvmpipe, softpipe, swr)
-  GL_ARB_texture_gather                                 DONE (freedreno, i965/gen6+, nv50, llvmpipe, softpipe, swr)
-  GL_ARB_texture_query_lod                              DONE (freedreno, i965, nv50, llvmpipe, softpipe, swr)
+  GL_ARB_texture_buffer_object_rgb32                    DONE (i965/gen6+, llvmpipe, softpipe, swr)
+  GL_ARB_texture_cube_map_array                         DONE (i965/gen6+, nv50, llvmpipe, softpipe)
+  GL_ARB_texture_gather                                 DONE (i965/gen6+, nv50, llvmpipe, softpipe, swr)
+  GL_ARB_texture_query_lod                              DONE (i965, nv50, softpipe)
  GL_ARB_transform_feedback2                            DONE (i965/gen6+, nv50, llvmpipe, softpipe, swr)
  GL_ARB_transform_feedback3                            DONE (i965/gen7+, llvmpipe, softpipe, swr)


-GL 4.1, GLSL 4.10 --- all DONE: i965/gen7+, nvc0, r600, radeonsi, virgl
+GL 4.1, GLSL 4.10 --- all DONE: i965/gen7+, nvc0, r600, radeonsi

-  GL_ARB_ES2_compatibility                              DONE (freedreno, i965, nv50, llvmpipe, softpipe, swr)
-  GL_ARB_get_program_binary                             DONE (0 or 1 binary formats)
+  GL_ARB_ES2_compatibility                              DONE (i965, nv50, llvmpipe, softpipe, swr)
+  GL_ARB_get_program_binary                             DONE (0 binary formats)
  GL_ARB_separate_shader_objects                        DONE (all drivers)
  GL_ARB_shader_precision                               DONE (i965/gen7+, all drivers that support GLSL 4.10)
-  GL_ARB_vertex_attrib_64bit                            DONE (i965/gen7+, llvmpipe, softpipe, swr)
-  GL_ARB_viewport_array                                 DONE (i965, nv50, llvmpipe, softpipe, swr)
+  GL_ARB_vertex_attrib_64bit                            DONE (i965/gen7+, llvmpipe, softpipe)
+  GL_ARB_viewport_array                                 DONE (i965, nv50, llvmpipe, softpipe)


-GL 4.2, GLSL 4.20 -- all DONE: i965/gen7+, nvc0, r600, radeonsi, virgl
+GL 4.2, GLSL 4.20 -- all DONE: i965/gen7+, nvc0, radeonsi

-  GL_ARB_texture_compression_bptc                       DONE (freedreno, i965)
+  GL_ARB_texture_compression_bptc                       DONE (i965, r600)
  GL_ARB_compressed_texture_pixel_storage               DONE (all drivers)
-  GL_ARB_shader_atomic_counters                         DONE (freedreno/a5xx+, i965, llvmpipe, softpipe)
+  GL_ARB_shader_atomic_counters                         DONE (i965, softpipe)
  GL_ARB_texture_storage                                DONE (all drivers)
-  GL_ARB_transform_feedback_instanced                   DONE (freedreno, i965, nv50, llvmpipe, softpipe, swr)
-  GL_ARB_base_instance                                  DONE (freedreno, i965, nv50, llvmpipe, softpipe, swr)
-  GL_ARB_shader_image_load_store                        DONE (freedreno/a5xx+, i965, softpipe)
+  GL_ARB_transform_feedback_instanced                   DONE (i965, nv50, r600, llvmpipe, softpipe, swr)
+  GL_ARB_base_instance                                  DONE (i965, nv50, r600, llvmpipe, softpipe, swr)
+  GL_ARB_shader_image_load_store                        DONE (i965, softpipe)
  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)
  GL_ARB_shading_language_packing                       DONE (all drivers)
-  GL_ARB_internalformat_query                           DONE (freedreno, i965, nv50, llvmpipe, softpipe, swr)
+  GL_ARB_internalformat_query                           DONE (i965, nv50, r600, llvmpipe, softpipe, swr)
  GL_ARB_map_buffer_alignment                           DONE (all drivers)


-GL 4.3, GLSL 4.30 -- all DONE: i965/gen8+, nvc0, r600, radeonsi, virgl
+GL 4.3, GLSL 4.30 -- all DONE: i965/gen8+, nvc0, radeonsi

  GL_ARB_arrays_of_arrays                               DONE (all drivers that support GLSL 1.30)
  GL_ARB_ES3_compatibility                              DONE (all drivers that support GLSL 3.30)
  GL_ARB_clear_buffer_object                            DONE (all drivers)
-  GL_ARB_compute_shader                                 DONE (freedreno/a5xx+, i965, softpipe)
-  GL_ARB_copy_image                                     DONE (i965, nv50, softpipe, llvmpipe, swr)
+  GL_ARB_compute_shader                                 DONE (i965, softpipe)
+  GL_ARB_copy_image                                     DONE (i965, nv50, r600, softpipe, llvmpipe)
  GL_KHR_debug                                          DONE (all drivers)
  GL_ARB_explicit_uniform_location                      DONE (all drivers that support GLSL)
-  GL_ARB_fragment_layer_viewport                        DONE (i965, nv50, llvmpipe, softpipe)
-  GL_ARB_framebuffer_no_attachments                     DONE (freedreno, i965, softpipe)
+  GL_ARB_fragment_layer_viewport                        DONE (i965, nv50, r600, llvmpipe, softpipe)
+  GL_ARB_framebuffer_no_attachments                     DONE (i965, r600, softpipe)
  GL_ARB_internalformat_query2                          DONE (all drivers)
  GL_ARB_invalidate_subdata                             DONE (all drivers)
-  GL_ARB_multi_draw_indirect                            DONE (freedreno, i965, llvmpipe, softpipe, swr)
+  GL_ARB_multi_draw_indirect                            DONE (i965, r600, llvmpipe, softpipe, swr)
  GL_ARB_program_interface_query                        DONE (all drivers)
  GL_ARB_robust_buffer_access_behavior                  DONE (i965)
-  GL_ARB_shader_image_size                              DONE (freedreno/a5xx+, i965, softpipe)
-  GL_ARB_shader_storage_buffer_object                   DONE (freedreno/a5xx+, i965, llvmpipe, softpipe)
-  GL_ARB_stencil_texturing                              DONE (freedreno, i965/hsw+, nv50, llvmpipe, softpipe, swr)
-  GL_ARB_texture_buffer_range                           DONE (freedreno, nv50, i965, softpipe, llvmpipe, swr)
+  GL_ARB_shader_image_size                              DONE (i965, softpipe)
+  GL_ARB_shader_storage_buffer_object                   DONE (i965, softpipe)
+  GL_ARB_stencil_texturing                              DONE (i965/hsw+, nv50, r600, llvmpipe, softpipe, swr)
+  GL_ARB_texture_buffer_range                           DONE (nv50, i965, r600, 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 (freedreno, i965, nv50, llvmpipe, softpipe, swr)
+  GL_ARB_texture_view                                   DONE (i965, nv50, r600, llvmpipe, softpipe, swr)
  GL_ARB_vertex_attrib_binding                          DONE (all drivers)


-GL 4.4, GLSL 4.40 -- all DONE: i965/gen8+, nvc0, r600, radeonsi
+GL 4.4, GLSL 4.40 -- all DONE: i965/gen8+, nvc0, radeonsi

  GL_MAX_VERTEX_ATTRIB_STRIDE                           DONE (all drivers)
-  GL_ARB_buffer_storage                                 DONE (freedreno, i965, nv50, llvmpipe, swr)
-  GL_ARB_clear_texture                                  DONE (i965, nv50, llvmpipe, softpipe, swr)
-  GL_ARB_enhanced_layouts                               DONE (i965, nv50, llvmpipe, softpipe, virgl)
+  GL_ARB_buffer_storage                                 DONE (i965, nv50, r600, llvmpipe, swr)
+  GL_ARB_clear_texture                                  DONE (i965, nv50, r600, llvmpipe, softpipe, swr)
+  GL_ARB_enhanced_layouts                               DONE (i965, nv50, llvmpipe, softpipe)
  - compile-time constant expressions                   DONE
  - explicit byte offsets for blocks                    DONE
  - forced alignment within blocks                      DONE
-  - specified vec4-slot component numbers               DONE
+  - specified vec4-slot component numbers               DONE (i965, nv50, llvmpipe, softpipe)
  - specified transform/feedback layout                 DONE
  - input/output block locations                        DONE
  GL_ARB_multi_bind                                     DONE (all drivers)
-  GL_ARB_query_buffer_object                            DONE (i965/hsw+, virgl)
-  GL_ARB_texture_mirror_clamp_to_edge                   DONE (i965, nv50, llvmpipe, softpipe, swr, virgl)
-  GL_ARB_texture_stencil8                               DONE (freedreno, i965/hsw+, nv50, llvmpipe, softpipe, swr, virgl)
-  GL_ARB_vertex_type_10f_11f_11f_rev                    DONE (i965, nv50, llvmpipe, softpipe, swr, virgl)
+  GL_ARB_query_buffer_object                            DONE (i965/hsw+)
+  GL_ARB_texture_mirror_clamp_to_edge                   DONE (i965, nv50, r600, llvmpipe, softpipe, swr)
+  GL_ARB_texture_stencil8                               DONE (i965/hsw+, nv50, r600, llvmpipe, softpipe, swr)
+  GL_ARB_vertex_type_10f_11f_11f_rev                    DONE (i965, nv50, r600, llvmpipe, softpipe, swr)

-GL 4.5, GLSL 4.50 -- all DONE: nvc0, radeonsi, r600
+GL 4.5, GLSL 4.50 -- all DONE: nvc0, radeonsi

-  GL_ARB_ES3_1_compatibility                            DONE (i965/hsw+, softpipe, virgl)
-  GL_ARB_clip_control                                   DONE (freedreno, i965, nv50, llvmpipe, softpipe, swr)
-  GL_ARB_conditional_render_inverted                    DONE (freedreno, i965, nv50, llvmpipe, softpipe, swr, virgl)
-  GL_ARB_cull_distance                                  DONE (i965, nv50, llvmpipe, softpipe, swr, virgl)
-  GL_ARB_derivative_control                             DONE (i965, nv50, softpipe, virgl)
+  GL_ARB_ES3_1_compatibility                            DONE (i965/hsw+)
+  GL_ARB_clip_control                                   DONE (i965, nv50, r600, llvmpipe, softpipe, swr)
+  GL_ARB_conditional_render_inverted                    DONE (i965, nv50, r600, llvmpipe, softpipe, swr)
+  GL_ARB_cull_distance                                  DONE (i965, nv50, llvmpipe, softpipe, swr)
+  GL_ARB_derivative_control                             DONE (i965, nv50, r600)
  GL_ARB_direct_state_access                            DONE (all drivers)
  GL_ARB_get_texture_sub_image                          DONE (all drivers)
-  GL_ARB_shader_texture_image_samples                   DONE (i965, nv50, virgl)
-  GL_ARB_texture_barrier                                DONE (freedreno, i965, nv50, virgl)
+  GL_ARB_shader_texture_image_samples                   DONE (i965, nv50, r600)
+  GL_ARB_texture_barrier                                DONE (i965, nv50, r600)
  GL_KHR_context_flush_control                          DONE (all - but needs GLX/EGL extension to be useful)
-  GL_KHR_robustness                                     DONE (freedreno, i965)
+  GL_KHR_robustness                                     DONE (i965)
  GL_EXT_shader_integer_mix                             DONE (all drivers that support GLSL)

-GL 4.6, GLSL 4.60
-
-  GL_ARB_gl_spirv                                       in progress (Nicolai Hähnle, Ian Romanick)
-  GL_ARB_indirect_parameters                            DONE (i965/gen7+, nvc0, radeonsi, virgl)
-  GL_ARB_pipeline_statistics_query                      DONE (i965, nvc0, r600, radeonsi, llvmpipe, softpipe, swr)
-  GL_ARB_polygon_offset_clamp                           DONE (freedreno, i965, nv50, nvc0, r600, radeonsi, llvmpipe, swr, virgl)
-  GL_ARB_shader_atomic_counter_ops                      DONE (freedreno/a5xx+, i965/gen7+, nvc0, r600, radeonsi, llvmpipe, softpipe, virgl)
-  GL_ARB_shader_draw_parameters                         DONE (i965, nvc0, radeonsi)
-  GL_ARB_shader_group_vote                              DONE (i965, nvc0, radeonsi)
-  GL_ARB_spirv_extensions                               in progress (Nicolai Hähnle, Ian Romanick)
-  GL_ARB_texture_filter_anisotropic                     DONE (freedreno, i965, nv50, nvc0, r600, radeonsi, softpipe (*), llvmpipe (*))
-  GL_ARB_transform_feedback_overflow_query              DONE (i965/gen6+, nvc0, radeonsi, llvmpipe, softpipe, virgl)
-  GL_KHR_no_error                                       DONE (all drivers)
-
-(*) softpipe and llvmpipe advertise 16x anisotropy but simply ignore the setting
-
 These are the extensions cherry-picked to make GLES 3.1
-GLES3.1, GLSL ES 3.1 -- all DONE: i965/hsw+, nvc0, r600, radeonsi, virgl
+GLES3.1, GLSL ES 3.1 -- all DONE: i965/hsw+, nvc0, radeonsi

  GL_ARB_arrays_of_arrays                               DONE (all drivers that support GLSL 1.30)
-  GL_ARB_compute_shader                                 DONE (freedreno/a5xx+, i965/gen7+, softpipe)
-  GL_ARB_draw_indirect                                  DONE (freedreno, i965/gen7+, llvmpipe, softpipe, swr)
+  GL_ARB_compute_shader                                 DONE (i965/gen7+, softpipe)
+  GL_ARB_draw_indirect                                  DONE (i965/gen7+, r600, llvmpipe, softpipe, swr)
  GL_ARB_explicit_uniform_location                      DONE (all drivers that support GLSL)
-  GL_ARB_framebuffer_no_attachments                     DONE (freedreno, i965/gen7+, softpipe)
+  GL_ARB_framebuffer_no_attachments                     DONE (i965/gen7+, r600, softpipe)
  GL_ARB_program_interface_query                        DONE (all drivers)
-  GL_ARB_shader_atomic_counters                         DONE (freedreno/a5xx+, i965/gen7+, llvmpipe, softpipe)
-  GL_ARB_shader_image_load_store                        DONE (freedreno/a5xx+, i965/gen7+, softpipe)
-  GL_ARB_shader_image_size                              DONE (freedreno/a5xx+, i965/gen7+, softpipe)
-  GL_ARB_shader_storage_buffer_object                   DONE (freedreno/a5xx+, i965/gen7+, llvmpipe, softpipe)
+  GL_ARB_shader_atomic_counters                         DONE (i965/gen7+, softpipe)
+  GL_ARB_shader_image_load_store                        DONE (i965/gen7+, softpipe)
+  GL_ARB_shader_image_size                              DONE (i965/gen7+, softpipe)
+  GL_ARB_shader_storage_buffer_object                   DONE (i965/gen7+, softpipe)
  GL_ARB_shading_language_packing                       DONE (all drivers)
  GL_ARB_separate_shader_objects                        DONE (all drivers)
-  GL_ARB_stencil_texturing                              DONE (freedreno, nv50, llvmpipe, softpipe, swr)
-  GL_ARB_texture_multisample (Multisample textures)     DONE (freedreno/a5xx+, i965/gen7+, nv50, llvmpipe, softpipe)
+  GL_ARB_stencil_texturing                              DONE (nv50, r600, llvmpipe, softpipe, swr)
+  GL_ARB_texture_multisample (Multisample textures)     DONE (i965/gen7+, nv50, r600, llvmpipe, softpipe)
  GL_ARB_texture_storage_multisample                    DONE (all drivers that support GL_ARB_texture_multisample)
  GL_ARB_vertex_attrib_binding                          DONE (all drivers)
-  GS5 Enhanced textureGather                            DONE (freedreno, i965/gen7+)
-  GS5 Packing/bitfield/conversion functions             DONE (freedreno/a5xx+, i965/gen6+)
+  GS5 Enhanced textureGather                            DONE (i965/gen7+, r600)
+  GS5 Packing/bitfield/conversion functions             DONE (i965/gen6+, r600)
  GL_EXT_shader_integer_mix                             DONE (all drivers that support GLSL)

  Additional functionality not covered above:
@@ -269,140 +250,80 @@ GLES3.1, GLSL ES 3.1 -- all DONE: i965/hsw+, nvc0, r600, radeonsi, virgl
      glGetBooleani_v - restrict to GLES enums
      gl_HelperInvocation support                       DONE (i965, r600)

-GLES3.2, GLSL ES 3.2 -- all DONE: i965/gen9+, radeonsi, virgl
+GLES3.2, GLSL ES 3.2 -- all DONE: i965/gen9+

  GL_EXT_color_buffer_float                             DONE (all drivers)
-  GL_KHR_blend_equation_advanced                        DONE (freedreno/a6xx, i965, nvc0)
+  GL_KHR_blend_equation_advanced                        DONE (i965, nvc0)
  GL_KHR_debug                                          DONE (all drivers)
-  GL_KHR_robustness                                     DONE (freedreno, i965, nvc0)
-  GL_KHR_texture_compression_astc_ldr                   DONE (freedreno, i965/gen9+)
+  GL_KHR_robustness                                     DONE (i965, nvc0, radeonsi)
+  GL_KHR_texture_compression_astc_ldr                   DONE (i965/gen9+)
  GL_OES_copy_image                                     DONE (all drivers)
  GL_OES_draw_buffers_indexed                           DONE (all drivers that support GL_ARB_draw_buffers_blend)
  GL_OES_draw_elements_base_vertex                      DONE (all drivers)
-  GL_OES_geometry_shader                                DONE (i965/hsw+, nvc0, softpipe)
-  GL_OES_gpu_shader5                                    DONE (freedreno/a6xx, all drivers that support GL_ARB_gpu_shader5)
-  GL_OES_primitive_bounding_box                         DONE (freedreno/a5xx+, i965/gen7+, nvc0, softpipe)
-  GL_OES_sample_shading                                 DONE (freedreno/a6xx, i965, nvc0, r600)
-  GL_OES_sample_variables                               DONE (freedreno/a6xx, i965, nvc0, r600)
+  GL_OES_geometry_shader                                DONE (i965/hsw+, nvc0, radeonsi)
+  GL_OES_gpu_shader5                                    DONE (all drivers that support GL_ARB_gpu_shader5)
+  GL_OES_primitive_bounding_box                         DONE (i965/gen7+, nvc0, radeonsi)
+  GL_OES_sample_shading                                 DONE (i965, nvc0, r600, radeonsi)
+  GL_OES_sample_variables                               DONE (i965, nvc0, r600, radeonsi)
  GL_OES_shader_image_atomic                            DONE (all drivers that support GL_ARB_shader_image_load_store)
  GL_OES_shader_io_blocks                               DONE (All drivers that support GLES 3.1)
-  GL_OES_shader_multisample_interpolation               DONE (freedreno/a6xx, i965, nvc0, r600)
+  GL_OES_shader_multisample_interpolation               DONE (i965, nvc0, r600, radeonsi)
  GL_OES_tessellation_shader                            DONE (all drivers that support GL_ARB_tessellation_shader)
  GL_OES_texture_border_clamp                           DONE (all drivers)
-  GL_OES_texture_buffer                                 DONE (freedreno, i965, nvc0, softpipe)
-  GL_OES_texture_cube_map_array                         DONE (i965/hsw+, nvc0, softpipe)
+  GL_OES_texture_buffer                                 DONE (i965, nvc0, radeonsi)
+  GL_OES_texture_cube_map_array                         DONE (i965/hsw+, nvc0, radeonsi)
  GL_OES_texture_stencil8                               DONE (all drivers that support GL_ARB_texture_stencil8)
  GL_OES_texture_storage_multisample_2d_array           DONE (all drivers that support GL_ARB_texture_multisample)

 Khronos, ARB, and OES extensions that are not part of any OpenGL or OpenGL ES version:

-  GL_ARB_bindless_texture                               DONE (nvc0, radeonsi)
+  GL_ARB_bindless_texture                               started (airlied)
  GL_ARB_cl_event                                       not started
  GL_ARB_compute_variable_group_size                    DONE (nvc0, radeonsi)
-  GL_ARB_ES3_2_compatibility                            DONE (i965/gen8+, radeonsi, virgl)
-  GL_ARB_fragment_shader_interlock                      DONE (i965)
+  GL_ARB_ES3_2_compatibility                            DONE (i965/gen8+)
+  GL_ARB_fragment_shader_interlock                      not started
+  GL_ARB_gl_spirv                                       not started
  GL_ARB_gpu_shader_int64                               DONE (i965/gen8+, nvc0, radeonsi, softpipe, llvmpipe)
-  GL_ARB_parallel_shader_compile                        DONE (all drivers)
-  GL_ARB_post_depth_coverage                            DONE (i965, nvc0, radeonsi)
+  GL_ARB_indirect_parameters                            DONE (nvc0, radeonsi)
+  GL_ARB_parallel_shader_compile                        not started, but Chia-I Wu did some related work in 2014
+  GL_ARB_pipeline_statistics_query                      DONE (i965, nvc0, radeonsi, softpipe, swr)
+  GL_ARB_post_depth_coverage                            DONE (i965)
  GL_ARB_robustness_isolation                           not started
-  GL_ARB_sample_locations                               DONE (nvc0)
-  GL_ARB_seamless_cubemap_per_texture                   DONE (etnaviv/SEAMLESS_CUBE_MAP, freedreno, i965, nvc0, radeonsi, r600, softpipe, swr, virgl)
-  GL_ARB_shader_ballot                                  DONE (i965/gen8+, nvc0, radeonsi)
-  GL_ARB_shader_clock                                   DONE (i965/gen7+, nv50, nvc0, r600, radeonsi, virgl)
-  GL_ARB_shader_stencil_export                          DONE (i965/gen9+, r600, radeonsi, softpipe, llvmpipe, swr, virgl)
-  GL_ARB_shader_viewport_layer_array                    DONE (i965/gen6+, nvc0, radeonsi)
+  GL_ARB_sample_locations                               not started
+  GL_ARB_seamless_cubemap_per_texture                   DONE (i965, nvc0, radeonsi, r600, softpipe, swr)
+  GL_ARB_shader_atomic_counter_ops                      DONE (i965/gen7+, nvc0, radeonsi, softpipe)
+  GL_ARB_shader_ballot                                  DONE (nvc0, radeonsi)
+  GL_ARB_shader_clock                                   DONE (i965/gen7+, nv50, nvc0, radeonsi)
+  GL_ARB_shader_draw_parameters                         DONE (i965, nvc0, radeonsi)
+  GL_ARB_shader_group_vote                              DONE (nvc0, radeonsi)
+  GL_ARB_shader_stencil_export                          DONE (i965/gen9+, radeonsi, softpipe, llvmpipe, swr)
+  GL_ARB_shader_viewport_layer_array                    DONE (i965/gen6+, radeonsi)
  GL_ARB_sparse_buffer                                  DONE (radeonsi/CIK+)
  GL_ARB_sparse_texture                                 not started
  GL_ARB_sparse_texture2                                not started
  GL_ARB_sparse_texture_clamp                           not started
  GL_ARB_texture_filter_minmax                          not started
-  GL_EXT_memory_object                                  DONE (radeonsi)
-  GL_EXT_memory_object_fd                               DONE (radeonsi)
-  GL_EXT_memory_object_win32                            not started
-  GL_EXT_render_snorm                                   DONE (i965, radeonsi)
-  GL_EXT_semaphore                                      DONE (radeonsi)
-  GL_EXT_semaphore_fd                                   DONE (radeonsi)
-  GL_EXT_semaphore_win32                                not started
-  GL_EXT_sRGB_write_control                             DONE (all drivers that support GLES 3.0+)
-  GL_EXT_texture_norm16                                 DONE (freedreno, i965, r600, radeonsi, nvc0)
-  GL_EXT_texture_sRGB_R8                                DONE (all drivers that support GLES 3.0+)
+  GL_ARB_transform_feedback_overflow_query              DONE (i965/gen6+)
  GL_KHR_blend_equation_advanced_coherent               DONE (i965/gen9+)
-  GL_KHR_texture_compression_astc_hdr                   DONE (i965/bxt)
-  GL_KHR_texture_compression_astc_sliced_3d             DONE (i965/gen9+, radeonsi)
+  GL_KHR_no_error                                       not started
+  GL_KHR_texture_compression_astc_hdr                   DONE (core only)
+  GL_KHR_texture_compression_astc_sliced_3d             not started
  GL_OES_depth_texture_cube_map                         DONE (all drivers that support GLSL 1.30+)
  GL_OES_EGL_image                                      DONE (all drivers)
-  GL_OES_EGL_image_external                             DONE (all drivers)
-  GL_OES_EGL_image_external_essl3                       DONE (all drivers)
-  GL_OES_required_internalformat                        DONE (all drivers)
+  GL_OES_EGL_image_external_essl3                       not started
+  GL_OES_required_internalformat                        not started - GLES2 extension based on OpenGL ES 3.0 feature
  GL_OES_surfaceless_context                            DONE (all drivers)
  GL_OES_texture_compression_astc                       DONE (core only)
-  GL_OES_texture_float                                  DONE (freedreno, i965, r300, r600, radeonsi, nv30, nv50, nvc0, softpipe, llvmpipe)
-  GL_OES_texture_float_linear                           DONE (freedreno, i965, r300, r600, radeonsi, nv30, nv50, nvc0, softpipe, llvmpipe)
-  GL_OES_texture_half_float                             DONE (freedreno, i965, r300, r600, radeonsi, nv30, nv50, nvc0, softpipe, llvmpipe)
-  GL_OES_texture_half_float_linear                      DONE (freedreno, i965, r300, r600, radeonsi, nv30, nv50, nvc0, softpipe, llvmpipe)
-  GL_OES_texture_view                                   DONE (freedreno, i965/gen8+, r600, radeonsi, nv50, nvc0, softpipe, llvmpipe, swr)
-  GL_OES_viewport_array                                 DONE (i965, nvc0, radeonsi, softpipe)
+  GL_OES_texture_float                                  DONE (i965, r300, r600, radeonsi, nv30, nv50, nvc0, softpipe, llvmpipe)
+  GL_OES_texture_float_linear                           DONE (i965, r300, r600, radeonsi, nv30, nv50, nvc0, softpipe, llvmpipe)
+  GL_OES_texture_half_float                             DONE (i965, r300, r600, radeonsi, nv30, nv50, nvc0, softpipe, llvmpipe)
+  GL_OES_texture_half_float_linear                      DONE (i965, r300, r600, radeonsi, nv30, nv50, nvc0, softpipe, llvmpipe)
+  GL_OES_texture_view                                   not started - based on GL_ARB_texture_view
+  GL_OES_viewport_array                                 DONE (i965, nvc0, radeonsi)
  GLX_ARB_context_flush_control                         not started
  GLX_ARB_robustness_application_isolation              not started
  GLX_ARB_robustness_share_group_isolation              not started

-GL_EXT_direct_state_access subfeatures (in the spec order):
-  GL 1.1: Client commands                               not started
-  GL 1.0-1.3: Matrix and transpose matrix commands      not started
-  GL 1.1-1.2: Texture commands                          not started
-  GL 1.2: 3D texture commands                           not started
-  GL 1.2.1: Multitexture commands                       not started
-  GL 1.2.1-3.0: Indexed texture commands                not started
-  GL 1.2.1-3.0: Indexed generic queries                 not started
-  GL 1.2.1: EnableIndexed.. Get*Indexed                 not started
-  GL_ARB_vertex_program                                 not started
-  GL 1.3: Compressed texture and multitexture commands  not started
-  GL 1.5: Buffer commands                               not started
-  GL 2.0-2.1: Uniform and uniform matrix commands       not started
-  GL_EXT_texture_buffer_object                          not started
-  GL_EXT_texture_integer                                not started
-  GL_EXT_gpu_shader4                                    not started
-  GL_EXT_gpu_program_parameters                         not started
-  GL_NV_gpu_program4                                    n/a
-  GL_NV_framebuffer_multisample_coverage                n/a
-  GL 3.0: Renderbuffer/framebuffer commands, Gen*Mipmap not started
-  GL 3.0: CopyBuffer command                            not started
-  GL_EXT_geometry_shader4 commands (expose in GL 3.2)   not started
-  GL_NV_explicit_multisample                            n/a
-  GL 3.0: Vertex array/attrib/query/map commands        not started
-  Matrix GL tokens                                      not started
-
-GL_EXT_direct_state_access additions from other extensions (complete list):
-  GL_AMD_framebuffer_sample_positions                   n/a
-  GL_AMD_gpu_shader_int64                               not started
-  GL_ARB_bindless_texture                               not started
-  GL_ARB_buffer_storage                                 not started
-  GL_ARB_clear_buffer_object                            not started
-  GL_ARB_framebuffer_no_attachments                     not started
-  GL_ARB_gpu_shader_fp64                                not started
-  GL_ARB_instanced_arrays                               not started
-  GL_ARB_internalformat_query2                          not started
-  GL_ARB_sparse_texture                                 n/a
-  GL_ARB_sparse_buffer                                  not started
-  GL_ARB_texture_buffer_range                           not started
-  GL_ARB_texture_storage                                not started
-  GL_ARB_texture_storage_multisample                    not started
-  GL_ARB_vertex_attrib_64bit                            not started
-  GL_ARB_vertex_attrib_binding                          not started
-  GL_EXT_buffer_storage                                 not started
-  GL_EXT_external_buffer                                not started
-  GL_EXT_separate_shader_objects                        n/a
-  GL_EXT_sparse_texture                                 n/a
-  GL_EXT_texture_storage                                n/a
-  GL_EXT_vertex_attrib_64bit                            not started
-  GL_EXT_EGL_image_storage                              n/a
-  GL_NV_bindless_texture                                n/a
-  GL_NV_gpu_shader5                                     n/a
-  GL_NV_texture_multisample                             n/a
-  GL_NV_vertex_buffer_unified_memory                    n/a
-  GL_NVX_linked_gpu_multicast                           n/a
-  GLX_NV_copy_buffer                                    n/a
-
 The following extensions are not part of any OpenGL or OpenGL ES version, and
 we DO NOT WANT implementations of these extensions for Mesa.

@@ -412,63 +333,6 @@ we DO NOT WANT implementations of these extensions for Mesa.
  GL_ARB_shadow_ambient                                 Superseded by GL_ARB_fragment_program
  GL_ARB_vertex_blend                                   Superseded by GL_ARB_vertex_program

-Vulkan 1.0 -- all DONE: anv, radv
-
-Vulkan 1.1 -- all DONE: anv, radv
-
-  VK_KHR_16bit_storage                                  in progress (Alejandro)
-  VK_KHR_bind_memory2                                   DONE (anv, radv)
-  VK_KHR_dedicated_allocation                           DONE (anv, radv)
-  VK_KHR_descriptor_update_template                     DONE (anv, radv)
-  VK_KHR_device_group                                   not started
-  VK_KHR_device_group_creation                          not started
-  VK_KHR_external_fence                                 DONE (anv, radv)
-  VK_KHR_external_fence_capabilities                    DONE (anv, radv)
-  VK_KHR_external_memory                                DONE (anv, radv)
-  VK_KHR_external_memory_capabilities                   DONE (anv, radv)
-  VK_KHR_external_semaphore                             DONE (anv, radv)
-  VK_KHR_external_semaphore_capabilities                DONE (anv, radv)
-  VK_KHR_get_memory_requirements2                       DONE (anv, radv)
-  VK_KHR_get_physical_device_properties2                DONE (anv, radv)
-  VK_KHR_maintenance1                                   DONE (anv, radv)
-  VK_KHR_maintenance2                                   DONE (anv, radv)
-  VK_KHR_maintenance3                                   DONE (anv, radv)
-  VK_KHR_multiview                                      DONE (anv, radv)
-  VK_KHR_relaxed_block_layout                           DONE (anv, radv)
-  VK_KHR_sampler_ycbcr_conversion                       DONE (anv)
-  VK_KHR_shader_draw_parameters                         DONE (anv, radv)
-  VK_KHR_storage_buffer_storage_class                   DONE (anv, radv)
-  VK_KHR_variable_pointers                              DONE (anv, radv)
-
-Khronos extensions that are not part of any Vulkan version:
-  VK_KHR_8bit_storage                                   DONE (anv, radv)
-  VK_KHR_android_surface                                not started
-  VK_KHR_create_renderpass2                             DONE (anv, radv)
-  VK_KHR_display                                        DONE (anv, radv)
-  VK_KHR_display_swapchain                              DONE (anv, radv)
-  VK_KHR_draw_indirect_count                            DONE (radv)
-  VK_KHR_external_fence_fd                              DONE (anv, radv)
-  VK_KHR_external_fence_win32                           not started
-  VK_KHR_external_memory_fd                             DONE (anv, radv)
-  VK_KHR_external_memory_win32                          not started
-  VK_KHR_external_semaphore_fd                          DONE (anv, radv)
-  VK_KHR_external_semaphore_win32                       not started
-  VK_KHR_get_display_properties2                        DONE (anv, radv)
-  VK_KHR_get_surface_capabilities2                      DONE (anv, radv)
-  VK_KHR_image_format_list                              DONE (anv, radv)
-  VK_KHR_incremental_present                            DONE (anv, radv)
-  VK_KHR_mir_surface                                    not started
-  VK_KHR_push_descriptor                                DONE (anv, radv)
-  VK_KHR_sampler_mirror_clamp_to_edge                   DONE (anv, radv)
-  VK_KHR_shared_presentable_image                       not started
-  VK_KHR_surface                                        DONE (anv, radv)
-  VK_KHR_swapchain                                      DONE (anv, radv)
-  VK_KHR_wayland_surface                                DONE (anv, radv)
-  VK_KHR_win32_keyed_mutex                              not started
-  VK_KHR_win32_surface                                  not started
-  VK_KHR_xcb_surface                                    DONE (anv, radv)
-  VK_KHR_xlib_surface                                   DONE (anv, radv)
-

 A graphical representation of this information can be found at
 https://mesamatrix.net/
--- a/docs/helpwanted.html
+++ b/docs/helpwanted.html
@@ -8,13 +8,13 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
 <div class="content">

-<h1>Help Wanted</h1>
+<h1>Help Wanted / To-Do List</h1>

 <p>
 We can always use more help with the Mesa project.
@@ -29,14 +29,23 @@ immediately checked into git because not enough people are testing them.
 Just applying patches, testing and reporting back is helpful.
 <li>
 <b>Driver debugging.</b>
-There are plenty of open bugs in the <a href="https://gitlab.freedesktop.org/mesa/mesa/issues">bug database</a>.
+There are plenty of open bugs in the <a href="https://bugs.freedesktop.org/describecomponents.cgi?product=Mesa">bug database</a>.
 <li>
 <b>Remove aliasing warnings.</b>
-Enable gcc's <code>-Wstrict-aliasing=2 -fstrict-aliasing</code> arguments, and
-track down aliasing issues in the code.
+Enable gcc -Wstrict-aliasing=2 -fstrict-aliasing and track down aliasing
+issues in the code.
+<li>
+<b>Windows driver building, testing and maintenance.</b>
+Fixing MSVC builds.
 <li>
 <b>Contribute more tests to
 <a href="https://piglit.freedesktop.org/">Piglit</a>.</b>
+<li>
+<b>Automatic testing.
+</b>
+It would be great if someone would set up an automated system for grabbing
+the latest Mesa code and run tests (such as piglit) then report issues to
+the mailing list.
 </ol>

 <p>
@@ -47,19 +56,26 @@ You can find some further To-do lists here:
 <b>Common To-Do lists:</b>
 </p>
 <ul>
-  <li><a href="https://gitlab.freedesktop.org/mesa/mesa/blob/master/docs/features.txt">
-    <code>features.txt</code></a> - Status of OpenGL 3.x / 4.x features in
-    Mesa.</li>
+  <li><a href="https://cgit.freedesktop.org/mesa/mesa/tree/docs/features.txt">
+    <b>features.txt</b></a> - Status of OpenGL 3.x / 4.x features in Mesa.</li>
+  <li><a href="https://dri.freedesktop.org/wiki/MissingFunctionality">
+    <b>MissingFunctionality</b></a> - Detailed information about missing OpenGL features.</li>
 </ul>

 <p>
-<b>Legacy Driver specific To-Do lists:</b>
+<b>Driver specific To-Do lists:</b>
 </p>
 <ul>
+  <li><a href="https://cgit.freedesktop.org/mesa/mesa/tree/src/gallium/docs/llvm-todo.txt">
+    <b>LLVMpipe</b></a> - Software driver using LLVM for runtime code generation.</li>
+  <li><a href="https://dri.freedesktop.org/wiki/RadeonsiToDo">
+    <b>radeonsi</b></a> - Driver for AMD Southern Island.</li>
  <li><a href="https://dri.freedesktop.org/wiki/R600ToDo">
-    <code>r600g</code></a> - Driver for ATI/AMD R600 - Northern Island.</li>
+    <b>r600g</b></a> - Driver for ATI/AMD R600 - Northern Island.</li>
  <li><a href="https://dri.freedesktop.org/wiki/R300ToDo">
-    <code>r300g</code></a> - Driver for ATI R300 - R500.</li>
+    <b>r300g</b></a> - Driver for ATI R300 - R500.</li>
+  <li><a href="https://cgit.freedesktop.org/mesa/mesa/tree/src/gallium/drivers/i915/TODO">
+    <b>i915g</b></a> - Driver for Intel i915/i945.</li>
 </ul>

 <p>
--- a/docs/index.html
+++ b/docs/index.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
@@ -16,537 +16,6 @@

 <h1>News</h1>

-<h2>August 7, 2019</h2>
-<p>
-<a href="relnotes/19.1.4.html">Mesa 19.1.4</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>July 23, 2019</h2>
-<p>
-<a href="relnotes/19.1.3.html">Mesa 19.1.3</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>July 9, 2019</h2>
-<p>
-<a href="relnotes/19.1.2.html">Mesa 19.1.2</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>June 26, 2019</h2>
-<p>
-<a href="relnotes/19.0.8.html">Mesa 19.0.8</a> is released.
-This is an emergency bug fix release. Users of 19.0.7 should updated to 19.0.8
-or 19.1.1 immediately.
-</p>
-
-<h2>June 25, 2019</h2>
-<p>
-<a href="relnotes/19.1.1.html">Mesa 19.1.1</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>June 24, 2019</h2>
-<p>
-<a href="relnotes/19.0.7.html">Mesa 19.0.7</a> is released.
-This is a bug-fix release.
-</p>
-<p>
-NOTE: It is anticipated that 19.0.7 will be the final release in the
-19.0 series. Users of 19.0 are encouraged to migrate to the 19.1
-series in order to obtain future fixes.
-</p>
-
-<h2>June 11, 2019</h2>
-<p>
-<a href="relnotes/19.1.0.html">Mesa 19.1.0</a> is released.
-This is a new development release. See the release notes for more
-information about this release
-</p>
-<h2>June 5, 2019</h2>
-<p>
-<a href="relnotes/19.0.6.html">Mesa 19.0.6</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>May 21, 2019</h2>
-<p>
-<a href="relnotes/19.0.5.html">Mesa 19.0.5</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>May 9, 2019</h2>
-<p>
-<a href="relnotes/19.0.4.html">Mesa 19.0.4</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>April 24, 2019</h2>
-<p>
-<a href="relnotes/19.0.3.html">Mesa 19.0.3</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>April 10, 2019</h2>
-<p>
-<a href="relnotes/19.0.2.html">Mesa 19.0.2</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>April 5, 2019</h2>
-<p>
-<a href="relnotes/18.3.6.html">Mesa 18.3.6</a> is released.
-This is a bug-fix release.
-</p>
-<p>
-NOTE: It is anticipated that 18.3.6 will be the final release in the
-18.3 series. Users of 18.3 are encouraged to migrate to the 19.0
-series in order to obtain future fixes.
-</p>
-
-<h2>March 27, 2019</h2>
-<p>
-<a href="relnotes/19.0.1.html">Mesa 19.0.1</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>March 18, 2019</h2>
-<p>
-<a href="relnotes/18.3.5.html">Mesa 18.3.5</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>March 13, 2019</h2>
-<p>
-<a href="relnotes/19.0.0.html">Mesa 19.0.0</a> is released.
-This is a new development release. See the release notes for more
-information about this release
-</p>
-
-<h2>February 18, 2019</h2>
-<p>
-<a href="relnotes/18.3.4.html">Mesa 18.3.4</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>January 31, 2019</h2>
-<p>
-<a href="relnotes/18.3.3.html">Mesa 18.3.3</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>January 17, 2019</h2>
-<p>
-<a href="relnotes/18.3.2.html">Mesa 18.3.2</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>December 27, 2018</h2>
-<p>
-<a href="relnotes/18.2.8.html">Mesa 18.2.8</a> is released.
-This is a bug-fix release.
-</p>
-<p>
-NOTE: It is anticipated that 18.2.8 will be the final release in the
-18.2 series. Users of 18.2 are encouraged to migrate to the 18.3
-series in order to obtain future fixes.
-</p>
-
-<h2>December 13, 2018</h2>
-<p>
-<a href="relnotes/18.2.7.html">Mesa 18.2.7</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>December 11, 2018</h2>
-<p>
-<a href="relnotes/18.3.1.html">Mesa 18.3.1</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>December 7, 2018</h2>
-<p>
-<a href="relnotes/18.3.0.html">Mesa 18.3.0</a> is released.  This is a
-new development release.  See the release notes for more information
-about the release.
-</p>
-
-<h2>November 28, 2018</h2>
-<p>
-<a href="relnotes/18.2.6.html">Mesa 18.2.6</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>November 15, 2018</h2>
-<p>
-<a href="relnotes/18.2.5.html">Mesa 18.2.5</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>October 31, 2018</h2>
-<p>
-<a href="relnotes/18.2.4.html">Mesa 18.2.4</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>October 19, 2018</h2>
-<p>
-<a href="relnotes/18.2.3.html">Mesa 18.2.3</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>October 5, 2018</h2>
-<p>
-<a href="relnotes/18.2.2.html">Mesa 18.2.2</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>September 24, 2018</h2>
-<p>
-<a href="relnotes/18.1.9.html">Mesa 18.1.9</a> is released.
-This is a bug-fix release.
-</p>
-<p>
-NOTE: It is anticipated that 18.1.9 will be the final release in the
-18.1 series. Users of 18.1 are encouraged to migrate to the 18.2
-series in order to obtain future fixes.
-</p>
-
-<h2>September 21, 2018</h2>
-<p>
-<a href="relnotes/18.2.1.html">Mesa 18.2.1</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>September 7, 2018</h2>
-<p>
-<a href="relnotes/18.1.8.html">Mesa 18.1.8</a> and
-<a href="relnotes/18.2.0.html">Mesa 18.2.0</a> are released.
-
-These are, respectively, a bug-fix release from the 18.1 branch and a
-new development release.  See the release notes for more information
-about the releases.
-</p>
-
-<h2>August 24, 2018</h2>
-<p>
-<a href="relnotes/18.1.7.html">Mesa 18.1.7</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>August 13, 2018</h2>
-<p>
-<a href="relnotes/18.1.6.html">Mesa 18.1.6</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>July 27, 2018</h2>
-<p>
-<a href="relnotes/18.1.5.html">Mesa 18.1.5</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>July 13, 2018</h2>
-<p>
-<a href="relnotes/18.1.4.html">Mesa 18.1.4</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>June 29, 2018</h2>
-<p>
-<a href="relnotes/18.1.3.html">Mesa 18.1.3</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>June 15, 2018</h2>
-<p>
-<a href="relnotes/18.1.2.html">Mesa 18.1.2</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>June 3, 2018</h2>
-<p>
-<a href="relnotes/18.0.5.html">Mesa 18.0.5</a> is released.
-This is a bug-fix release.
-</p>
-<p>
-NOTE: It is anticipated that 18.0.5 will be the final release in the
-18.0 series. Users of 18.0 are encouraged to migrate to the 18.1
-series in order to obtain future fixes.
-</p>
-
-<h2>June 1, 2018</h2>
-<p>
-<a href="relnotes/18.1.1.html">Mesa 18.1.1</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>May 18, 2018</h2>
-<p>
-<a href="relnotes/18.1.0.html">Mesa 18.1.0</a> is released.  This is a
-new development release.  See the release notes for more information
-about the release.
-</p>
-
-<h2>May 17, 2018</h2>
-<p>
-<a href="relnotes/18.0.4.html">Mesa 18.0.4</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>May 7, 2018</h2>
-<p>
-<a href="relnotes/18.0.3.html">Mesa 18.0.3</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>April 28, 2018</h2>
-<p>
-<a href="relnotes/18.0.2.html">Mesa 18.0.2</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>April 18, 2018</h2>
-<p>
-<a href="relnotes/18.0.1.html">Mesa 18.0.1</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>April 18, 2018</h2>
-<p>
-<a href="relnotes/17.3.9.html">Mesa 17.3.9</a> is released.
-This is a bug-fix release.
-</p>
-<p>
-NOTE: It is anticipated that 17.3.9 will be the final release in the
-17.3 series. Users of 17.3 are encouraged to migrate to the 18.0
-series in order to obtain future fixes.
-</p>
-
-<h2>April 03, 2018</h2>
-<p>
-<a href="relnotes/17.3.8.html">Mesa 17.3.8</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>March 27, 2018</h2>
-<p>
-<a href="relnotes/18.0.0.html">Mesa 18.0.0</a> is released.  This is a
-new development release.  See the release notes for more information
-about the release.
-</p>
-
-<h2>March 21, 2018</h2>
-<p>
-<a href="relnotes/17.3.7.html">Mesa 17.3.7</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>February 26, 2018</h2>
-<p>
-<a href="relnotes/17.3.6.html">Mesa 17.3.6</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>February 19, 2018</h2>
-<p>
-<a href="relnotes/17.3.5.html">Mesa 17.3.5</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>February 15, 2018</h2>
-<p>
-<a href="relnotes/17.3.4.html">Mesa 17.3.4</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>January 18, 2018</h2>
-<p>
-<a href="relnotes/17.3.3.html">Mesa 17.3.3</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>January 8, 2018</h2>
-<p>
-<a href="relnotes/17.3.2.html">Mesa 17.3.2</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>December 22, 2017</h2>
-<p>
-<a href="relnotes/17.2.8.html">Mesa 17.2.8</a> is released.
-This is a bug-fix release.
-</p>
-<p>
-NOTE: It is anticipated that 17.2.8 will be the final release in the
-17.2 series. Users of 17.2 are encouraged to migrate to the 17.3
-series in order to obtain future fixes.
-</p>
-
-<h2>December 21, 2017</h2>
-<p>
-<a href="relnotes/17.3.1.html">Mesa 17.3.1</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>December 14, 2017</h2>
-<p>
-<a href="relnotes/17.2.7.html">Mesa 17.2.7</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>December 8, 2017</h2>
-<p>
-<a href="relnotes/17.3.0.html">Mesa 17.3.0</a> is released.  This is a
-new development release.  See the release notes for more information
-about the release.
-</p>
-
-<h2>November 25, 2017</h2>
-<p>
-<a href="relnotes/17.2.6.html">Mesa 17.2.6</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>November 10, 2017</h2>
-<p>
-<a href="relnotes/17.2.5.html">Mesa 17.2.5</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>October 30, 2017</h2>
-<p>
-<a href="relnotes/17.2.4.html">Mesa 17.2.4</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>October 19, 2017</h2>
-<p>
-<a href="relnotes/17.2.3.html">Mesa 17.2.3</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>October 2, 2017</h2>
-<p>
-<a href="relnotes/17.2.2.html">Mesa 17.2.2</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>September 25, 2017</h2>
-<p>
-<a href="relnotes/17.1.10.html">Mesa 17.1.10</a> is released.
-This is a bug-fix release.
-</p>
-<p>
-NOTE: It is anticipated that 17.1.10 will be the final release in the
-17.1 series. Users of 17.1 are encouraged to migrate to the 17.2
-series in order to obtain future fixes.
-</p>
-
-<h2>September 17, 2017</h2>
-<p>
-<a href="relnotes/17.2.1.html">Mesa 17.2.1</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>September 8, 2017</h2>
-<p>
-<a href="relnotes/17.1.9.html">Mesa 17.1.9</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>September 4, 2017</h2>
-<p>
-<a href="relnotes/17.2.0.html">Mesa 17.2.0</a> is released.  This is a
-new development release.  See the release notes for more information
-about the release.
-</p>
-
-<h2>August 28, 2017</h2>
-<p>
-<a href="relnotes/17.1.8.html">Mesa 17.1.8</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>August 21, 2017</h2>
-<p>
-<a href="relnotes/17.1.7.html">Mesa 17.1.7</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>August 7, 2017</h2>
-<p>
-<a href="relnotes/17.1.6.html">Mesa 17.1.6</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>July 14, 2017</h2>
-<p>
-<a href="relnotes/17.1.5.html">Mesa 17.1.5</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>June 30, 2017</h2>
-<p>
-<a href="relnotes/17.1.4.html">Mesa 17.1.4</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>June 19, 2017</h2>
-<p>
-<a href="relnotes/17.1.3.html">Mesa 17.1.3</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>June 5, 2017</h2>
-<p>
-<a href="relnotes/17.1.2.html">Mesa 17.1.2</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>June 1, 2017</h2>
-<p>
-<a href="relnotes/17.0.7.html">Mesa 17.0.7</a> is released.
-This is a bug-fix release.
-</p>
-<p>
-NOTE: It is anticipated that 17.0.7 will be the final release in the 17.0
-series. Users of 17.0 are encouraged to migrate to the 17.1 series in order
-to obtain future fixes.
-</p>
-
-<h2>May 25, 2017</h2>
-<p>
-<a href="relnotes/17.1.1.html">Mesa 17.1.1</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>May 12, 2017</h2>
-<p>
-<a href="relnotes/17.0.6.html">Mesa 17.0.6</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>May 10, 2017</h2>
-<p>
-<a href="relnotes/17.1.0.html">Mesa 17.1.0</a> is released.  This is a
-new development release.  See the release notes for more information
-about the release.
-</p>
-
-<h2>April 28, 2017</h2>
-<p>
-<a href="relnotes/17.0.5.html">Mesa 17.0.5</a> is released.
-This is a bug-fix release.
-</p>
-
-<h2>April 17, 2017</h2>
-<p>
-<a href="relnotes/17.0.4.html">Mesa 17.0.4</a> is released.
-This is a bug-fix release.
-</p>
-
 <h2>April 1, 2017</h2>
 <p>
 <a href="relnotes/17.0.3.html">Mesa 17.0.3</a> is released.
@@ -559,8 +28,7 @@ This is a bug-fix release.
 <a href="relnotes/17.0.2.html">Mesa 17.0.2</a> are released.

 These are bug-fix releases from the 13.0 and 17.0 branches, respectively.
-</p>
-<p>
+<br>
 NOTE: It is anticipated that 13.0.6 will be the final release in the 13.0
 series. Users of 13.0 are encouraged to migrate to the 17.0 series in order
 to obtain future fixes.
@@ -595,8 +63,7 @@ This is a bug-fix release.
 <p>
 <a href="relnotes/12.0.6.html">Mesa 12.0.6</a> is released.
 This is a bug-fix release.
-</p>
-<p>
+<br>
 NOTE: This is an extra release for the 12.0 stable branch, as per developers'
 feedback. It is anticipated that 12.0.6 will be the final release in the 12.0
 series. Users of 12.0 are encouraged to migrate to the 13.0 series in order
@@ -613,8 +80,7 @@ This is a bug-fix release.
 <p>
 <a href="relnotes/12.0.5.html">Mesa 12.0.5</a> is released.
 This is a bug-fix release.
-</p>
-<p>
+<br>
 NOTE: It is anticipated that 12.0.5 will be the final release in the 12.0
 series. Users of 12.0 are encouraged to migrate to the 13.0 series in order
 to obtain future fixes.
@@ -676,8 +142,7 @@ about the release.
 <a href="relnotes/11.2.2.html">Mesa 11.2.2</a> are released.

 These are bug-fix releases from the 11.1 and 11.2 branches, respectively.
-</p>
-<p>
+<br>
 NOTE: It is anticipated that 11.1.4 will be the final release in the 11.1.4
 series. Users of 11.1 are encouraged to migrate to the 11.2 series in order
 to obtain future fixes.
@@ -708,8 +173,7 @@ This is a bug-fix release.
 <p>
 <a href="relnotes/11.0.9.html">Mesa 11.0.9</a> is released.
 This is a bug-fix release.
-</p>
-<p>
+<br>
 NOTE: It is anticipated that 11.0.9 will be the final release in the 11.0
 series. Users of 11.0 are encouraged to migrate to the 11.1 series in order
 to obtain future fixes.
@@ -773,8 +237,7 @@ This is a bug-fix release.
 <p>
 <a href="relnotes/10.6.9.html">Mesa 10.6.9</a> is released.
 This is a bug-fix release.
-</p>
-<p>
+<br>
 NOTE: It is anticipated that 10.6.9 will be the final release in the 10.6
 series. Users of 10.6 are encouraged to migrate to the 11.0 series in order
 to obtain future fixes.
@@ -845,8 +308,7 @@ This is a bug-fix release.
 <p>
 <a href="relnotes/10.5.9.html">Mesa 10.5.9</a> is released.
 This is a bug-fix release.
-</p>
-<p>
+<br>
 NOTE: It is anticipated that 10.5.9 will be the final release in the 10.5
 series. Users of 10.5 are encouraged to migrate to the 10.6 series in order
 to obtain future fixes.
@@ -956,8 +418,7 @@ This is a bug-fix release.
 and <a href="relnotes/10.4.2.html">Mesa 10.4.2</a> are released.

 These are bug-fix releases from the 10.3 and 10.4 branches, respectively.
-</p>
-<p>
+<br>
 NOTE: It is anticipated that 10.3.7 will be the final release in the 10.3
 series. Users of 10.3 are encouraged to migrate to the 10.4 series in order
 to obtain future fixes.
@@ -1008,8 +469,7 @@ This is a bug-fix release.
 and <a href="relnotes/10.3.1.html">Mesa 10.3.1</a> are released.

 These are bug-fix releases from the 10.2 and 10.3 branches, respectively.
-</p>
-<p>
+<br>
 NOTE: It is anticipated that 10.2.9 will be the final release in the 10.2
 series. Users of 10.2 are encouraged to migrate to the 10.3 series in order
 to obtain future fixes.
@@ -1121,8 +581,7 @@ This is a bug-fix release.
 <p>
 <a href="relnotes/10.0.5.html">Mesa 10.0.5</a> is released.
 This is a bug-fix release.
-</p>
-<p>
+<br>
 NOTE: Since the 10.1.1 release is being released concurrently, it is
 anticipated that 10.0.5 will be the final release in the 10.0
 series. Users of 10.0 are encouraged to migrate to the 10.1 series in
@@ -1601,7 +1060,7 @@ with a new test that does over 130 tests of the
 shading language and built-in functions.
 </p>

-<h2>April 4, 2007</h2>
+<h2>April 2007</h2>
 <p>
 Thomas Hellstr&ouml;m of Tungsten Graphics has written a whitepaper
 describing the new DRI memory management system.
@@ -2054,7 +1513,7 @@ Mesa 5.0.2 has been released.  This is a stable, bug-fix release.
 </pre>


-<h2>June 8, 2003</h2>
+<h2>June 2003</h2>

 <p>
 Mesa's directory tree has been overhauled.
@@ -2431,7 +1890,7 @@ Here's what's new:</p>

 <h2>April 29, 2001</h2>
 <p>New Mesa website</p>
-<p>Mark Manning produced the new website. Thanks, Mark!</p>
+<p>Mark Manning produced the new website.<br>Thanks, Mark!</p>


 <h2>February 14, 2001</h2>
@@ -2550,9 +2009,8 @@ just bug fixes.</p>
 </pre>

 <p>Please report any problems with this release ASAP. Bugs should be filed on the
-Mesa3D website at sourceforge.
-</p>
-<p>After 3.2 is wrapped up I hope to release 3.3 beta 1 soon afterward.</p>
+Mesa3D website at sourceforge.<br>
+After 3.2 is wrapped up I hope to release 3.3 beta 1 soon afterward.</p>
 <p>-- Brian</p>

 <h2>December 17, 1999</h2>
@@ -2597,27 +2055,21 @@ ftp, and CVS services aren't fully restored yet. Please be patient.</p>
 <p>-Brian</p>

 <h2>June 7, 1999</h2>
-<p>RPMS of the nVidia RIVA server can be found at
-<a href="ftp://ftp.mesa3d.org/mesa/misc/nVidia/">
-ftp://ftp.mesa3d.org/mesa/misc/nVidia/</a>.</p>
+<p>RPMS of the nVidia RIVA server can be found at <code>ftp://ftp.mesa3d.org/mesa/misc/nVidia/</code>.</p>

 <h2>June 2, 1999</h2>
 <p><a href="https://www.nvidia.com/">nVidia</a> has released some Linux binaries for
 xfree86 3.3.3.1, along with the <b>full source</b>, which includes GLX acceleration
-based on Mesa 3.0. They can be downloaded from
-<a href="https://www.nvidia.com/Products.nsf/htmlmedia/software_drivers.html">
-https://www.nvidia.com/Products.nsf/htmlmedia/software_drivers.html</a>.</p>
+based on Mesa 3.0. They can be downloaded from <code>https://www.nvidia.com/Products.nsf/htmlmedia/software_drivers.html</code>.</p>

 <h2>May 24, 1999</h2>
-<p>Beta 2 of Mesa 3.1 has been make available at
-<a href="ftp://ftp.mesa3d.org/mesa/beta/">ftp://ftp.mesa3d.org/mesa/beta/</a>. If you are into the
-quake scene, you may want to try this out, as it contains some optimizations
-specifically in the Q3A rendering path.
+<p>Beta 2 of Mesa 3.1 has been make available at <code>ftp://ftp.mesa3d.org/mesa/beta/</code>.
+If you are into the quake scene, you may want to try this out, as it contains some
+optimizations specifically in the Q3A rendering path.

 <h2>May 13, 1999</h2>
 <p>For those interested in the integration of Mesa into XFree86 4.0, Precision Insight
-has posted their lowlevel design documents at
-<a href="http://www.precisioninsight.com">www.precisioninsight.com</a>.</p>
+has posted their lowlevel design documents at <code>http://www.precisioninsight.com</code>.</p>

 <h2>May 13, 1999</h2>
 <pre>May 1999 - John Carmack of id Software, Inc. has made a donation of
@@ -2643,11 +2095,11 @@ grateful.

 <h2>May 1, 1999</h2>
 <p>John Carmack made an interesting .plan update yesterday:</p>
-<pre>
-I put together a document on optimizing OpenGL drivers for Q3 that should be helpful to the various Linux 3D teams.
-
-http://www.quake3arena.com/news/glopt.html
-</pre>
+<blockquote>
+    <i>"I put together a document on optimizing OpenGL drivers for Q3 that
+    should be helpful to the various Linux 3D teams.</i><br>
+    http://www.quake3arena.com/news/glopt.html"
+</blockquote>

 <h2>April 7, 1999</h2>
 <p>Updated the Mesa contributors section and added links to RPM Mesa packages.</p>
@@ -2657,8 +2109,7 @@ http://www.quake3arena.com/news/glopt.html

 <h2>February 16, 1999</h2>
 <p><a href="https://www.sgi.com/">SGI</a> releases its
-<a href="http://web.archive.org/web/20040805154836/http://www.sgi.com/software/opensource/glx/download.html">GLX source code</a>.
-</p>
+<a href="https://www.sgi.com/software/opensource/glx/">GLX source code</a>.</p>

 <h2>January 22, 1999</h2>
 <p><a href="https://www.mesa3d.org">www.mesa3d.org</a> established</p>
--- a/docs/install.html
+++ b/docs/install.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
@@ -22,7 +22,6 @@
  <li><a href="#prereq-general">General prerequisites</a>
  <li><a href="#prereq-dri">For DRI and hardware acceleration</a>
  </ul>
-<li><a href="#meson">Building with meson</a>
 <li><a href="#autoconf">Building with autoconf (Linux/Unix/X11)</a>
 <li><a href="#scons">Building with SCons (Windows/Linux)</a>
 <li><a href="#android">Building with AOSP (Android)</a>
@@ -31,17 +30,18 @@
 </ol>


-<h2 id="prereq-general">1. Prerequisites for building</h2>
+<h1 id="prereq-general">1. Prerequisites for building</h1>

-<h3>1.1 General</h3>
+<h2>1.1 General</h2>

-<h4>Build system</h4>
+<p>
+Build system.
+</p>

 <ul>
-<li><a href="https://mesonbuild.com">meson</a> is required when building on *nix platforms.
-<li>Autoconf was removed in 19.1.0, use meson instead
+<li>Autoconf is required when building on *nix platforms.
 <li><a href="http://www.scons.org/">SCons</a> is required for building on
-Windows and optional for Linux (it's an alternative to meson.)
+Windows and optional for Linux (it's an alternative to autoconf/automake.)
 </li>
 <li>Android Build system when building as native Android component. Autoconf
 is used when when building ARC.
@@ -49,7 +49,6 @@ is used when when building ARC.
 </ul>


-<h4>Compiler</h4>
 <p>
 The following compilers are known to work, if you know of others or you're
 willing to maintain support for other compiler get in touch.
@@ -58,12 +57,13 @@ willing to maintain support for other compiler get in touch.
 <ul>
 <li>GCC 4.2.0 or later (some parts of Mesa may require later versions)
 <li>clang - exact minimum requirement is currently unknown.
-<li>Microsoft Visual Studio 2015 or later is required, for building on Windows.
+<li>Microsoft Visual Studio 2013 Update 4 or later is required, for building on Windows.
 </ul>


-<h4>Third party/extra tools.</h4>
 <p>
+Third party/extra tools.
+<br>
 <strong>Note</strong>: These should not be required, when building from a release tarball. If
 you think you've spotted a bug let developers know by filing a
 <a href="bugs.html">bug report</a>.
@@ -72,21 +72,20 @@ you think you've spotted a bug let developers know by filing a

 <ul>
 <li><a href="https://www.python.org/">Python</a> - Python is required.
-When building with scons 2.7 is required.
-When building with meson 3.5 or newer is required.
+Version 2.6.4 or later should work.
 </li>
 <li><a href="http://www.makotemplates.org/">Python Mako module</a> -
-Python Mako module is required. Version 0.8.0 or later should work.
+Python Mako module is required. Version 0.3.4 or later should work.
 </li>
 <li>lex / yacc - for building the Mesa IR and GLSL compiler.
-<p>
+<div>
 On Linux systems, flex and bison versions 2.5.35 and 2.4.1, respectively,
 (or later) should work.
 On Windows with MinGW, install flex and bison with:
 <pre>mingw-get install msys-flex msys-bison</pre>
 For MSVC on Windows, install
 <a href="http://winflexbison.sourceforge.net/">Win flex-bison</a>.
-</p>
+</div>
 </ul>
 <p><strong>Note</strong>: Some versions can be buggy (eg. flex 2.6.2) so do try others if things fail.</p>

@@ -112,35 +111,29 @@ the packaging tool used by your distro.
  ... # others
 </pre>

-<h2 id="meson">2. Building with meson</h2>
+
+<h1 id="autoconf">2. Building with autoconf (Linux/Unix/X11)</h1>

 <p>
-Meson is the latest build system in mesa, it is currently able to build for
-*nix systems like Linux and BSD, and will be able to build for windows as well.
+The primary method to build Mesa on Unix systems is with autoconf.
 </p>

 <p>
-The general approach is:
+The general approach is the standard:
 </p>
 <pre>
-  meson builddir/
-  ninja -C builddir/
-  sudo ninja -C builddir/ install
+  ./configure
+  make
+  sudo make install
 </pre>
 <p>
-Please read the <a href="meson.html">detailed meson instructions</a>
-for more information
-</p>
-
-<h2 id="autoconf">3. Building with autoconf (Linux/Unix/X11)</h2>
-
-<p>
-  Autoconf support was removed in Mesa 19.1.0. Please use meson instead.
+But please read the <a href="autoconf.html">detailed autoconf instructions</a>
+for more details.
 </p>



-<h2 id="scons">4. Building with SCons (Windows/Linux)</h2>
+<h1 id="scons">3. Building with SCons (Windows/Linux)</h1>

 <p>
 To build Mesa with SCons on Linux or Windows do
@@ -176,7 +169,7 @@ Additional information is available in <a href="README.WIN32">README.WIN32</a>.



-<h2 id="android">5. Building with AOSP (Android)</h2>
+<h1 id="android">4. Building with AOSP (Android)</h1>

 <p>
 Currently one can build Mesa for Android as part of the AOSP project, yet
@@ -195,7 +188,7 @@ Android-x86 and/or other resources.
 </p>


-<h2 id="libs">6. Library Information</h2>
+<h1 id="libs">5. Library Information</h1>

 <p>
 When compilation has finished, look in the top-level <code>lib/</code>
@@ -203,17 +196,18 @@ When compilation has finished, look in the top-level <code>lib/</code>
 You'll see a set of library files similar to this:
 </p>
 <pre>
-lrwxrwxrwx    1 brian    users          10 Mar 26 07:53 libGL.so -&gt; libGL.so.1*
-lrwxrwxrwx    1 brian    users          19 Mar 26 07:53 libGL.so.1 -&gt; libGL.so.1.5.060100*
+lrwxrwxrwx    1 brian    users          10 Mar 26 07:53 libGL.so -> libGL.so.1*
+lrwxrwxrwx    1 brian    users          19 Mar 26 07:53 libGL.so.1 -> libGL.so.1.5.060100*
 -rwxr-xr-x    1 brian    users     3375861 Mar 26 07:53 libGL.so.1.5.060100*
-lrwxrwxrwx    1 brian    users          14 Mar 26 07:53 libOSMesa.so -&gt; libOSMesa.so.6*
-lrwxrwxrwx    1 brian    users          23 Mar 26 07:53 libOSMesa.so.6 -&gt; libOSMesa.so.6.1.060100*
+lrwxrwxrwx    1 brian    users          14 Mar 26 07:53 libOSMesa.so -> libOSMesa.so.6*
+lrwxrwxrwx    1 brian    users          23 Mar 26 07:53 libOSMesa.so.6 -> libOSMesa.so.6.1.060100*
 -rwxr-xr-x    1 brian    users       23871 Mar 26 07:53 libOSMesa.so.6.1.060100*
 </pre>

 <p>
-<b>libGL</b> is the main OpenGL library (i.e. Mesa), while <b>libOSMesa</b>
-is the OSMesa (Off-Screen) interface library.
+<b>libGL</b> is the main OpenGL library (i.e. Mesa).
+<br>
+<b>libOSMesa</b> is the OSMesa (Off-Screen) interface library.
 </p>

 <p>
@@ -232,10 +226,10 @@ versions of libGL and device drivers.
 </p>


-<h2 id="pkg-config">7. Building OpenGL programs with pkg-config</h2>
+<h1 id="pkg-config">6. Building OpenGL programs with pkg-config</h1>

 <p>
-Running <code>ninja install</code> will install package configuration files
+Running <code>make install</code> will install package configuration files
 for the pkg-config utility.
 </p>

@@ -251,6 +245,8 @@ For example, compiling and linking a GLUT application can be done with:
   gcc `pkg-config --cflags --libs glut` mydemo.c -o mydemo
 </pre>

+<br>
+
 </div>
 </body>
 </html>
--- a/docs/intro.html
+++ b/docs/intro.html
@@ -2,13 +2,13 @@
 <html lang="en">
 <head>
  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>Introduction</title>
+  <title>Mesa Introduction</title>
  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
@@ -50,7 +50,7 @@ systems.



-<h2>Project History</h2>
+<h1>Project History</h1>

 <p>
 The Mesa project was originally started by Brian Paul.
@@ -185,7 +185,7 @@ of the OpenGL, OpenGL ES and Vulkan specifications.



-<h2>Major Versions</h2>
+<h1>Major Versions</h1>

 <p>
 This is a summary of the major versions of Mesa.
@@ -194,7 +194,7 @@ of the OpenGL specification is implemented.
 </p>


-<h3>Version 12.x features</h3>
+<h2>Version 12.x features</h2>
 <p>
 Version 12.x of Mesa implements the OpenGL 4.3 API, but not all drivers
 support OpenGL 4.3.
@@ -204,21 +204,21 @@ Initial support for Vulkan is also included.
 </p>


-<h3>Version 11.x features</h3>
+<h2>Version 11.x features</h2>
 <p>
 Version 11.x of Mesa implements the OpenGL 4.1 API, but not all drivers
 support OpenGL 4.1.
 </p>


-<h3>Version 10.x features</h3>
+<h2>Version 10.x features</h2>
 <p>
 Version 10.x of Mesa implements the OpenGL 3.3 API, but not all drivers
 support OpenGL 3.3.
 </p>


-<h3>Version 9.x features</h3>
+<h2>Version 9.x features</h2>
 <p>
 Version 9.x of Mesa implements the OpenGL 3.1 API.
 While the driver for Intel Sandy Bridge and Ivy Bridge is the only
@@ -233,7 +233,7 @@ tracker for OpenCL.
 </p>


-<h3>Version 8.x features</h3>
+<h2>Version 8.x features</h2>
 <p>
 Version 8.x of Mesa implements the OpenGL 3.0 API.
 The developers at Intel deserve a lot of credit for implementing most
@@ -242,14 +242,14 @@ the i965 driver.
 </p>


-<h3>Version 7.x features</h3>
+<h2>Version 7.x features</h2>
 <p>
 Version 7.x of Mesa implements the OpenGL 2.1 API.  The main feature
 of OpenGL 2.x is the OpenGL Shading Language.
 </p>


-<h3>Version 6.x features</h3>
+<h2>Version 6.x features</h2>
 <p>
 Version 6.x of Mesa implements the OpenGL 1.5 API with the following
 extensions incorporated as standard features:
@@ -289,7 +289,7 @@ OpenGL specification</a> for more details.



-<h3>Version 5.x features</h3>
+<h2>Version 5.x features</h2>
 <p>
 Version 5.x of Mesa implements the OpenGL 1.4 API with the following
 extensions incorporated as standard features:
@@ -315,7 +315,7 @@ extensions incorporated as standard features:
 </ul>


-<h3>Version 4.x features</h3>
+<h2>Version 4.x features</h2>

 <p>
 Version 4.x of Mesa implements the OpenGL 1.3 API with the following
@@ -334,7 +334,7 @@ extensions incorporated as standard features:
 <li>GL_ARB_transpose_matrix
 </ul>

-<h3>Version 3.x features</h3>
+<h2>Version 3.x features</h2>

 <p>
 Version 3.x of Mesa implements the OpenGL 1.2 API with the following
@@ -350,7 +350,7 @@ features:
 </ul>


-<h3>Version 2.x features</h3>
+<h2>Version 2.x features</h2>
 <p>
 Version 2.x of Mesa implements the OpenGL 1.1 API with the following
 features.
--- a/docs/libGL.txt
+++ b/docs/libGL.txt
@@ -59,7 +59,7 @@ to learn if it is thread safe.
 Indirect Rendering

 You can force indirect rendering mode by setting the LIBGL_ALWAYS_INDIRECT
-environment variable to `true`.  Hardware acceleration will not be used.
+environment variable.  Hardware acceleration will not be used.



--- a/docs/license.html
+++ b/docs/license.html
@@ -2,21 +2,19 @@
 <html lang="en">
 <head>
  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>License and Copyright</title>
+  <title>License / Copyright Information</title>
  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
 <div class="content">

-<h1>License and Copyright</h1>
-
-<h2>Disclaimer</h2>
+<h1>Disclaimer</h1>

 <p>
 Mesa is a 3-D graphics library with an API which is very similar to
@@ -34,7 +32,7 @@ vendor.
 <p>
 Please do not refer to the library as <em>MesaGL</em> (for legal
 reasons). It's just <em>Mesa</em> or <em>The Mesa 3-D graphics
-library</em>.
+library</em>. <br>
 </p>

 <p>
@@ -44,7 +42,7 @@ library</em>.



-<h2>License / Copyright Information</h2>
+<h1>License / Copyright Information</h1>

 <p>
 The Mesa distribution consists of several components.  Different copyrights
@@ -84,7 +82,7 @@ SOFTWARE.
 </pre>


-<h2>Attention, Contributors</h2>
+<h1>Attention, Contributors</h1>

 <p>
 When contributing to the Mesa project you must agree to the licensing terms
@@ -94,7 +92,7 @@ and their respective licenses.
 </p>


-<h2>Mesa Component Licenses</h2>
+<h1>Mesa Component Licenses</h1>

 <pre>
 Component         Location               License
--- a/docs/lists.html
+++ b/docs/lists.html
@@ -2,13 +2,13 @@
 <html lang="en">
 <head>
  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>Mailing Lists</title>
+  <title>Mesa Mailing Lists</title>
  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
@@ -68,14 +68,14 @@ kernels, see the
 </p>


-<h2>IRC</h2>
+<h1>IRC</h1>

 <p>join <a href="irc://chat.freenode.net#dri-devel">#dri-devel channel</a>
 on <a href="https://webchat.freenode.net/">irc.freenode.net</a>
 </p>


-<h2>OpenGL Forums</h2>
+<h1>OpenGL Forums</h1>

 <p>
 Here are some other OpenGL-related forums you might find useful:
--- a/docs/llvmpipe.html
+++ b/docs/llvmpipe.html
@@ -2,27 +2,25 @@
 <html lang="en">
 <head>
  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>Gallium LLVMpipe Driver</title>
+  <title>llvmpipe</title>
  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
 <div class="content">

-<h1>Gallium LLVMpipe Driver</h1>
-
-<h2>Introduction</h2>
+<h1>Introduction</h1>

 <p>
 The Gallium llvmpipe driver is a software rasterizer that uses LLVM to
 do runtime code generation.
 Shaders, point/line/triangle rasterization and vertex processing are
-implemented with LLVM IR which is translated to x86, x86-64, or ppc64le machine
+implemented with LLVM IR which is translated to x86 or x86-64 machine
 code.
 Also, the driver is multithreaded to take advantage of multiple CPU cores
 (up to 8 at this time).
@@ -30,40 +28,28 @@ It's the fastest software rasterizer for Mesa.
 </p>


-<h2>Requirements</h2>
+<h1>Requirements</h1>

 <ul>
 <li>
+   <p>An x86 or amd64 processor; 64-bit mode recommended.</p>
   <p>
-   For x86 or amd64 processors, 64-bit mode is recommended.
   Support for SSE2 is strongly encouraged.  Support for SSE3 and SSE4.1 will
   yield the most efficient code.  The fewer features the CPU has the more
-   likely it is that you will run into underperforming, buggy, or incomplete code.
+   likely is that you run into underperforming, buggy, or incomplete code.
   </p>
   <p>
-   For ppc64le processors, use of the Altivec feature (the Vector
-   Facility) is recommended if supported; use of the VSX feature (the
-   Vector-Scalar Facility) is recommended if supported AND Mesa is
-   built with LLVM version 4.0 or later.
-   </p>
-   <p>
-   See <code>/proc/cpuinfo</code> to know what your CPU supports.
+   See /proc/cpuinfo to know what your CPU supports.
   </p>
 </li>
 <li>
-   <p>Unless otherwise stated, LLVM version 3.4 is recommended; 3.3 or later is required.</p>
+   <p>LLVM: version 3.4 recommended; 3.3 or later required.</p>
   <p>
   For Linux, on a recent Debian based distribution do:
   </p>
 <pre>
     aptitude install llvm-dev
 </pre>
-   <p>
-   If you want development snapshot builds of LLVM for Debian and derived
-   distributions like Ubuntu, you can use the APT repository at <a
-   href="https://apt.llvm.org/" title="Debian Development packages for LLVM"
-   >apt.llvm.org</a>, which are maintained by Debian's LLVM maintainer.
-   </p>
   <p>
   For a RPM-based distribution do:
   </p>
@@ -73,9 +59,8 @@ It's the fastest software rasterizer for Mesa.

   <p>
   For Windows you will need to build LLVM from source with MSVC or MINGW
-   (either natively or through cross compilers) and CMake, and set the
-   <code>LLVM</code> environment variable to the directory you installed
-   it to.
+   (either natively or through cross compilers) and CMake, and set the LLVM
+   environment variable to the directory you installed it to.

   LLVM will be statically linked, so when building on MSVC it needs to be
   built with a matching CRT as Mesa, and you'll need to pass
@@ -104,8 +89,8 @@ It's the fastest software rasterizer for Mesa.
   </table>

   <p>
-   You can build only the x86 target by passing
-   <code>-DLLVM_TARGETS_TO_BUILD=X86</code> to cmake.
+   You can build only the x86 target by passing -DLLVM_TARGETS_TO_BUILD=X86
+   to cmake.
   </p>
 </li>

@@ -115,7 +100,7 @@ It's the fastest software rasterizer for Mesa.
 </ul>


-<h2>Building</h2>
+<h1>Building</h1>

 To build everything on Linux invoke scons as:

@@ -123,12 +108,10 @@ To build everything on Linux invoke scons as:
  scons build=debug libgl-xlib
 </pre>

-Alternatively, you can build it with meson with:
+Alternatively, you can build it with GNU make, if you prefer, by invoking it as
+
 <pre>
-  mkdir build
-  cd build
-  meson -D glx=gallium-xlib -D gallium-drivers=swrast
-  ninja
+  make linux-llvm
 </pre>

 but the rest of these instructions assume that scons is used.
@@ -140,12 +123,11 @@ For Windows the procedure is similar except the target:
 </pre>


-<h2>Using</h2>
+<h1>Using</h1>

-<h3>Linux</h3>
+<h2>Linux</h2>

-<p>On Linux, building will create a drop-in alternative for
-<code>libGL.so</code> into</p>
+<p>On Linux, building will create a drop-in alternative for libGL.so into</p>

 <pre>
  build/foo/gallium/targets/libgl-xlib/libGL.so
@@ -155,15 +137,13 @@ or
  lib/gallium/libGL.so
 </pre>

-<p>To use it set the <code>LD_LIBRARY_PATH</code> environment variable
-accordingly.</p>
+<p>To use it set the LD_LIBRARY_PATH environment variable accordingly.</p>

-<p>For performance evaluation pass <code>build=release</code> to scons,
-and use the corresponding lib directory without the <code>-debug</code>
-suffix.</p>
+<p>For performance evaluation pass build=release to scons, and use the corresponding
+lib directory without the "-debug" suffix.</p>


-<h3>Windows</h3>
+<h2>Windows</h2>

 <p>
 On Windows, building will create
@@ -181,9 +161,7 @@ any OpenGL drivers):
 </p>

 <ul>
-  <li><p>copy <code>build/windows-x86-debug/gallium/targets/libgl-gdi/opengl32.dll</code>
-         to <code>C:\Windows\SysWOW64\mesadrv.dll</code>
-  </p></li>
+  <li><p>copy build/windows-x86-debug/gallium/targets/libgl-gdi/opengl32.dll to C:\Windows\SysWOW64\mesadrv.dll</p></li>
  <li><p>load this registry settings:</p>
  <pre>REGEDIT4

@@ -200,7 +178,7 @@ any OpenGL drivers):
 </ul>


-<h2>Profiling</h2>
+<h1>Profiling</h1>

 <p>
 To profile llvmpipe you should build as
@@ -214,7 +192,7 @@ This will ensure that frame pointers are used both in C and JIT functions, and
 that no tail call optimizations are done by gcc.
 </p>

-<h3>Linux perf integration</h3>
+<h2>Linux perf integration</h2>

 <p>
 On Linux, it is possible to have symbol resolution of JIT code with <a href="https://perf.wiki.kernel.org/">Linux perf</a>:
@@ -226,64 +204,61 @@ On Linux, it is possible to have symbol resolution of JIT code with <a href="htt
 </pre>

 <p>
-When run inside Linux perf, llvmpipe will create a
-<code>/tmp/perf-XXXXX.map</code> file with symbol address table.  It also
-dumps assembly code to <code>/tmp/perf-XXXXX.map.asm</code>, which can be
-used by the <code>bin/perf-annotate-jit.py</code> script to produce
-disassembly of the generated code annotated with the samples.
+When run inside Linux perf, llvmpipe will create a /tmp/perf-XXXXX.map file with
+symbol address table.  It also dumps assembly code to /tmp/perf-XXXXX.map.asm,
+which can be used by the bin/perf-annotate-jit.py script to produce disassembly of
+the generated code annotated with the samples.
 </p>

 <p>You can obtain a call graph via
 <a href="https://github.com/jrfonseca/gprof2dot#linux-perf">Gprof2Dot</a>.</p>


-<h2>Unit testing</h2>
+<h1>Unit testing</h1>

 <p>
 Building will also create several unit tests in
-<code>build/linux-???-debug/gallium/drivers/llvmpipe</code>:
+build/linux-???-debug/gallium/drivers/llvmpipe:
 </p>

 <ul>
-<li> <code>lp_test_blend</code>: blending
-<li> <code>lp_test_conv</code>: SIMD vector conversion
-<li> <code>lp_test_format</code>: pixel unpacking/packing
+<li> lp_test_blend: blending
+<li> lp_test_conv: SIMD vector conversion
+<li> lp_test_format: pixel unpacking/packing
 </ul>

 <p>
-Some of these tests can output results and benchmarks to a tab-separated file
-for later analysis, e.g.:
+Some of this tests can output results and benchmarks to a tab-separated-file
+for posterior analysis, e.g.:
 </p>
 <pre>
  build/linux-x86_64-debug/gallium/drivers/llvmpipe/lp_test_blend -o blend.tsv
 </pre>


-<h2>Development Notes</h2>
+<h1>Development Notes</h1>

 <ul>
 <li>
-  When looking at this code for the first time, start in lp_state_fs.c, and
-  then skim through the <code>lp_bld_*</code> functions called there, and
-  the comments at the top of the <code>lp_bld_*.c</code> functions.
+  When looking to this code by the first time start in lp_state_fs.c, and 
+  then skim through the lp_bld_* functions called in there, and the comments
+  at the top of the lp_bld_*.c functions.
 </li>
 <li>
  The driver-independent parts of the LLVM / Gallium code are found in
-  <code>src/gallium/auxiliary/gallivm/</code>.  The filenames and function
-  prefixes need to be renamed from <code>lp_bld_</code> to something else
-  though.
+  src/gallium/auxiliary/gallivm/.  The filenames and function prefixes
+  need to be renamed from "lp_bld_" to something else though.
 </li>
 <li>
  We use LLVM-C bindings for now. They are not documented, but follow the C++
  interfaces very closely, and appear to be complete enough for code
  generation. See 
  <a href="https://npcontemplation.blogspot.com/2008/06/secret-of-llvm-c-bindings.html">
-  this stand-alone example</a>.  See the <code>llvm-c/Core.h</code> file for
-  reference.
+  this stand-alone example</a>.  See the llvm-c/Core.h file for reference.
 </li>
 </ul>

-<h2 id="recommended_reading">Recommended Reading</h2>
+<h1 id="recommended_reading">Recommended Reading</h1>

 <ul>
  <li>
@@ -319,7 +294,7 @@ for later analysis, e.g.:
      <li><a href="http://www.drdobbs.com/optimizing-pixomatic-for-modern-x86-proc/184405807">Optimizing Pixomatic For Modern x86 Processors</a></li>
      <li><a href="http://www.intel.com/content/www/us/en/architecture-and-technology/64-ia-32-architectures-optimization-manual.html">Intel 64 and IA-32 Architectures Optimization Reference Manual</a></li>
      <li><a href="http://www.agner.org/optimize/">Software optimization resources</a></li>
-      <li><a href="https://software.intel.com/en-us/articles/intel-intrinsics-guide">Intel Intrinsics Guide</a></li>
+      <li><a href="https://software.intel.com/en-us/articles/intel-intrinsics-guide">Intel Intrinsics Guide</a><li>
    </ul>
  </li>
  <li>
--- a/docs/mangling.html
+++ b/docs/mangling.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=utf-8">
+  <title>GL Function Name Mangling</title>
+  <link rel="stylesheet" type="text/css" href="mesa.css">
+</head>
+<body>
+
+<div class="header">
+  <h1>The Mesa 3D Graphics Library</h1>
+</div>
+
+<iframe src="contents.html"></iframe>
+<div class="content">
+
+<h1>GL Function Name Mangling</h1>
+
+<p>
+If you want to use both Mesa and another OpenGL library in the same
+application at the same time you may find it useful to compile Mesa with
+<i>name mangling</i>.
+This results in all the Mesa functions being prefixed with
+<b>mgl</b> instead of <b>gl</b>.
+</p>
+
+<p>
+This option is supported only with the autoconf build. To use it add
+--enable-mangling to your configure line.
+</p>
+<pre>
+<code>./configure --enable-mangling ...</code>
+</pre>
+
+</div>
+</body>
+</html>
--- a/docs/mesa.css
+++ b/docs/mesa.css
@@ -3,48 +3,61 @@ body {
 	background-color: #ffffff;
 	font: 14px 'Lucida Grande', Geneva, Arial, Verdana, sans-serif;
 	color: black;
+ 	link: #111188;
 }

 h1 {
-	font-size: 24px;
+	font: 24px 'Lucida Grande', Geneva, Arial, Verdana, sans-serif;
 	font-weight: bold;
+	color: black;
 }

 h2 {
-	font-size: 18px;
+	font: 18px 'Lucida Grande', Geneva, Arial, Verdana, sans-serif, bold;
 	font-weight: bold;
+	color: black;
 }

 code {
 	font-family: monospace;
 	font-size: 10pt;
+	color: black;
 }

+
 pre {
+	/*font-family: monospace;*/
 	font-size: 10pt;
-	background-color: #eee;
-	margin-left: 2em;
-	padding: .5em;
+	/*color: black;*/
 }

 iframe {
-	width: 19em;
-	height: 80em;
-	border: none;
-	float: left;
+  width: 19em;
+  height: 80em;
+  border: none;
+  float: left;
 }

 .content {
-	position: absolute;
-	left: 20em;
-	right: 10px;
-	overflow: hidden;
+  position: absolute;
+  left: 20em;
+  right: 10px;
+  overflow: hidden
 }

 .header {
-	background: url('gears.png') 15px no-repeat, black url('gears.png') right no-repeat;
-	padding: 1.75rem;
-	text-align: center;
-	color: white;
-	font: x-large sans-serif;
+  background: black url('gears.png') 15px no-repeat;
+  margin:0;
+  padding: 5px;
+  clear:both;
+}
+
+.header h1 {
+  background: url('gears.png') right no-repeat;
+  color: white;
+  font: x-large sans-serif;
+  text-align: center;
+  height: 50px;
+  margin: 0;
+  padding-top: 30px;
 }
--- a/docs/meson.html
+++ b/docs/meson.html
@@ -1,424 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-<head>
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>Compilation and Installation Using Meson</title>
-  <link rel="stylesheet" type="text/css" href="mesa.css">
-</head>
-<body>
-
-<div class="header">
-  The Mesa 3D Graphics Library
-</div>
-
-<iframe src="contents.html"></iframe>
-<div class="content">
-
-<h1>Compilation and Installation Using Meson</h1>
-
-<ul>
-  <li><a href="#intro">Introduction</a></li>
-  <li><a href="#basic">Basic Usage</a></li>
-  <li><a href="#advanced">Advanced Usage</a></li>
-  <li><a href="#cross-compilation">Cross-compilation and 32-bit builds</a></li>
-</ul>
-
-<h2 id="intro">1. Introduction</h2>
-
-<p>For general information about Meson see the
-<a href="http://mesonbuild.com/">Meson website</a>.</p>
-
-<p><strong>Mesa's Meson build system is generally considered stable and ready
-for production.</strong></p>
-
-<p>The Meson build of Mesa is tested on Linux, macOS, Cygwin and Haiku, FreeBSD,
-DragonflyBSD, NetBSD, and should work on OpenBSD.</p>
-
-<p>If Meson is not already installed on your system, you can typically
-install it with your package installer.  For example:</p>
-<pre>
-sudo apt-get install meson   # Ubuntu
-</pre>
-or
-<pre>
-sudo dnf install meson   # Fedora
-</pre>
-
-<p><strong>Mesa requires Meson &gt;= 0.46.0 to build.</strong>
-
-Some older versions of meson do not check that they are too old and will error
-out in odd ways.
-</p>
-
-<p>You'll also need <a href="https://ninja-build.org/">Ninja</a>.
-If it's not already installed, use apt-get or dnf to install
-the <em>ninja-build</em> package.
-</p>
-
-<h2 id="basic">2. Basic Usage</h2>
-
-<p>
-The meson program is used to configure the source directory and generates
-either a ninja build file or Visual Studio® build files. The latter must
-be enabled via the <code>--backend</code> switch, as ninja is the default
-backend on all
-operating systems.
-</p>
-
-<p>
-Meson only supports out-of-tree builds, and must be passed a
-directory to put built and generated sources into. We'll call that directory
-"build" here.
-It's recommended to create a
-<a href="http://mesonbuild.com/Using-multiple-build-directories.html">
-separate build directory</a> for each configuration you might want to use.
-</p>
-
-
-
-<p>Basic configuration is done with:</p>
-
-<pre>
-meson build/
-</pre>
-
-<p>
-This will create the build directory.
-If any dependencies are missing, you can install them, or try to remove
-the dependency with a Meson configuration option (see below).
-</p>
-
-<p>
-To review the options which Meson chose, run:
-</p>
-<pre>
-meson configure build/
-</pre>
-
-<p>
-Meson does not currently support listing configuration options before
-running "meson build/" but this feature is being discussed upstream.
-For now, we have a <code>bin/meson-options.py</code> script that prints
-the options for you.
-If that script doesn't work for some reason, you can always look in the
-<a href="https://gitlab.freedesktop.org/mesa/mesa/blob/master/meson_options.txt">
-meson_options.txt</a> file at the root of the project.
-</p>
-
-<p>
-With additional arguments <code>meson configure</code> can be used to change
-options for a previously configured build directory.
-All options passed to this command are in the form
-<code>-D "option"="value"</code>.
-For example:
-</p>
-
-<pre>
-meson configure build/ -Dprefix=/tmp/install -Dglx=true
-</pre>
-
-<p>
-Note that options taking lists (such as <code>platforms</code>) are
-<a href="http://mesonbuild.com/Build-options.html#using-build-options">a bit
-more complicated</a>, but the simplest form compatible with Mesa options
-is to use a comma to separate values (<code>-D platforms=drm,wayland</code>)
-and brackets to represent an empty list (<code>-D platforms=[]</code>).
-</p>
-
-<p>
-Once you've run the initial <code>meson</code> command successfully you can use
-your configured backend to build the project in your build directory:
-</p>
-
-<pre>
-ninja -C build/
-</pre>
-
-<p>
-The next step is to install the Mesa libraries, drivers, etc.
-This also finishes up some final steps of the build process (such as creating
-symbolic links for drivers).  To install:
-</p>
-
-<pre>
-ninja -C build/ install
-</pre>
-
-<p>
-Note: autotools automatically updated translation files (used by the DRI
-configuration tool) as part of the build process,
-Meson does not do this.  Instead, you will need do this:
-</p>
-<pre>
-ninja -C build/ xmlpool-pot xmlpool-update-po xmlpool-gmo
-</pre>
-
-<h2 id="advanced">3. Advanced Usage</h2>
-
-<dl>
-
-<dt>Installation Location</dt>
-<dd>
-<p>
-Meson default to installing libGL.so in your system's main lib/ directory
-and DRI drivers to a dri/ subdirectory.
-</p>
-<p>
-Developers will often want to install Mesa to a testing directory rather
-than the system library directory.
-This can be done with the --prefix option.  For example:
-</p>
-<pre>
-meson --prefix="${PWD}/build/install" build/
-</pre>
-<p>
-will put the final libraries and drivers into the build/install/
-directory.
-Then you can set LD_LIBRARY_PATH and LIBGL_DRIVERS_PATH to that location
-to run/test the driver.
-</p>
-<p>
-Meson also honors <code>DESTDIR</code> for installs.
-</p>
-</dd>
-
-<dt>Compiler Options</dt>
-<dd>
-<p>Meson supports the common CFLAGS, CXXFLAGS, etc. environment
-variables but their use is discouraged because of the many caveats
-in using them.
-</p>
-<p>Instead, it is recomended to use <code>-D${lang}_args</code> and
-<code>-D${lang}_link_args</code>. Among the benefits of these options
-is that they are guaranteed to persist across rebuilds and reconfigurations.
-</p>
-<p>
-This example sets -fmax-errors for compiling C sources and -DMAGIC=123
-for C++ sources:
-</p>
-<pre>
-meson builddir/ -Dc_args=-fmax-errors=10 -Dcpp_args=-DMAGIC=123
-</pre>
-</dd>
-
-
-<dt>Compiler Specification</dt>
-<dd>
-<p>
-Meson supports the standard CC and CXX environment variables for
-changing the default compiler.  Note that Meson does not allow
-changing the compilers in a configured builddir so you will need
-to create a new build dir for a different compiler.
-</p>
-<p>
-This is an example of specifying the clang compilers and cleaning
-the build directory before reconfiguring with an extra C option:
-</p>
-<pre>
-CC=clang CXX=clang++ meson build-clang
-ninja -C build-clang
-ninja -C build-clang clean
-meson configure build -Dc_args="-Wno-typedef-redefinition"
-ninja -C build-clang
-</pre>
-<p>
-The default compilers depends on your operating system. Meson supports most of
-the popular compilers, a complete list is available
-<a href="http://mesonbuild.com/Reference-tables.html#compiler-ids">here</a>.
-</p>
-</dd>
-
-<dt>LLVM</dt>
-<dd><p>Meson includes upstream logic to wrap llvm-config using its standard
-dependency interface.
-</p></dd>
-
-<dd><p>
-As of meson 0.49.0 meson also has the concept of a
-<a href="https://mesonbuild.com/Native-environments.html">"native file"</a>,
-these files provide information about the native build environment (as opposed
-to a cross build environment). They are ini formatted and can override where to
-find llvm-config:
-</p>
-
-custom-llvm.ini
-<pre>
-    [binaries]
-    llvm-config = '/usr/local/bin/llvm/llvm-config'
-</pre>
-
-Then configure meson:
-
-<pre>
-    meson builddir/ --native-file custom-llvm.ini
-</pre>
-</dd>
-
-<dd><p>
-Meson &lt; 0.49 doesn't support native files, so to specify a custom
-<code>llvm-config</code> you need to modify your <code>$PATH</code> (or
-<code>%PATH%</code> on windows), which will be searched for
-<code>llvm-config</code>, <code>llvm-config<i>$version</i></code>,
-and <code>llvm-config-<i>$version</i></code>:
-</p>
-<pre>
-PATH=/path/to/folder/with/llvm-config:$PATH meson build
-</pre>
-</dd>
-
-<dd><p>
-For selecting llvm-config for cross compiling a
-<a href="https://mesonbuild.com/Cross-compilation.html#defining-the-environment">"cross file"</a>
-should be used. It uses the same format as the native file above:
-</p>
-
-<p>cross-llvm.ini</p>
-<pre>
-    [binaries]
-    ...
-    llvm-config = '/usr/lib/llvm-config-32'
-</pre>
-
-<p>Then configure meson:</p>
-<pre>
-    meson builddir/ --cross-file cross-llvm.ini
-</pre>
-
-See the <a href="#cross-compilation">Cross Compilation</a> section for more information.
-</dd>
-
-<dt><code>PKG_CONFIG_PATH</code></dt>
-<dd><p>The
-<code>pkg-config</code> utility is a hard requirement for configuring and
-building Mesa on Unix-like systems. It is used to search for external libraries
-on the system. This environment variable is used to control the search path for
-<code>pkg-config</code>. For instance, setting
-<code>PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig</code> will search for package
-metadata in <code>/usr/X11R6</code> before the standard directories.</p>
-</dd>
-</dl>
-
-<p>
-One of the oddities of meson is that some options are different when passed to
-the <code>meson</code> than to <code>meson configure</code>. These options are
-passed as --option=foo to <code>meson</code>, but -Doption=foo to <code>meson
-configure</code>. Mesa defined options are always passed as -Doption=foo.
-</p>
-
-<p>For those coming from autotools be aware of the following:</p>
-
-<dl>
-<dt><code>--buildtype/-Dbuildtype</code></dt>
-<dd><p>This option will set the compiler debug/optimisation levels to aid
-debugging the Mesa libraries.</p>
-
-<p>Note that in meson this defaults to <code>debugoptimized</code>, and
-not setting it to <code>release</code> will yield non-optimal
-performance and binary size. Not using <code>debug</code> may interfere
-with debugging as some code and validation will be optimized away.
-</p>
-
-<p> For those wishing to pass their own optimization flags, use the <code>plain</code>
-buildtype, which causes meson to inject no additional compiler arguments, only
-those in the C/CXXFLAGS and those that mesa itself defines.</p>
-</dd>
-
-<dt><code>-Db_ndebug</code></dt>
-<dd><p>This option controls assertions in meson projects. When set to <code>false</code>
-(the default) assertions are enabled, when set to true they are disabled. This
-is unrelated to the <code>buildtype</code>; setting the latter to
-<code>release</code> will not turn off assertions.
-</p>
-</dd>
-</dl>
-
-<h2 id="cross-compilation">4. Cross-compilation and 32-bit builds</h2>
-
-<p><a href="https://mesonbuild.com/Cross-compilation.html">Meson supports
-cross-compilation</a> by specifying a number of binary paths and
-settings in a file and passing this file to <code>meson</code> or
-<code>meson configure</code> with the <code>--cross-file</code>
-parameter.</p>
-
-<p>This file can live at any location, but you can use the bare filename
-(without the folder path) if you put it in $XDG_DATA_HOME/meson/cross or
-~/.local/share/meson/cross</p>
-
-<p>Below are a few example of cross files, but keep in mind that you
-will likely have to alter them for your system.</p>
-
-<p>
-Those running on ArchLinux can use the AUR-maintained packages for some
-of those, as they'll have the right values for your system:
-</p>
-<ul>
-  <li><a href="https://aur.archlinux.org/packages/meson-cross-x86-linux-gnu">meson-cross-x86-linux-gnu</a></li>
-  <li><a href="https://aur.archlinux.org/packages/meson-cross-aarch64-linux-gnu">meson-cross-aarch64-linux-gnu</a></li>
-</ul>
-
-<p>
-32-bit build on x86 linux:
-</p>
-<pre>
-[binaries]
-c = '/usr/bin/gcc'
-cpp = '/usr/bin/g++'
-ar = '/usr/bin/gcc-ar'
-strip = '/usr/bin/strip'
-pkgconfig = '/usr/bin/pkg-config-32'
-llvm-config = '/usr/bin/llvm-config32'
-
-[properties]
-c_args = ['-m32']
-c_link_args = ['-m32']
-cpp_args = ['-m32']
-cpp_link_args = ['-m32']
-
-[host_machine]
-system = 'linux'
-cpu_family = 'x86'
-cpu = 'i686'
-endian = 'little'
-</pre>
-
-<p>
-64-bit build on ARM linux:
-</p>
-<pre>
-[binaries]
-c = '/usr/bin/aarch64-linux-gnu-gcc'
-cpp = '/usr/bin/aarch64-linux-gnu-g++'
-ar = '/usr/bin/aarch64-linux-gnu-gcc-ar'
-strip = '/usr/bin/aarch64-linux-gnu-strip'
-pkgconfig = '/usr/bin/aarch64-linux-gnu-pkg-config'
-exe_wrapper = '/usr/bin/qemu-aarch64-static'
-
-[host_machine]
-system = 'linux'
-cpu_family = 'aarch64'
-cpu = 'aarch64'
-endian = 'little'
-</pre>
-
-<p>
-64-bit build on x86 windows:
-</p>
-<pre>
-[binaries]
-c = '/usr/bin/x86_64-w64-mingw32-gcc'
-cpp = '/usr/bin/x86_64-w64-mingw32-g++'
-ar = '/usr/bin/x86_64-w64-mingw32-ar'
-strip = '/usr/bin/x86_64-w64-mingw32-strip'
-pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
-exe_wrapper = 'wine'
-
-[host_machine]
-system = 'windows'
-cpu_family = 'x86_64'
-cpu = 'i686'
-endian = 'little'
-</pre>
-
-</div>
-</body>
-</html>
--- a/docs/opengles.html
+++ b/docs/opengles.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
@@ -25,7 +25,7 @@ https://www.khronos.org/opengles/</a>.</p>

 <h2>Build the Libraries</h2>
 <ol>
-<li>Run <code>meson configure</code> with <code>-D gles1=true -D gles2=true</code> and enable the Gallium driver for your hardware.</li>
+<li>Run <code>configure</code> with <code>--enable-gles1 --enable-gles2</code> and enable the Gallium driver for your hardware.</li>
 <li>Build and install Mesa as usual.</li>
 </ol>

@@ -33,7 +33,7 @@ Alternatively, if XCB-DRI2 is installed on the system, one can use
 <code>egl_dri2</code> EGL driver with OpenGL|ES-enabled DRI drivers

 <ol>
-<li>Run <code>meson configure</code> with <code>-D gles1=true -D gles2=true</code>.</li>
+<li>Run <code>configure</code> with <code>--enable-gles1 --enable-gles2</code>.</li>
 <li>Build and install Mesa as usual.</li>
 </ol>

--- a/docs/osmesa.html
+++ b/docs/osmesa.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
@@ -45,14 +45,14 @@ The OSMesa interface may be used with any of three software renderers:
 There are several examples of OSMesa in the mesa/demos repository.
 </p>

-<h2>Building OSMesa</h2>
+<h1>Building OSMesa</h1>

 <p>
 Configure and build Mesa with something like:

 <pre>
-meson builddir -Dosmesa=gallium -Dgallium-drivers=swrast -Ddri-drivers=[] -Dvulkan-drivers=[] -Dprefix=$PWD/builddir/install
-ninja -C builddir install
+configure --enable-osmesa --disable-driglx-direct --disable-dri --with-gallium-drivers=swrast
+make
 </pre>

 <p>
@@ -63,12 +63,13 @@ Make sure you have LLVM installed first if you want to use the llvmpipe driver.
 When the build is complete you should find:
 </p>
 <pre>
-$PWD/builddir/install/lib/libOSMesa.so  (swrast-based OSMesa)
-$PWD/builddir/install/lib/gallium/libOSMsea.so  (gallium-based OSMesa)
+lib/libOSMesa.so  (swrast-based OSMesa)
+lib/gallium/libOSMsea.so  (gallium-based OSMesa)
 </pre>

 <p>
-Set your LD_LIBRARY_PATH to point to $PWD/builddir/install to use the libraries
+Set your LD_LIBRARY_PATH to point to one directory or the other to select
+the library you want to use.
 </p>

 <p>
--- a/docs/patents.txt
+++ b/docs/patents.txt
@@ -0,0 +1,31 @@
+ARB_texture_float:
+
+    Silicon Graphics, Inc. owns US Patent #6,650,327, issued November 18,
+    2003 [1].
+
+    SGI believes this patent contains necessary IP for graphics systems
+    implementing floating point rasterization and floating point
+    framebuffer capabilities described in ARB_texture_float extension, and
+    will discuss licensing on RAND terms, on an individual basis with
+    companies wishing to use this IP in the context of conformant OpenGL
+    implementations [2].
+
+    The source code to implement ARB_texture_float extension is included
+    and can be toggled on at compile time, for those who purchased a
+    license from SGI, or are in a country where the patent does not apply,
+    etc.
+
+    The software is provided "as is", without warranty of any kind, express
+    or implied, including but not limited to the warranties of
+    merchantability, fitness for a particular purpose and noninfringement.
+    In no event shall the authors or copyright holders be liable for any
+    claim, damages or other liability, whether in an action of contract,
+    tort or otherwise, arising from, out of or in connection with the
+    software or the use or other dealings in the software.
+
+    You should contact a lawyer or SGI's legal department if you want to
+    enable this extension.
+
+
+[1] https://www.google.com/patents/about?id=mIIOAAAAEBAJ&dq=6650327
+[2] https://www.opengl.org/registry/specs/ARB/texture_float.txt
--- a/docs/perf.html
+++ b/docs/perf.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
--- a/docs/postprocess.html
+++ b/docs/postprocess.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
@@ -55,6 +55,10 @@ Numbers higher than 8 see minimizing gains.
 <li>pp_celshade - set to 1 to enable cell shading (a more complex color filter).
 </ul>

+
+<br>
+<br>
+
 </div>
 </body>
 </html>
--- a/docs/precompiled.html
+++ b/docs/precompiled.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
@@ -22,14 +22,13 @@ In general, precompiled Mesa libraries are not available.
 <p>
 Some Linux distributions closely follow the latest Mesa releases. On others one
 has to use unofficial channels.
-</p>
-<p>There are some general directions:</p>
-<ul>
+<br>
+There are some general directions:
 <li>Debian/Ubuntu based distros - PPA: xorg-edgers, oibaf and padoka</li>
 <li>Fedora - Corp: erp and che</li>
 <li>OpenSuse/SLES - OBS: X11:XOrg and pontostroy:X11</li>
 <li>Gentoo/Archlinux - officially provided/supported</li>
-</ul>
+</p>

 </div>
 </body>
--- a/docs/release-calendar.html
+++ b/docs/release-calendar.html
@@ -1,135 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-<head>
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>Release Calendar</title>
-  <link rel="stylesheet" type="text/css" href="mesa.css">
-</head>
-<body>
-
-<div class="header">
-  The Mesa 3D Graphics Library
-</div>
-
-<iframe src="contents.html"></iframe>
-<div class="content">
-
-<h1>Release Calendar</h1>
-
-<h2>Overview</h2>
-
-<p>
-Mesa provides feature/development and stable releases.
-</p>
-
-<p>
-The table below lists the date and release manager that is expected to do the
-specific release.
-</p>
-
-<p>
-Regular updates will ensure that the schedule for the current and the next two
-feature releases are shown in the table.
-</p>
-
-<p>
-In order to keep the whole releasing team up to date with the tools used, best
-practices and other details, the member in charge of the next feature release
-will be in constant rotation.
-</p>
-
-<p>
-The way the release schedule works is explained
-<a href="releasing.html#schedule" target="_parent">here</a>.
-</p
->
-<p>
-Take a look <a href="submittingpatches.html#criteria" target="_parent">here</a>
-if you'd like to nominate a patch in the next stable release.
-</p>
-
-<h2 id="calendar">Calendar</h2>
-
-<table border="1">
-
-<tr>
-<th>Branch</th>
-<th>Expected date</th>
-<th>Release</th>
-<th>Release manager</th>
-<th>Notes</th>
-</tr>
-<tr>
-<td rowspan="3">19.1</td>
-<td>2019-08-20</td>
-<td>19.1.5</td>
-<td>Juan A. Suarez</td>
-<td>
-</tr>
-<tr>
-<td>2019-09-03</td>
-<td>19.1.6</td>
-<td>Juan A. Suarez</td>
-<td>
-</tr>
-<tr>
-<td>2019-09-17</td>
-<td>19.1.7</td>
-<td>Juan A. Suarez</td>
-<td>Last planned 19.1.x release</td>
-</tr>
-<tr>
-<td rowspan="4">19.2</td>
-<td>2019-08-06</td>
-<td>19.2.0-rc1</td>
-<td>Emil Velikov</td>
-<td>
-</tr>
-<tr>
-<td>2019-08-13</td>
-<td>19.2.0-rc2</td>
-<td>Emil Velikov</td>
-<td>
-</tr>
-<tr>
-<td>2019-08-20</td>
-<td>19.2.0-rc3</td>
-<td>Emil Velikov</td>
-<td>
-</tr>
-<tr>
-<td>2019-08-27</td>
-<td>19.2.0-rc4</td>
-<td>Emil Velikov</td>
-<td>Last planned RC/Final release</td>
-</tr>
-<tr>
-<td rowspan="4">19.3</td>
-<td>2019-10-15</td>
-<td>19.3.0-rc1</td>
-<td>Dylan Baker</td>
-<td>
-</tr>
-<tr>
-<td>2019-10-22</td>
-<td>19.3.0-rc2</td>
-<td>Dylan Baker</td>
-<td>
-</tr>
-<tr>
-<td>2019-10-29</td>
-<td>19.3.0-rc3</td>
-<td>Dylan Baker</td>
-<td>
-</tr>
-<tr>
-<td>2019-11-05</td>
-<td>19.3.0-rc4</td>
-<td>Dylan Baker</td>
-<td>Last planned RC/Final release</td>
-</tr>
-</table>
-
-</div>
-</body>
-</html>
--- a/docs/releasing.html
+++ b/docs/releasing.html
@@ -2,26 +2,24 @@
 <html lang="en">
 <head>
  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-  <title>Releasing Process</title>
+  <title>Releasing process</title>
  <link rel="stylesheet" type="text/css" href="mesa.css">
 </head>
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
 <div class="content">

-
-<h1>Releasing Process</h1>
+<h1>Releasing process</h1>

 <ul>
 <li><a href="#overview">Overview</a>
 <li><a href="#schedule">Release schedule</a>
 <li><a href="#pickntest">Cherry-pick and test</a>
-<li><a href="#stagingbranch">Staging branch</a>
 <li><a href="#branch">Making a branchpoint</a>
 <li><a href="#prerelease">Pre-release announcement</a>
 <li><a href="#release">Making a new release</a>
@@ -30,15 +28,12 @@
 <li><a href="#bugzilla">Update Bugzilla</a>
 </ul>

-
-<h2 id="overview">Overview</h2>
+<h1 id="overview">Overview</h1>

 <p>
 This document uses the convention X.Y.Z for the release number with X.Y being
 the stable branch name.
-</p>
-
-<p>
+<br>
 Mesa provides feature and bugfix releases. Former use zero as patch version (Z),
 while the latter have a non-zero one.
 </p>
@@ -53,18 +48,11 @@ For example:
 	Mesa 12.0.2 - 12.0 branch, bugfix
 </pre>

-
-<h2 id="schedule">Release schedule</h2>
+<h1 id="schedule">Release schedule</h1>

 <p>
-Releases should happen on Wednesdays. Delays can occur although those
-should be kept to a minimum.
-</p>
-
-<p>
-See our <a href="release-calendar.html" target="_parent">calendar</a>
-for information about how the release schedule is planned, and the
-date and other details for individual releases.
+Releases should happen on Fridays. Delays can occur although those should be keep
+to a minimum.
 </p>

 <h2>Feature releases</h2>
@@ -72,9 +60,6 @@ date and other details for individual releases.
 <li>Available approximately every three months.
 <li>Initial timeplan available 2-4 weeks before the planned branchpoint (rc1)
 on the mesa-announce@ mailing list.
-<li>Typically, the final release will happen after 4
-candidates. Additional ones may be needed in order to resolve blocking
-regressions, though.
 <li>A <a href="#prerelease">pre-release</a> announcement should be available
 approximately 24 hours before the final (non-rc) release.
 </ul>
@@ -89,40 +74,21 @@ approximately 48 hours before the actual release.

 <p>
 Note: There is one or two releases overlap when changing branches. For example:
-</p>
-
-<p>
+<br>
 The final release from the 12.0 series Mesa 12.0.5 will be out around the same
 time (or shortly after) 13.0.1 is out.
 </p>

-<p>
-This also involves that, as a final release may be delayed due to the
-need of additional candidates to solve some blocking regression(s),
-the release manager might have to update
-the <a href="release-calendar.html" target="_parent">calendar</a> with
-additional bug fix releases of the current stable branch.
-</p>
-
-
-<h2 id="pickntest">Cherry-picking and testing</h2>
+<h1 id="pickntest">Cherry-picking and testing</h1>

 <p>
 Commits nominated for the active branch are picked as based on the
 <a href="submittingpatches.html#criteria" target="_parent">criteria</a> as
 described in the same section.
-</p>

 <p>
-Nomination happens in the mesa-stable@ mailing list. However,
-maintainer is responsible of checking for forgotten candidates in the
-master branch. This is achieved by a combination of ad-hoc scripts and
-a casual search for terms such as regression, fix, broken and similar.
-</p>
-
-<p>
-Maintainer is also responsible for testing in various possible permutations of
-the meson and scons build.
+Maintainer is responsible for testing in various possible permutations of
+the autoconf and scons build.
 </p>

 <h2>Cherry-picking and build/check testing</h2>
@@ -130,64 +96,38 @@ the meson and scons build.
 <p>Done continuously up-to the <a href="#prerelease">pre-release</a> announcement.</p>

 <p>
-Developers can request, <em>as an exception</em>, patches to be applied up-to
-the last one hour before the actual release. This is made <strong>only</strong>
-with explicit permission/request, and the patch <strong>must</strong> be very
-well contained. Thus it cannot affect more than one driver/subsystem.
+As an exception, patches can be applied up-to the last ~1h before the actual
+release. This is made <strong>only</strong> with explicit permission/request,
+and the patch <strong>must</strong> be very well contained. Thus it cannot
+affect more than one driver/subsystem.
+</p>
+<p>
+Currently Ilia Mirkin and AMD devs have requested "permanent" exception.
 </p>

-<p>Following developers have requested permanent exception</p>
-<ul>
-<li><em>Ilia Mirkin</em>
-<li><em>AMD team</em>
-</ul>

-<p>The following must pass:</p>
 <ul>
-<li>meson test, scons and scons check
+<li>make distcheck, scons and scons check must pass
 <li>Testing with different version of system components - LLVM and others is also
 performed where possible.
-<li>As a general rule, testing with various combinations of configure
-switches, depending on the specific patchset.
 </ul>
-
 <p>
-These are achieved by combination of <a href="basictesting">local testing</a>,
-which includes mingw-w64 cross compilation and AppVeyor plus Travis-CI, the
-latter two as part of their Github integration.
+Achieved by combination of local ad-hoc scripts and AppVeyor plus Travis-CI,
+the latter as part of their Github integration.
 </p>
-
-<p>
-For Windows related changes, the main contact point is Brian
-Paul. Jose Fonseca can also help as a fallback contact.
-</p>
-
-<p>
-For Android related changes, the main contact is Tapani
-P&auml;lli. Mauro Rossi is collaborating with android-x86 and may
-provide feedback about the build status in that project.
-</p>
-
-<p>
-For MacOSX related changes, Jeremy Huddleston Sequoia is currently a
-good contact point.
-</p>
-
 <p>
 <strong>Note:</strong> If a patch in the current queue needs any additional
-fix(es), then they should be squashed together. The commit messages and the
-&quot;<code>cherry picked from</code>&quot;-tags must be preserved.
+fix(es), then they should be squashed together.
+<br>
+The commit messages and the <code>cherry picked from</code> tags must be preserved.
 </p>
-
 <p>
 This should be noted in the <a href="#prerelease">pre-announce</a> email.
-</p>
-
 <pre>
    git show b10859ec41d09c57663a258f43fe57c12332698e

    commit b10859ec41d09c57663a258f43fe57c12332698e
-    Author: Jonas Pfeil &lt;pfeiljonas@gmx.de&gt;
+    Author: Jonas Pfeil &ltpfeiljonas@gmx.de&gt
    Date:   Wed Mar 1 18:11:10 2017 +0100

        ralloc: Make sure ralloc() allocations match malloc()'s alignment.
@@ -206,6 +146,7 @@ This should be noted in the <a href="#prerelease">pre-announce</a> email.

        (cherry picked from commit ff494fe999510ea40e3ed5827e7818550b6de126)
 </pre>
+</p>

 <h2>Regression/functionality testing</h2>

@@ -213,44 +154,17 @@ This should be noted in the <a href="#prerelease">pre-announce</a> email.
 Less often (once or twice), shortly before the pre-release announcement.
 Ensure that testing is redone if Intel devs have requested an exception, as per above.
 </p>
-
 <ul>
 <li><em>no regressions should be observed for Piglit/dEQP/CTS/Vulkan on Intel platforms</em>
 <li><em>no regressions should be observed for Piglit using the swrast, softpipe
 and llvmpipe drivers</em>
 </ul>
-
 <p>
 Currently testing is performed courtesy of the Intel OTC team and their Jenkins CI setup. Check with the Intel team over IRC how to get things setup.
 </p>

-<p>
-Installing the built driver from the pre-announced RC branch in the
-system and making some every day's use until the release may be a good
-idea too.
-</p>

-<h2 id="stagingbranch">Staging branch</h2>
-
-<p>
-A live branch, which contains the currently merge/rejected patches is available
-in the main repository under <code>staging/X.Y</code>. For example:
-</p>
-<pre>
-	staging/18.1 - WIP branch for the 18.1 series
-	staging/18.2 - WIP branch for the 18.2 series
-</pre>
-
-<p>
-Notes:
-</p>
-<ul>
-<li>People are encouraged to test the staging branch and report regressions.</li>
-<li>The branch history is not stable and it <strong>will</strong> be rebased,</li>
-</ul>
-
-
-<h2 id="branch">Making a branchpoint</h2>
+<h1 id="branch">Making a branchpoint</h1>

 <p>
 A branchpoint is made such that new development can continue in parallel to
@@ -258,9 +172,10 @@ stabilisation and bugfixing.
 </p>

 <p>
-Note: Before doing a branch ensure that basic build and <code>meson test</code>
-testing is done and there are little to-no issues. Ideally all of those should
-be tackled already.
+Note: Before doing a branch ensure that basic build and <code>make check</code>
+testing is done and there are little to-no issues.
+<br>
+Ideally all of those should be tackled already.
 </p>

 <p>
@@ -285,60 +200,49 @@ To setup the branchpoint:

 <p>
 Now go to
-<a href="https://gitlab.freedesktop.org/mesa/mesa/-/milestones" target="_parent">gitlab</a> and add the new Mesa version X.Y.
+<a href="https://bugs.freedesktop.org/editversions.cgi?action=add&amp;product=Mesa" target="_parent">Bugzilla</a> and add the new Mesa version X.Y.
 </p>
-
 <p>
 Check that there are no distribution breaking changes and revert them if needed.
 For example: files being overwritten on install, etc. Happens extremely rarely -
 we had only one case so far (see commit 2ced8eb136528914e1bf4e000dea06a9d53c7e04).
 </p>
-
 <p>
 Proceed to <a href="#release">release</a> -rc1.
 </p>

-
-<h2 id="prerelease">Pre-release announcement</h2>
+<h1 id="prerelease">Pre-release announcement</h1>

 <p>
 It comes shortly after outstanding patches in the respective branch are pushed.
 Developers can check, in brief, what's the status of their patches. They,
 alongside very early testers, are strongly encouraged to test the branch and
 report any regressions.
-</p>
-<p>
+<br>
 It is followed by a brief period (normally 24 or 48 hours) before the actual
 release is made.
 </p>

-<p>
-Be aware to add a note to warn about a final release in a series, if
-that is the case.
-</p>
-
 <h2>Terminology used</h2>
-
 <ul><li>Nominated</ul>
-
 <p>
 Patch that is nominated but yet to to merged in the patch queue/branch.
 </p>

 <ul><li>Queued</ul>
-
 <p>
 Patch is in the queue/branch and will feature in the next release.
 Barring reported regressions or objections from developers.
 </p>

 <ul><li>Rejected</ul>
-
 <p>
 Patch does not fit the
 <a href="submittingpatches.html#criteria" target="_parent">criteria</a> and
-is followed by a brief information. The release maintainer is human so if you
-believe you've spotted a mistake do let them know.
+is followed by a brief information.
+<br>
+The release maintainer is human so if you believe you've spotted a mistake do
+let them know.
 </p>

 <h2>Format/template</h2>
@@ -354,10 +258,6 @@ The candidate for the Mesa X.Y.Z is now available. Currently we have:
 - NUMBER nominated (outstanding)
 - and NUMBER rejected patches

-[If applicable:
-Note: this is the final anticipated release in the SERIES series. Users are
-encouraged to migrate to the NEXT_SERIES series in order to obtain future fixes.]
-
 BRIEF SUMMARY OF CHANGES

 Take a look at section "Mesa stable queue" for more information.
@@ -421,9 +321,6 @@ Queued (NUMBER)

 AUTHOR (NUMBER):
      COMMIT SUMMARY
-[If applicable:
-Squashed with
-      COMMIT SUMMARY]

 For example:

@@ -432,89 +329,110 @@ Jonas Pfeil (1):
 Squashed with
      ralloc: don't leave out the alignment factor

-
 Rejected (NUMBER)
 =================

+Rejected (11)
+=============
+
 AUTHOR (NUMBER):
      SHA     COMMIT SUMMARY

 Reason: ...
-
-For example:
-
-Emil Velikov (1)
-      a39ad18 configure.ac: honour LLVM_LIBDIR when linking against LLVM
-
-Reason: The patch was reverted shortly after it was merged.
 </pre>

-
-<h2 id="release">Making a new release</h2>
+<h1 id="release">Making a new release</h1>

 <p>
 These are the instructions for making a new Mesa release.
 </p>

 <h3>Get latest source files</h3>
-
 <p>
 Ensure the latest code is available - both in your local master and the
 relevant branch.
 </p>

-<h3 id="basictesting">Perform basic testing</h3>
-
+<h3>Perform basic testing</h3>
 <p>
 Most of the testing should already be done during the
 <a href="#pickntest">cherry-pick</a> and
 <a href="#prerelease">pre-announce</a> stages.
-So we do a quick 'touch test'
-</p>

+So we do a quick 'touch test'
 <ul>
-<li>meson dist
+<li>make distcheck (you can omit this if you're not using --dist below)
 <li>scons (from release tarball)
 <li>the produced binaries work
 </ul>

 <p>
-  Here is one solution:
+Here is one solution that I've been using.
 </p>

 <pre>
-    __glxgears_cmd='glxgears 2&gt;&amp;1 | grep -v "configuration file"'
-    __es2info_cmd='es2_info 2&gt;&amp;1 | egrep "GL_VERSION|GL_RENDERER|.*dri\.so"'
-    __es2gears_cmd='es2gears_x11 2&gt;&amp;1 | grep -v "configuration file"'
-    test "x$LD_LIBRARY_PATH" != 'x' &amp;&amp; __old_ld="$LD_LIBRARY_PATH"
-    export LD_LIBRARY_PATH=`pwd`/test/usr/local/lib/:"${__old_ld}"
-    export LIBGL_DRIVERS_PATH=`pwd`/test/usr/local/lib/dri/
-    export LIBGL_DEBUG=verbose
-    eval $__glxinfo_cmd
-    eval $__glxgears_cmd
-    eval $__es2info_cmd
-    eval $__es2gears_cmd
-    export LIBGL_ALWAYS_SOFTWARE=true
-    eval $__glxinfo_cmd
-    eval $__glxgears_cmd
-    eval $__es2info_cmd
-    eval $__es2gears_cmd
-    export LIBGL_ALWAYS_SOFTWARE=true
-    export GALLIUM_DRIVER=softpipe
-    eval $__glxinfo_cmd
-    eval $__glxgears_cmd
-    eval $__es2info_cmd
-    eval $__es2gears_cmd
-    # Smoke test DOTA2
-    unset LD_LIBRARY_PATH
-    test "x$__old_ld" != 'x' &amp;&amp; export LD_LIBRARY_PATH="$__old_ld" &amp;&amp; unset __old_ld
-    unset LIBGL_DRIVERS_PATH
-    unset LIBGL_DEBUG
-    unset LIBGL_ALWAYS_SOFTWARE
-    unset GALLIUM_DRIVER
-    export VK_ICD_FILENAMES=`pwd`/test/usr/local/share/vulkan/icd.d/intel_icd.x86_64.json
-    steam steam://rungameid/570  -vconsole -vulkan
-    unset VK_ICD_FILENAMES
+	git clean -fXd; git clean -nxd
+	read # quick cross check any outstanding files
+	export __version=`cat VERSION`
+	export __mesa_root=../
+	export __build_root=./foo
+	chmod 755 -fR $__build_root; rm -rf $__build_root
+	mkdir -p $__build_root &amp;&amp; cd $__build_root
+
+	$__mesa_root/autogen.sh &amp;&amp; make -j2 distcheck
+
+	# Build check the tarballs (scons, linux)
+	tar -xaf mesa-$__version.tar.xz &amp;&amp; cd mesa-$__version
+	scons
+	cd .. &amp;&amp; rm -rf mesa-$__version
+
+	# Build check the tarballs (scons, windows/mingw)
+	tar -xaf mesa-$__version.tar.xz &amp;&amp; cd mesa-$__version
+	scons platform=windows toolchain=crossmingw
+	cd .. &amp;&amp; rm -rf mesa-$__version
+
+	# Test the automake binaries
+	tar -xaf mesa-$__version.tar.xz &amp;&amp; cd mesa-$__version
+	./configure \
+		--with-dri-drivers=i965,swrast \
+		--with-gallium-drivers=swrast \
+		--with-vulkan-drivers=intel \
+		--enable-llvm-shared-libs \
+		--enable-llvm \
+		--enable-glx-tls \
+		--enable-gbm \
+		--enable-egl \
+		--with-platforms=x11,drm,wayland,surfaceless
+	make -j2 &amp;&amp; DESTDIR=`pwd`/test make -j6 install
+	__glxinfo_cmd='glxinfo 2>&amp;1 | egrep -o "Mesa.*|Gallium.*|.*dri\.so"'
+	__glxgears_cmd='glxgears 2>&amp;1 | grep -v "configuration file"'
+	__es2info_cmd='es2_info 2>&amp;1 | egrep "GL_VERSION|GL_RENDERER|.*dri\.so"'
+	__es2gears_cmd='es2gears_x11 2>&amp;1 | grep -v "configuration file"'
+	export LD_LIBRARY_PATH=`pwd`/test/usr/local/lib/
+	export LIBGL_DRIVERS_PATH=`pwd`/test/usr/local/lib/dri/
+	export LIBGL_DEBUG=verbose
+	eval $__glxinfo_cmd
+	eval $__glxgears_cmd
+	eval $__es2info_cmd
+	eval $__es2gears_cmd
+	export LIBGL_ALWAYS_SOFTWARE=1
+	eval $__glxinfo_cmd
+	eval $__glxgears_cmd
+	eval $__es2info_cmd
+	eval $__es2gears_cmd
+	export LIBGL_ALWAYS_SOFTWARE=1
+	export GALLIUM_DRIVER=softpipe
+	eval $__glxinfo_cmd
+	eval $__glxgears_cmd
+	eval $__es2info_cmd
+	eval $__es2gears_cmd
+	# Smoke test DOTA2
+	unset LD_LIBRARY_PATH
+	unset LIBGL_DRIVERS_PATH
+	unset LIBGL_DEBUG
+	unset LIBGL_ALWAYS_SOFTWARE
+	export VK_ICD_FILENAMES=`pwd`/src/intel/vulkan/dev_icd.json
+	steam steam://rungameid/570  -vconsole -vulkan
 </pre>

 <h3>Update version in file VERSION</h3>
@@ -534,7 +452,6 @@ be empty (TBD) at this point.

 <p>
 Two scripts are available to help generate portions of the release notes:
-</p>

 <pre>
 	./bin/bugzilla_mesa.sh
@@ -551,7 +468,6 @@ to be included in the release notes.
 <p>
 Commit these changes and push the branch.
 </p>
-
 <pre>
 	git push origin HEAD
 </pre>
@@ -562,10 +478,7 @@ Commit these changes and push the branch.
 <p>
 Start the release process.
 </p>
-
 <pre>
-	# For the dist/distcheck, you may want to specify which LLVM to use:
-	# export LLVM_CONFIG=/usr/lib/llvm-3.9/bin/llvm-config
 	../relative/path/to/release.sh . # append --dist if you've already done distcheck above
 </pre>

@@ -592,44 +505,37 @@ Something like the following steps will do the trick:
 </pre>

 <p>
-Also, edit docs/relnotes.html to add a link to the new release notes,
-edit docs/index.html to add a news entry and a note in case of the
-last release in a series, and remove the version from
-docs/release-calendar.html. Then commit and push:
+Also, edit docs/relnotes.html to add a link to the new release notes, and edit
+docs/index.html to add a news entry. Then commit and push:
 </p>

 <pre>
-	git commit -as -m "docs: update calendar, add news item and link release notes for X.Y.Z"
+	git commit -as -m "docs: add news item and link release notes for X.Y.Z"
 	git push origin master X.Y
 </pre>


-<h2 id="announce">Announce the release</h2>
-
+<h1 id="announce">Announce the release</h1>
 <p>
 Use the generated template during the releasing process.
 </p>

-<p>
-Again, pay attention to add a note to warn about a final release in a
-series, if that is the case.
-</p>

-
-<h2 id="website">Update the mesa3d.org website</h2>
+<h1 id="website">Update the mesa3d.org website</h1>

 <p>
 As the hosting was moved to freedesktop, git hooks are deployed to update the
 website. Manually check that it is updated 5-10 minutes after the final <code>git push</code>
 </p>

-
-<h2 id="bugzilla">Update Bugzilla</h2>
+<h1 id="bugzilla">Update Bugzilla</h1>

 <p>
 Parse through the bugreports as listed in the docs/relnotes/X.Y.Z.html
-document. If there's outstanding action, close the bug referencing the commit
-ID which addresses the bug and mention the Mesa version that has the fix.
+document.
+<br>
+If there's outstanding action, close the bug referencing the commit ID which
+addresses the bug and mention the Mesa version that has the fix.
 </p>

 <p>
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="contents.html"></iframe>
@@ -21,86 +21,6 @@ The release notes summarize what's new or changed in each Mesa release.
 </p>

 <ul>
-<li><a href="relnotes/19.1.4.html">19.1.4 release notes</a>
-<li><a href="relnotes/19.1.3.html">19.1.3 release notes</a>
-<li><a href="relnotes/19.1.2.html">19.1.2 release notes</a>
-<li><a href="relnotes/19.0.8.html">19.0.8 release notes</a>
-<li><a href="relnotes/19.1.1.html">19.1.1 release notes</a>
-<li><a href="relnotes/19.0.7.html">19.0.7 release notes</a>
-<li><a href="relnotes/19.1.0.html">19.1.0 release notes</a>
-<li><a href="relnotes/19.0.6.html">19.0.6 release notes</a>
-<li><a href="relnotes/19.0.5.html">19.0.5 release notes</a>
-<li><a href="relnotes/19.0.4.html">19.0.4 release notes</a>
-<li><a href="relnotes/19.0.3.html">19.0.3 release notes</a>
-<li><a href="relnotes/19.0.2.html">19.0.2 release notes</a>
-<li><a href="relnotes/18.3.6.html">18.3.6 release notes</a>
-<li><a href="relnotes/19.0.1.html">19.0.1 release notes</a>
-<li><a href="relnotes/18.3.5.html">18.3.5 release notes</a>
-<li><a href="relnotes/19.0.0.html">19.0.0 release notes</a>
-<li><a href="relnotes/18.3.4.html">18.3.4 release notes</a>
-<li><a href="relnotes/18.3.3.html">18.3.3 release notes</a>
-<li><a href="relnotes/18.3.2.html">18.3.2 release notes</a>
-<li><a href="relnotes/18.2.8.html">18.2.8 release notes</a>
-<li><a href="relnotes/18.2.7.html">18.2.7 release notes</a>
-<li><a href="relnotes/18.3.1.html">18.3.1 release notes</a>
-<li><a href="relnotes/18.3.0.html">18.3.0 release notes</a>
-<li><a href="relnotes/18.2.6.html">18.2.6 release notes</a>
-<li><a href="relnotes/18.2.5.html">18.2.5 release notes</a>
-<li><a href="relnotes/18.2.4.html">18.2.4 release notes</a>
-<li><a href="relnotes/18.2.3.html">18.2.3 release notes</a>
-<li><a href="relnotes/18.2.2.html">18.2.2 release notes</a>
-<li><a href="relnotes/18.1.9.html">18.1.9 release notes</a>
-<li><a href="relnotes/18.2.1.html">18.2.1 release notes</a>
-<li><a href="relnotes/18.2.0.html">18.2.0 release notes</a>
-<li><a href="relnotes/18.1.8.html">18.1.8 release notes</a>
-<li><a href="relnotes/18.1.7.html">18.1.7 release notes</a>
-<li><a href="relnotes/18.1.6.html">18.1.6 release notes</a>
-<li><a href="relnotes/18.1.5.html">18.1.5 release notes</a>
-<li><a href="relnotes/18.1.4.html">18.1.4 release notes</a>
-<li><a href="relnotes/18.1.3.html">18.1.3 release notes</a>
-<li><a href="relnotes/18.1.2.html">18.1.2 release notes</a>
-<li><a href="relnotes/18.0.5.html">18.0.5 release notes</a>
-<li><a href="relnotes/18.1.1.html">18.1.1 release notes</a>
-<li><a href="relnotes/18.1.0.html">18.1.0 release notes</a>
-<li><a href="relnotes/18.0.4.html">18.0.4 release notes</a>
-<li><a href="relnotes/18.0.3.html">18.0.3 release notes</a>
-<li><a href="relnotes/18.0.2.html">18.0.2 release notes</a>
-<li><a href="relnotes/18.0.1.html">18.0.1 release notes</a>
-<li><a href="relnotes/17.3.9.html">17.3.9 release notes</a>
-<li><a href="relnotes/17.3.8.html">17.3.8 release notes</a>
-<li><a href="relnotes/18.0.0.html">18.0.0 release notes</a>
-<li><a href="relnotes/17.3.7.html">17.3.7 release notes</a>
-<li><a href="relnotes/17.3.6.html">17.3.6 release notes</a>
-<li><a href="relnotes/17.3.5.html">17.3.5 release notes</a>
-<li><a href="relnotes/17.3.4.html">17.3.4 release notes</a>
-<li><a href="relnotes/17.3.3.html">17.3.3 release notes</a>
-<li><a href="relnotes/17.3.2.html">17.3.2 release notes</a>
-<li><a href="relnotes/17.2.8.html">17.2.8 release notes</a>
-<li><a href="relnotes/17.3.1.html">17.3.1 release notes</a>
-<li><a href="relnotes/17.2.7.html">17.2.7 release notes</a>
-<li><a href="relnotes/17.3.0.html">17.3.0 release notes</a>
-<li><a href="relnotes/17.2.6.html">17.2.6 release notes</a>
-<li><a href="relnotes/17.2.5.html">17.2.5 release notes</a>
-<li><a href="relnotes/17.2.4.html">17.2.4 release notes</a>
-<li><a href="relnotes/17.2.3.html">17.2.3 release notes</a>
-<li><a href="relnotes/17.2.2.html">17.2.2 release notes</a>
-<li><a href="relnotes/17.1.10.html">17.1.10 release notes</a>
-<li><a href="relnotes/17.2.1.html">17.2.1 release notes</a>
-<li><a href="relnotes/17.1.9.html">17.1.9 release notes</a>
-<li><a href="relnotes/17.2.0.html">17.2.0 release notes</a>
-<li><a href="relnotes/17.1.8.html">17.1.8 release notes</a>
-<li><a href="relnotes/17.1.7.html">17.1.7 release notes</a>
-<li><a href="relnotes/17.1.6.html">17.1.6 release notes</a>
-<li><a href="relnotes/17.1.5.html">17.1.5 release notes</a>
-<li><a href="relnotes/17.1.4.html">17.1.4 release notes</a>
-<li><a href="relnotes/17.1.3.html">17.1.3 release notes</a>
-<li><a href="relnotes/17.1.2.html">17.1.2 release notes</a>
-<li><a href="relnotes/17.0.7.html">17.0.7 release notes</a>
-<li><a href="relnotes/17.1.1.html">17.1.1 release notes</a>
-<li><a href="relnotes/17.0.6.html">17.0.6 release notes</a>
-<li><a href="relnotes/17.1.0.html">17.1.0 release notes</a>
-<li><a href="relnotes/17.0.5.html">17.0.5 release notes</a>
-<li><a href="relnotes/17.0.4.html">17.0.4 release notes</a>
 <li><a href="relnotes/17.0.3.html">17.0.3 release notes</a>
 <li><a href="relnotes/17.0.2.html">17.0.2 release notes</a>
 <li><a href="relnotes/13.0.6.html">13.0.6 release notes</a>
--- a/docs/relnotes/10.0.1.html
+++ b/docs/relnotes/10.0.1.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="../contents.html"></iframe>
--- a/docs/relnotes/10.0.2.html
+++ b/docs/relnotes/10.0.2.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="../contents.html"></iframe>
--- a/docs/relnotes/10.0.3.html
+++ b/docs/relnotes/10.0.3.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="../contents.html"></iframe>
--- a/docs/relnotes/10.0.4.html
+++ b/docs/relnotes/10.0.4.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="../contents.html"></iframe>
--- a/docs/relnotes/10.0.5.html
+++ b/docs/relnotes/10.0.5.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="../contents.html"></iframe>
--- a/docs/relnotes/10.0.html
+++ b/docs/relnotes/10.0.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="../contents.html"></iframe>
--- a/docs/relnotes/10.1.1.html
+++ b/docs/relnotes/10.1.1.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="../contents.html"></iframe>
--- a/docs/relnotes/10.1.2.html
+++ b/docs/relnotes/10.1.2.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="../contents.html"></iframe>
--- a/docs/relnotes/10.1.3.html
+++ b/docs/relnotes/10.1.3.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="../contents.html"></iframe>
--- a/docs/relnotes/10.1.4.html
+++ b/docs/relnotes/10.1.4.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="../contents.html"></iframe>
--- a/docs/relnotes/10.1.5.html
+++ b/docs/relnotes/10.1.5.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="../contents.html"></iframe>
--- a/docs/relnotes/10.1.6.html
+++ b/docs/relnotes/10.1.6.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="../contents.html"></iframe>
--- a/docs/relnotes/10.1.html
+++ b/docs/relnotes/10.1.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="../contents.html"></iframe>
--- a/docs/relnotes/10.2.1.html
+++ b/docs/relnotes/10.2.1.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="../contents.html"></iframe>
--- a/docs/relnotes/10.2.2.html
+++ b/docs/relnotes/10.2.2.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="../contents.html"></iframe>
--- a/docs/relnotes/10.2.3.html
+++ b/docs/relnotes/10.2.3.html
@@ -8,7 +8,7 @@
 <body>

 <div class="header">
-  The Mesa 3D Graphics Library
+  <h1>The Mesa 3D Graphics Library</h1>
 </div>

 <iframe src="../contents.html"></iframe>
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .2.8
 .1.2