version: bump version for 18.1.2 release

configure.ac: Test for __atomic_add_fetch in atomic checks
Some platforms have 64-bit __atomic_load_n but not 64-bit __atomic_add_fetch, so test for both of them. Bug: https://bugs.gentoo.org/655616 Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Eric Engestrom <eric.engestrom@intel.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com> (cherry picked from commit baf16b2ea3)
2018-06-15 13:36:06 -07:00 · 2018-06-13 11:07:06 -07:00 · 2018-06-13 11:07:00 -07:00 · 2018-06-13 11:06:55 -07:00 · 2018-06-13 11:06:50 -07:00 · 2018-06-13 11:06:43 -07:00
2442 changed files with 105850 additions and 248925 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
--- a/.mailmap
+++ b/.mailmap
@@ -145,11 +145,6 @@ 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>

--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: c

-dist: xenial
+sudo: false
+dist: trusty

 cache:
  apt: true
@@ -8,22 +9,20 @@ cache:

 env:
  global:
-    - XORG_RELEASES=https://xorg.freedesktop.org/releases/individual
-    - XCB_RELEASES=https://xcb.freedesktop.org/dist
-    - WAYLAND_RELEASES=https://wayland.freedesktop.org/releases
+    - XORG_RELEASES=http://xorg.freedesktop.org/releases/individual
+    - XCB_RELEASES=http://xcb.freedesktop.org/dist
+    - WAYLAND_RELEASES=http://wayland.freedesktop.org/releases
    - 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.97
+    - LIBDRM_VERSION=libdrm-2.4.74
    - XCBPROTO_VERSION=xcb-proto-1.13
-    - RANDRPROTO_VERSION=randrproto-1.3.0
-    - LIBXRANDR_VERSION=libXrandr-1.3.0
    - LIBXCB_VERSION=libxcb-1.13
    - LIBXSHMFENCE_VERSION=libxshmfence-1.2
    - LIBVDPAU_VERSION=libvdpau-1.1
    - LIBVA_VERSION=libva-1.7.0
-    - LIBWAYLAND_VERSION=wayland-1.15.0
+    - LIBWAYLAND_VERSION=wayland-1.11.1
    - WAYLAND_PROTOCOLS_VERSION=wayland-protocols-1.8
    - PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig:$HOME/prefix/share/pkgconfig
    - LD_LIBRARY_PATH="$HOME/prefix/lib:$LD_LIBRARY_PATH"
@@ -34,47 +33,37 @@ matrix:
    - env:
        - LABEL="meson Vulkan"
        - BUILD=meson
-        - UNWIND="false"
-        - DRI_LOADERS="-Dglx=disabled -Dgbm=false -Degl=false -Dplatforms=x11,wayland,drm -Dosmesa=none"
-        - GALLIUM_ST="-Ddri3=true -Dgallium-vdpau=false -Dgallium-xvmc=false -Dgallium-omx=disabled -Dgallium-va=false -Dgallium-xa=false -Dgallium-nine=false -Dgallium-opencl=disabled"
-        - VULKAN_DRIVERS="intel,amd"
-        - LLVM_VERSION=7
+        - MESON_OPTIONS="-Ddri-drivers= -Dgallium-drivers="
+        - LLVM_VERSION=4.0
        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
      addons:
        apt:
          sources:
-            - sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main'
-              key_url: https://apt.llvm.org/llvm-snapshot.gpg.key
+            - llvm-toolchain-trusty-4.0
          packages:
-            - llvm-7-dev
+            # LLVM packaging is broken and misses these dependencies
+            - libedit-dev
+            # From sources above
+            - llvm-4.0-dev
            # Common
            - xz-utils
            - libexpat1-dev
-            - libx11-xcb-dev
            - libelf-dev
-            - python3.5
            - python3-pip
-            - python3-setuptools
    - env:
        - LABEL="meson loaders/classic DRI"
        - BUILD=meson
-        - UNWIND="false"
-        - DRI_LOADERS="-Dglx=dri -Dgbm=true -Degl=true -Dplatforms=x11,wayland,drm,surfaceless -Dosmesa=classic"
-        - DRI_DRIVERS="i915,i965,r100,r200,swrast,nouveau"
-        - GALLIUM_ST="-Ddri3=true -Dgallium-vdpau=false -Dgallium-xvmc=false -Dgallium-omx=disabled -Dgallium-va=false -Dgallium-xa=false -Dgallium-nine=false -Dgallium-opencl=disabled"
+        - MESON_OPTIONS="-Dvulkan-drivers= -Dgallium-drivers="
      addons:
        apt:
          packages:
            - xz-utils
            - x11proto-xf86vidmode-dev
-            - libxxf86vm-dev
            - libexpat1-dev
            - libx11-xcb-dev
            - libxdamage-dev
            - libxfixes-dev
-            - python3.5
            - python3-pip
-            - python3-setuptools
    - env:
        - LABEL="make loaders/classic DRI"
        - BUILD=make
@@ -91,200 +80,10 @@ matrix:
          packages:
            - xz-utils
            - x11proto-xf86vidmode-dev
-            - libxxf86vm-dev
            - libexpat1-dev
            - libx11-xcb-dev
            - libxdamage-dev
            - libxfixes-dev
-            - python3-pip
-            - python3-setuptools
-    - env:
-        # 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="meson Gallium Drivers SWR"
-        - BUILD=meson
-        - UNWIND="true"
-        - DRI_LOADERS="-Dglx=disabled -Degl=false -Dgbm=false"
-        - GALLIUM_ST="-Ddri3=false -Dgallium-vdpau=false -Dgallium-xvmc=false -Dgallium-omx=disabled -Dgallium-va=false -Dgallium-xa=false -Dgallium-nine=false -Dgallium-opencl=disabled"
-        - GALLIUM_DRIVERS="swr"
-        - LLVM_VERSION=6.0
-        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
-      addons:
-        apt:
-          packages:
-            - llvm-6.0-dev
-            # Common
-            - xz-utils
-            - libexpat1-dev
-            - libx11-xcb-dev
-            - libelf-dev
-            - libunwind8-dev
-            - python3.5
-            - python3-pip
-            - python3-setuptools
-    - env:
-        - LABEL="meson Gallium Drivers RadeonSI"
-        - BUILD=meson
-        - UNWIND="true"
-        - DRI_LOADERS="-Dglx=disabled -Degl=false -Dgbm=false"
-        - GALLIUM_ST="-Ddri3=false -Dgallium-vdpau=false -Dgallium-xvmc=false -Dgallium-omx=disabled -Dgallium-va=false -Dgallium-xa=false -Dgallium-nine=false -Dgallium-opencl=disabled"
-        - GALLIUM_DRIVERS="radeonsi"
-        - LLVM_VERSION=7
-        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
-      addons:
-        apt:
-          sources:
-            - sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main'
-              key_url: https://apt.llvm.org/llvm-snapshot.gpg.key
-          packages:
-            # From sources above
-            - llvm-7-dev
-            # Common
-            - xz-utils
-            - libexpat1-dev
-            - libx11-xcb-dev
-            - libelf-dev
-            - libunwind8-dev
-            - python3.5
-            - python3-pip
-            - python3-setuptools
-    - env:
-        - LABEL="meson Gallium Drivers Other"
-        - BUILD=meson
-        - UNWIND="true"
-        - DRI_LOADERS="-Dglx=disabled -Degl=false -Dgbm=false"
-        - GALLIUM_ST="-Ddri3=false -Dgallium-vdpau=false -Dgallium-xvmc=false -Dgallium-omx=disabled -Dgallium-va=false -Dgallium-xa=false -Dgallium-nine=false -Dgallium-opencl=disabled"
-        - GALLIUM_DRIVERS="i915,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv"
-        - LLVM_VERSION=5.0
-        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
-      addons:
-        apt:
-          packages:
-            # LLVM packaging is broken and misses these dependencies
-            - libedit-dev
-            - llvm-5.0-dev
-            # Common
-            - xz-utils
-            - libexpat1-dev
-            - libx11-xcb-dev
-            - libelf-dev
-            - libunwind8-dev
-            - python3.5
-            - python3-pip
-            - python3-setuptools
-    - env:
-        - LABEL="meson Gallium ST Clover LLVM-5.0"
-        - BUILD=meson
-        - UNWIND="true"
-        - DRI_LOADERS="-Dglx=disabled -Degl=false -Dgbm=false"
-        - GALLIUM_ST="-Ddri3=false -Dgallium-vdpau=false -Dgallium-xvmc=false -Dgallium-omx=disabled -Dgallium-va=false -Dgallium-xa=false -Dgallium-nine=false -Dgallium-opencl=icd"
-        - GALLIUM_DRIVERS="r600"
-        - LLVM_VERSION=5.0
-        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
-      addons:
-        apt:
-          packages:
-            - libclc-dev
-            # LLVM packaging is broken and misses these dependencies
-            - libedit-dev
-            - llvm-5.0-dev
-            - clang-5.0
-            - libclang-5.0-dev
-            # Common
-            - xz-utils
-            - libexpat1-dev
-            - libx11-xcb-dev
-            - libelf-dev
-            - libunwind8-dev
-            - python3-pip
-            - python3-setuptools
-    - env:
-        - LABEL="meson Gallium ST Clover LLVM-6.0"
-        - BUILD=meson
-        - UNWIND="true"
-        - DRI_LOADERS="-Dglx=disabled -Degl=false -Dgbm=false"
-        - GALLIUM_ST="-Ddri3=false -Dgallium-vdpau=false -Dgallium-xvmc=false -Dgallium-omx=disabled -Dgallium-va=false -Dgallium-xa=false -Dgallium-nine=false -Dgallium-opencl=icd"
-        - GALLIUM_DRIVERS="r600"
-        - LLVM_VERSION=6.0
-        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
-      addons:
-        apt:
-          packages:
-            - libclc-dev
-            - llvm-6.0-dev
-            - clang-6.0
-            - libclang-6.0-dev
-            # Common
-            - xz-utils
-            - libexpat1-dev
-            - libx11-xcb-dev
-            - libelf-dev
-            - libunwind8-dev
-            - python3.5
-            - python3-pip
-            - python3-setuptools
-    - env:
-        - LABEL="meson Gallium ST Clover LLVM-7"
-        - BUILD=meson
-        - UNWIND="true"
-        - DRI_LOADERS="-Dglx=disabled -Degl=false -Dgbm=false"
-        - GALLIUM_ST="-Ddri3=false -Dgallium-vdpau=false -Dgallium-xvmc=false -Dgallium-omx=disabled -Dgallium-va=false -Dgallium-xa=false -Dgallium-nine=false -Dgallium-opencl=icd"
-        - GALLIUM_DRIVERS="r600,radeonsi"
-        - LLVM_VERSION=7
-        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
-      addons:
-        apt:
-          sources:
-            - sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main'
-              key_url: https://apt.llvm.org/llvm-snapshot.gpg.key
-          packages:
-            - libclc-dev
-            # From sources above
-            - llvm-7-dev
-            - clang-7
-            - libclang-7-dev
-            # Common
-            - xz-utils
-            - libexpat1-dev
-            - libx11-xcb-dev
-            - libelf-dev
-            - libunwind8-dev
-            - python3.5
-            - python3-pip
-            - python3-setuptools
-    - env:
-        - LABEL="meson Gallium ST Other"
-        - BUILD=meson
-        - UNWIND="true"
-        - DRI_LOADERS="-Dglx=disabled -Degl=false -Dgbm=false"
-        - GALLIUM_ST="-Ddri3=true -Dgallium-vdpau=true -Dgallium-xvmc=true -Dgallium-omx=bellagio -Dgallium-va=true -Dgallium-xa=true -Dgallium-nine=true -Dgallium-opencl=disabled -Dosmesa=gallium"
-        # We need swrast for osmesa and nine.
-        # Nouveau supports, or builds at least against all ST.
-        - GALLIUM_DRIVERS="nouveau,swrast"
-        - LLVM_VERSION=5.0
-        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
-      addons:
-        apt:
-          packages:
-            - llvm-5.0-dev
-            # LLVM packaging is broken and misses these dependencies
-            - libedit-dev
-            # 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
-            # Common
-            - xz-utils
-            - libexpat1-dev
-            - libx11-xcb-dev
-            - libelf-dev
-            - libunwind8-dev
-            - python3.5
-            - python3-pip
-            - python3-setuptools
    - env:
        # NOTE: Building SWR is 2x (yes two) times slower than all the other
        # gallium drivers combined.
@@ -293,8 +92,10 @@ matrix:
        - BUILD=make
        - MAKEFLAGS="-j4"
        - MAKE_CHECK_COMMAND="true"
-        - LLVM_VERSION=6.0
+        - LLVM_VERSION=4.0
        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
+        - OVERRIDE_CC="gcc-4.8"
+        - OVERRIDE_CXX="g++-4.8"
        - 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-bellagio --disable-gallium-osmesa"
@@ -303,22 +104,26 @@ matrix:
        - LIBUNWIND_FLAGS="--enable-libunwind"
      addons:
        apt:
+          sources:
+            - llvm-toolchain-trusty-4.0
          packages:
-            - llvm-6.0-dev
+            # LLVM packaging is broken and misses these dependencies
+            - libedit-dev
+            # From sources above
+            - llvm-4.0-dev
            # Common
            - xz-utils
+            - x11proto-xf86vidmode-dev
            - libexpat1-dev
            - libx11-xcb-dev
            - libelf-dev
            - libunwind8-dev
-            - python3-pip
-            - python3-setuptools
    - env:
        - LABEL="make Gallium Drivers RadeonSI"
        - BUILD=make
        - MAKEFLAGS="-j4"
        - MAKE_CHECK_COMMAND="true"
-        - LLVM_VERSION=7
+        - LLVM_VERSION=4.0
        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
        - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
        - DRI_DRIVERS=""
@@ -329,19 +134,19 @@ matrix:
      addons:
        apt:
          sources:
-            - sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main'
-              key_url: https://apt.llvm.org/llvm-snapshot.gpg.key
+            - llvm-toolchain-trusty-4.0
          packages:
+            # LLVM packaging is broken and misses these dependencies
+            - libedit-dev
            # From sources above
-            - llvm-7-dev
+            - llvm-4.0-dev
            # Common
            - xz-utils
+            - x11proto-xf86vidmode-dev
            - libexpat1-dev
            - libx11-xcb-dev
            - libelf-dev
            - libunwind8-dev
-            - python3-pip
-            - python3-setuptools
    - env:
        - LABEL="make Gallium Drivers Other"
        - BUILD=make
@@ -349,33 +154,43 @@ matrix:
        - MAKE_CHECK_COMMAND="true"
        - LLVM_VERSION=3.9
        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
+        # New binutils linker is required for llvm-3.9
+        - OVERRIDE_PATH=/usr/lib/binutils-2.26/bin
        - 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-bellagio --disable-gallium-osmesa"
-        - GALLIUM_DRIVERS="i915,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv"
+        - GALLIUM_DRIVERS="i915,nouveau,pl111,r300,r600,freedreno,svga,swrast,vc4,virgl,etnaviv,imx"
        - VULKAN_DRIVERS=""
        - LIBUNWIND_FLAGS="--enable-libunwind"
      addons:
        apt:
+          sources:
+            - llvm-toolchain-trusty-3.9
          packages:
+            - binutils-2.26
            # 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
            - libunwind8-dev
-            - python3-pip
-            - python3-setuptools
    - env:
+        # NOTE: Analogous to SWR above, building Clover is quite slow.
        - LABEL="make Gallium ST Clover LLVM-3.9"
        - BUILD=make
        - MAKEFLAGS="-j4"
        - MAKE_CHECK_COMMAND="true"
        - LLVM_VERSION=3.9
        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
+        - OVERRIDE_CC=gcc-4.7
+        - OVERRIDE_CXX=g++-4.7
+        # New binutils linker is required for llvm-3.9
+        - OVERRIDE_PATH=/usr/lib/binutils-2.26/bin
        - 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-bellagio --disable-gallium-osmesa"
@@ -384,116 +199,35 @@ matrix:
        - LIBUNWIND_FLAGS="--enable-libunwind"
      addons:
        apt:
+          sources:
+            - llvm-toolchain-trusty-3.9
          packages:
+            - binutils-2.26
            - libclc-dev
            # LLVM packaging is broken and misses these dependencies
            - libedit-dev
+            - g++-4.7
+            # From sources above
            - llvm-3.9-dev
            - clang-3.9
            - libclang-3.9-dev
            # Common
            - xz-utils
+            - x11proto-xf86vidmode-dev
            - libexpat1-dev
            - libx11-xcb-dev
            - libelf-dev
            - libunwind8-dev
-            - python3-pip
-            - python3-setuptools
    - env:
+        # NOTE: Analogous to SWR above, building Clover is quite slow.
        - LABEL="make Gallium ST Clover LLVM-4.0"
        - BUILD=make
        - MAKEFLAGS="-j4"
        - MAKE_CHECK_COMMAND="true"
        - LLVM_VERSION=4.0
        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
-        - 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-bellagio --disable-gallium-osmesa"
-        - GALLIUM_DRIVERS="r600"
-        - VULKAN_DRIVERS=""
-        - LIBUNWIND_FLAGS="--enable-libunwind"
-      addons:
-        apt:
-          packages:
-            - libclc-dev
-            # LLVM packaging is broken and misses these dependencies
-            - libedit-dev
-            - llvm-4.0-dev
-            - clang-4.0
-            - libclang-4.0-dev
-            # Common
-            - xz-utils
-            - libexpat1-dev
-            - libx11-xcb-dev
-            - libelf-dev
-            - libunwind8-dev
-            - python3-pip
-            - python3-setuptools
-    - env:
-        - LABEL="make Gallium ST Clover LLVM-5.0"
-        - BUILD=make
-        - MAKEFLAGS="-j4"
-        - MAKE_CHECK_COMMAND="true"
-        - LLVM_VERSION=5.0
-        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
-        - 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-bellagio --disable-gallium-osmesa"
-        - GALLIUM_DRIVERS="r600"
-        - VULKAN_DRIVERS=""
-        - LIBUNWIND_FLAGS="--enable-libunwind"
-      addons:
-        apt:
-          packages:
-            - libclc-dev
-            # LLVM packaging is broken and misses these dependencies
-            - libedit-dev
-            - llvm-5.0-dev
-            - clang-5.0
-            - libclang-5.0-dev
-            # Common
-            - xz-utils
-            - libexpat1-dev
-            - libx11-xcb-dev
-            - libelf-dev
-            - libunwind8-dev
-            - python3-pip
-            - python3-setuptools
-    - env:
-        - LABEL="make Gallium ST Clover LLVM-6.0"
-        - BUILD=make
-        - MAKEFLAGS="-j4"
-        - MAKE_CHECK_COMMAND="true"
-        - LLVM_VERSION=6.0
-        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
-        - 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-bellagio --disable-gallium-osmesa"
-        - GALLIUM_DRIVERS="r600"
-        - VULKAN_DRIVERS=""
-        - LIBUNWIND_FLAGS="--enable-libunwind"
-      addons:
-        apt:
-          packages:
-            - libclc-dev
-            - llvm-6.0-dev
-            - clang-6.0
-            - libclang-6.0-dev
-            # Common
-            - xz-utils
-            - libexpat1-dev
-            - libx11-xcb-dev
-            - libelf-dev
-            - libunwind8-dev
-            - python3-pip
-            - python3-setuptools
-    - env:
-        - LABEL="make Gallium ST Clover LLVM-7"
-        - BUILD=make
-        - MAKEFLAGS="-j4"
-        - MAKE_CHECK_COMMAND="true"
-        - LLVM_VERSION=7
-        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
+        - OVERRIDE_CC=gcc-4.8
+        - OVERRIDE_CXX=g++-4.8
        - 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-bellagio --disable-gallium-osmesa"
@@ -503,16 +237,55 @@ matrix:
      addons:
        apt:
          sources:
-            - sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main'
-              key_url: https://apt.llvm.org/llvm-snapshot.gpg.key
+            - llvm-toolchain-trusty-4.0
          packages:
            - libclc-dev
+            # LLVM packaging is broken and misses these dependencies
+            - libedit-dev
+            - g++-4.8
            # From sources above
-            - llvm-7-dev
-            - clang-7
-            - libclang-7-dev
+            - llvm-4.0-dev
+            - clang-4.0
+            - libclang-4.0-dev
            # Common
            - xz-utils
+            - x11proto-xf86vidmode-dev
+            - libexpat1-dev
+            - libx11-xcb-dev
+            - libelf-dev
+            - libunwind8-dev
+    - env:
+        # NOTE: Analogous to SWR above, building Clover is quite slow.
+        - LABEL="make Gallium ST Clover LLVM-5.0"
+        - BUILD=make
+        - MAKEFLAGS="-j4"
+        - MAKE_CHECK_COMMAND="true"
+        - LLVM_VERSION=5.0
+        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
+        - OVERRIDE_CC=gcc-4.8
+        - OVERRIDE_CXX=g++-4.8
+        - 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-bellagio --disable-gallium-osmesa"
+        - GALLIUM_DRIVERS="r600,radeonsi"
+        - VULKAN_DRIVERS=""
+        - LIBUNWIND_FLAGS="--enable-libunwind"
+      addons:
+        apt:
+          sources:
+            - llvm-toolchain-trusty-5.0
+          packages:
+            - libclc-dev
+            # LLVM packaging is broken and misses these dependencies
+            - libedit-dev
+            - g++-4.8
+            # From sources above
+            - llvm-5.0-dev
+            - clang-5.0
+            - libclang-5.0-dev
+            # Common
+            - xz-utils
+            - x11proto-xf86vidmode-dev
            - libexpat1-dev
            - libx11-xcb-dev
            - libelf-dev
@@ -522,7 +295,7 @@ matrix:
        - BUILD=make
        - MAKEFLAGS="-j4"
        - MAKE_CHECK_COMMAND="true"
-        - LLVM_VERSION=3.5
+        - LLVM_VERSION=3.3
        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
        - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
        - DRI_DRIVERS=""
@@ -536,8 +309,8 @@ matrix:
      addons:
        apt:
          packages:
-            # We actually want to test against llvm-3.3, yet 3.5 is available
-            - llvm-3.5-dev
+            # We actually want to test against llvm-3.3
+            - llvm-3.3-dev
            # Nine requires gcc 4.6... which is the one we have right ?
            - libxvmc-dev
            # Build locally, for now.
@@ -548,18 +321,17 @@ matrix:
            - libedit-dev
            # Common
            - xz-utils
+            - x11proto-xf86vidmode-dev
            - libexpat1-dev
            - libx11-xcb-dev
            - libelf-dev
            - libunwind8-dev
-            - python3-pip
-            - python3-setuptools
    - env:
        - LABEL="make Vulkan"
        - BUILD=make
        - MAKEFLAGS="-j4"
        - MAKE_CHECK_COMMAND="make -C src/gtest check && make -C src/intel check"
-        - LLVM_VERSION=7
+        - LLVM_VERSION=4.0
        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
        - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl --with-platforms=x11,wayland"
        - DRI_DRIVERS=""
@@ -570,18 +342,18 @@ matrix:
      addons:
        apt:
          sources:
-            - sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main'
-              key_url: https://apt.llvm.org/llvm-snapshot.gpg.key
+            - llvm-toolchain-trusty-4.0
          packages:
+            # LLVM packaging is broken and misses these dependencies
+            - libedit-dev
            # From sources above
-            - llvm-7-dev
+            - llvm-4.0-dev
            # Common
            - xz-utils
+            - x11proto-xf86vidmode-dev
            - libexpat1-dev
            - libx11-xcb-dev
            - libelf-dev
-            - python3-pip
-            - python3-setuptools
    - env:
        - LABEL="scons"
        - BUILD=scons
@@ -593,6 +365,7 @@ matrix:
      addons:
        apt:
          packages:
+            - scons
            # Common
            - xz-utils
            - x11proto-xf86vidmode-dev
@@ -606,15 +379,15 @@ matrix:
        - SCONS_TARGET="llvm=1"
        # Keep it symmetrical to the make build.
        - SCONS_CHECK_COMMAND="scons llvm=1 check"
-        - LLVM_VERSION=3.5
+        - LLVM_VERSION=3.3
        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
      addons:
        apt:
          packages:
+            - scons
            # LLVM packaging is broken and misses these dependencies
            - libedit-dev
-            # We actually want to test against llvm-3.3, yet 3.5 is available
-            - llvm-3.5-dev
+            - llvm-3.3-dev
            # Common
            - xz-utils
            - x11proto-xf86vidmode-dev
@@ -626,14 +399,22 @@ matrix:
        - BUILD=scons
        - SCONSFLAGS="-j4"
        - SCONS_TARGET="swr=1"
-        - LLVM_VERSION=6.0
+        - LLVM_VERSION=4.0
        - 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-4.8"
+        - OVERRIDE_CXX="g++-4.8"
      addons:
        apt:
+          sources:
+            - llvm-toolchain-trusty-4.0
          packages:
-            - llvm-6.0-dev
+            - scons
+            # LLVM packaging is broken and misses these dependencies
+            - libedit-dev
+            # From sources above
+            - llvm-4.0-dev
            # Common
            - xz-utils
            - x11proto-xf86vidmode-dev
@@ -650,9 +431,7 @@ matrix:
    - env:
        - LABEL="macOS meson"
        - BUILD=meson
-        - UNWIND="false"
-        - DRI_LOADERS="-Dglx=dri -Dgbm=false -Degl=false -Dplatforms=x11 -Dosmesa=none"
-        - GALLIUM_ST="-Ddri3=true -Dgallium-vdpau=false -Dgallium-xvmc=false -Dgallium-omx=disabled -Dgallium-va=false -Dgallium-xa=false -Dgallium-nine=false -Dgallium-opencl=disabled"
+        - MESON_OPTIONS="-Degl=false"
      os: osx

 before_install:
@@ -679,23 +458,24 @@ before_install:
    fi

 install:
+  - pip2 install --user mako
+
  # Install a more modern meson from pip, since the version in the
-  # ubuntu repos is often quite old.
+  # ubuntu repos is often quite old. Avoid >=0.45.0 as it needs python
+  # 3.5+
  - if test "x$BUILD" = xmeson; then
-      pip3 install --user meson;
-      pip3 install --user mako;
+      pip3 install --user "meson<0.45.0";
    fi

-  # Install autotools build dependencies
-  - if test "x$BUILD" = xmake; then
-      pip2 install --user mako;
-    fi
-
-  # Install a more modern scons from pip.
-  - if test "x$BUILD" = xscons; then
-      pip2 install --user "scons>=2.4";
-      pip2 install --user mako;
-    fi
+  # 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).
@@ -726,27 +506,19 @@ install:
      tar -jxvf $LIBPCIACCESS_VERSION.tar.bz2
      (cd $LIBPCIACCESS_VERSION && ./configure --prefix=$HOME/prefix && make install)

-      wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.bz2
+      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/proto/$RANDRPROTO_VERSION.tar.bz2
-      tar -jxvf $RANDRPROTO_VERSION.tar.bz2
-      (cd $RANDRPROTO_VERSION && ./configure --prefix=$HOME/prefix && make install)
-
-      wget $XORG_RELEASES/lib/$LIBXRANDR_VERSION.tar.bz2
-      tar -jxvf $LIBXRANDR_VERSION.tar.bz2
-      (cd $LIBXRANDR_VERSION && ./configure --prefix=$HOME/prefix && 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)

-      wget https://people.freedesktop.org/~aplattner/vdpau/$LIBVDPAU_VERSION.tar.bz2
+      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 https://www.freedesktop.org/software/vaapi/releases/libva/$LIBVA_VERSION.tar.bz2
+      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)

@@ -758,7 +530,7 @@ install:
      tar -axvf $WAYLAND_PROTOCOLS_VERSION.tar.xz
      (cd $WAYLAND_PROTOCOLS_VERSION && ./configure --prefix=$HOME/prefix && make install)

-      # Meson requires ninja >= 1.6, but xenial has 1.3.x
+      # Meson requires ninja >= 1.6, but trusty has 1.3.x
      wget https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-linux.zip
      unzip ninja-linux.zip
      mv ninja $HOME/prefix/bin/
@@ -769,45 +541,24 @@ install:
           "#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
-
-      # Generate this header, including the missing SYS_memfd_create
-      # macro, which is not provided by the header in the Travis
-      # instance
-      mkdir -p sys
-      printf "%s\n" \
-           "#ifndef _SYSCALL_H" \
-           "#define _SYSCALL_H      1" \
-           "" \
-           "#include <asm/unistd.h>" \
-           "" \
-           "#ifndef _LIBC" \
-           "# include <bits/syscall.h>" \
-           "#endif" \
-           "" \
-           "#ifndef __NR_memfd_create" \
-           "# define __NR_memfd_create 319 /* Taken from <asm/unistd_64.h> */" \
-           "#endif" \
-           "" \
-           "#ifndef SYS_memfd_create" \
-           "# define SYS_memfd_create __NR_memfd_create" \
-           "#endif" \
-           "" \
-           "#endif" > sys/syscall.h
    fi

 script:
  - if test "x$BUILD" = xmake; then
+      test -n "$OVERRIDE_CC" && export CC="$OVERRIDE_CC";
+      test -n "$OVERRIDE_CXX" && export CXX="$OVERRIDE_CXX";
+      test -n "$OVERRIDE_PATH" && export PATH="$OVERRIDE_PATH:$PATH";
+
      export CFLAGS="$CFLAGS -isystem`pwd`";

-      mkdir build &&
-      cd build &&
-      ../autogen.sh
-        --enable-autotools
-        --enable-debug
+      ./autogen.sh --enable-debug
        $LIBUNWIND_FLAGS
        $DRI_LOADERS
        --with-dri-drivers=$DRI_DRIVERS
@@ -820,33 +571,33 @@ script:
    fi

  - if test "x$BUILD" = xscons; then
+      test -n "$OVERRIDE_CC" && export CC="$OVERRIDE_CC";
+      test -n "$OVERRIDE_CXX" && export CXX="$OVERRIDE_CXX";
      scons $SCONS_TARGET && eval $SCONS_CHECK_COMMAND;
    fi

  - |
    if test "x$BUILD" = xmeson; then
-      if test -n "$LLVM_CONFIG"; then
-        # 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
-        #
-        echo -e "[binaries]\nllvm-config = '`which $LLVM_CONFIG`'" > native.file

-        $LLVM_CONFIG --version
-      else
-        : > native.file
-      fi
+      # Travis CI has moved to LLVM 5.0, and meson is detecting
+      # automatically the available version in /usr/local/bin based on
+      # the PATH env variable order preference.
+      #
+      # As for 0.44.x, Meson cannot receive the path to the
+      # llvm-config binary as a configuration parameter. See
+      # https://github.com/mesonbuild/meson/issues/2887 and
+      # https://github.com/dcbaker/meson/commit/7c8b6ee3fa42f43c9ac7dcacc61a77eca3f1bcef
+      #
+      # We want to use the custom (APT) installed version. Therefore,
+      # let's make Meson find our wanted version sooner than the one
+      # at /usr/local/bin
+      #
+      # Once this is corrected, we would still need a patch similar
+      # to:
+      # https://lists.freedesktop.org/archives/mesa-dev/2017-December/180217.html
+      test -f /usr/bin/$LLVM_CONFIG && ln -s /usr/bin/$LLVM_CONFIG $HOME/prefix/bin/llvm-config

      export CFLAGS="$CFLAGS -isystem`pwd`"
-      meson _build \
-                   --native-file=native.file \
-                   -Dbuild-tests=true \
-                   -Dlibunwind=${UNWIND} \
-                   ${DRI_LOADERS} \
-                   -Ddri-drivers=${DRI_DRIVERS:-[]} \
-                   ${GALLIUM_ST} \
-                   -Dgallium-drivers=${GALLIUM_DRIVERS:-[]} \
-                   -Dvulkan-drivers=${VULKAN_DRIVERS:-[]}
-      meson configure _build
+      meson _build $MESON_OPTIONS
      ninja -C _build
-      ninja -C _build test
    fi
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -37,6 +37,7 @@ LOCAL_CFLAGS += \
 	-Wno-missing-field-initializers \
 	-Wno-initializer-overrides \
 	-Wno-mismatched-tags \
+	-DVERSION=\"$(MESA_VERSION)\" \
 	-DPACKAGE_VERSION=\"$(MESA_VERSION)\" \
 	-DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\"

@@ -51,7 +52,6 @@ LOCAL_CFLAGS += \
 	-DHAVE___BUILTIN_EXPECT \
 	-DHAVE___BUILTIN_FFS \
 	-DHAVE___BUILTIN_FFSLL \
-	-DHAVE_DLFCN_H \
 	-DHAVE_FUNC_ATTRIBUTE_FLATTEN \
 	-DHAVE_FUNC_ATTRIBUTE_UNUSED \
 	-DHAVE_FUNC_ATTRIBUTE_FORMAT \
@@ -73,10 +73,7 @@ LOCAL_CFLAGS += \
 	-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 += \
@@ -90,13 +87,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
-
 ifeq ($(strip $(MESA_ENABLE_ASM)),true)
 ifeq ($(TARGET_ARCH),x86)
 LOCAL_CFLAGS += \
--- 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
+#   gallium drivers: swrast freedreno i915g nouveau pl111 r300g r600g radeonsi vc4 virgl vmwgfx etnaviv imx
 #
 # 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.
@@ -52,14 +52,15 @@ gallium_drivers := \
 	freedreno.HAVE_GALLIUM_FREEDRENO \
 	i915g.HAVE_GALLIUM_I915 \
 	nouveau.HAVE_GALLIUM_NOUVEAU \
-	kmsro.HAVE_GALLIUM_KMSRO \
+	pl111.HAVE_GALLIUM_PL111 \
 	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
+	etnaviv.HAVE_GALLIUM_ETNAVIV \
+	imx.HAVE_GALLIUM_IMX

 ifeq ($(BOARD_GPU_DRIVERS),all)
 MESA_BUILD_CLASSIC := $(filter HAVE_%, $(subst ., , $(classic_drivers)))
--- 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
@@ -22,7 +22,6 @@
 SUBDIRS = src

 AM_DISTCHECK_CONFIGURE_FLAGS = \
-	--enable-autotools \
 	--enable-dri \
 	--enable-dri3 \
 	--enable-egl \
@@ -46,7 +45,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-libunwind \
 	--with-platforms=x11,wayland,drm,surfaceless \
 	--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast \
-	--with-gallium-drivers=i915,nouveau,r300,kmsro,r600,radeonsi,freedreno,svga,swrast,vc4,tegra,virgl,swr,etnaviv \
+	--with-gallium-drivers=i915,nouveau,r300,pl111,r600,radeonsi,freedreno,svga,swrast,vc4,tegra,virgl,swr,etnaviv,imx \
 	--with-vulkan-drivers=intel,radeon

 ACLOCAL_AMFLAGS = -I m4
@@ -78,7 +77,6 @@ noinst_HEADERS = \
 	include/drm-uapi/drm_mode.h \
 	include/drm-uapi/i915_drm.h \
 	include/drm-uapi/tegra_drm.h \
-	include/drm-uapi/v3d_drm.h \
 	include/drm-uapi/vc4_drm.h \
 	include/D3D9 \
 	include/GL/wglext.h \
--- a/README.rst
+++ b/README.rst
@@ -1,79 +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 status
------------
-
-Travis:
-
-.. image:: https://travis-ci.org/mesa3d/mesa.svg?branch=master
-    :target: https://travis-ci.org/mesa3d/mesa
-
-Appveyor:
-
-.. image:: https://img.shields.io/appveyor/ci/mesa3d/mesa.svg
-    :target: https://ci.appveyor.com/project/mesa3d/mesa
-
-Coverity:
-
-.. image:: https://scan.coverity.com/projects/139/badge.svg?flat=1
-    :target: https://scan.coverity.com/projects/mesa
-
-
-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/8
+++ b/8
@@ -72,9 +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>
@@ -118,7 +116,6 @@ 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
@@ -138,8 +135,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/7
+++ b/7
@@ -27,13 +27,6 @@ import SCons.Util

 import common

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

--- a/2
+++ b/2
@@ -1 +1 @@
-19.0.1
+18.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-msvc2015-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 2015

 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-msvc2015-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=14.0 llvm=1

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


 # It's possible to setup notification here, as described in
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -1,17 +1,16 @@
-# Both of these were already merged with different shas
-da48cba61ef6fefb799bf96e6364b70dbf4ec712
-c812c740e60c14060eb89db66039111881a0f42f
+d89f58a6b8436b59dcf3b896c0ccddabed3f78fd
+a7d0c53ab89ca86b705014925214101f5bc4187f

-# The commit these fix was reverted from 19.0, but fixed for 19.1 due
-# to the number of fixes required to make that commit work
-8d8f80af3a17354508f2ec9d6559c915d5be351d
-0c0c69729b6d72a5297122856c8fe48510e90764
-0881e90c09965818b02e359474a6f7446b41d647
-b031c643491a92a5574c7a4bd659df33f2d89bb6
+# These patches are ignored becuase Jason provided a version rebased on the 18.1
+# branch that was pulled instead
+#
+778e2881a04817e8c10c7a400bf1e37414420194
+3b54dd87f707a0fa40a1555bee64aeb06a381c27
+eeae4851494c16d2a6591550bfa6ef77d887ebe3
+a26693493570a9d0f0fba1be617e01ee7bfff4db
+0e7f3febf7e739c075a139ae641d65a0618752f3

-# These were manually rebased by Jason, thanks!
-8ab95b849e66f3221d80a67eef2ec6e3730901a8
-5c30fffeec1732c21d600c036f95f8cdb1bb5487
-
-# This doesn't actually appliy to 19.0
-29179f58c6ba8099859ea25900214dbbd3814a92
+# This has a warning that it fixes more than one commit, but isn't needed in
+# 18.1
+#
+a1220e73116bad74f39c1792a0b0cf0e4e5031db
--- a/bin/bugzilla_mesa.sh
+++ b/bin/bugzilla_mesa.sh
@@ -23,7 +23,7 @@ echo "<ul>"
 echo ""

 # extract fdo urls from commit log
-git log --pretty=medium $* | grep 'bugs.freedesktop.org/show_bug' | sed -e $trim_before | sort -n -u | sed -e $use_after |\
+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)
--- a/bin/get-fixes-pick-list.sh
+++ b/bin/get-fixes-pick-list.sh
@@ -0,0 +1,81 @@
+#!/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 --pretty=medium --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
+
+	# Place every "fixes:" tag on its own line and join with the next word
+	# on its line or a later one.
+	fixes=`git show --pretty=medium -s $sha | tr -d "\n" | sed -e 's/fixes:[[:space:]]*/\nfixes:/Ig' | grep "fixes:" | sed -e 's/\(fixes:[a-zA-Z0-9]*\).*$/\1/'`
+
+	# For each one try to extract the tag
+	fixes_count=`echo "$fixes" | wc -l`
+	warn=`(test $fixes_count -gt 1 && echo $fixes_count) || echo 0`
+	while [ $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))
+
+		# 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]{8,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 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.
+# Grep for commits with "cherry picked from commit" in the commit message.
 git log --reverse --pretty=medium --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..origin/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 --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,3 +1,5 @@
+#!/usr/bin/env python
+
 """
 Generate the contents of the git_sha1.h file.
 The output of this script goes to stdout.
@@ -26,25 +28,22 @@ def get_git_sha1():
        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)
+        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 + ')"')
+    git_sha1_h_in_path = os.path.join(os.path.dirname(sys.argv[0]),
+            '..', 'src', 'git_sha1.h.in')
+    with open(git_sha1_h_in_path , 'r') as git_sha1_h_in:
+        new_sha1 = git_sha1_h_in.read().replace('@VCS_TAG@', git_sha1)
+        if os.path.isfile(args.output):
+            with open(args.output, 'r') as git_sha1_h:
+                if git_sha1_h.read() == new_sha1:
+                    quit()
+        with open(args.output, 'w') as git_sha1_h:
+            git_sha1_h.write(new_sha1)
 else:
-    write_if_different('#define MESA_GIT_SHA1 ""')
+    open(args.output, 'w').close()
--- a/bin/install_megadrivers.py
+++ b/bin/install_megadrivers.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # encoding=utf-8
 # Copyright © 2017-2018 Intel Corporation

@@ -35,39 +36,33 @@ def main():
    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
+        to = os.path.join(os.environ.get('DESTDIR', '/'), args.libdir[1:])
    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)
    shutil.copy(args.megadriver, master)

-    for driver in args.drivers:
-        abs_driver = os.path.join(to, driver)
+    for each in args.drivers:
+        driver = os.path.join(to, each)

-        if os.path.lexists(abs_driver):
-            os.unlink(abs_driver)
-        print('installing {} to {}'.format(args.megadriver, abs_driver))
-        os.link(master, abs_driver)
+        if os.path.exists(driver):
+            os.unlink(driver)
+        print('installing {} to {}'.format(args.megadriver, driver))
+        os.link(master, driver)

        try:
            ret = os.getcwd()
            os.chdir(to)

-            name, ext = os.path.splitext(driver)
+            name, ext = os.path.splitext(each)
            while ext != '.so':
-                if os.path.lexists(name):
+                if os.path.exists(name):
                    os.unlink(name)
-                os.symlink(driver, name)
+                os.symlink(each, name)
                name, ext = os.path.splitext(name)
        finally:
            os.chdir(ret)
--- 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/common.py
+++ b/common.py
@@ -86,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,
@@ -99,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
@@ -52,19 +52,6 @@ mingw*)
    ;;
 esac

-AC_ARG_ENABLE(autotools,
-   [AS_HELP_STRING([--enable-autotools],
-                   [Enable the use of this autotools based build configuration])],
-   [enable_autotools=$enableval], [enable_autotools=no])
-
-if test "x$enable_autotools" != "xyes" ; then
-    AC_MSG_ERROR([the autotools build system has been deprecated in favour of
-    meson and will be removed eventually. For instructions on how to use meson
-    see https://www.mesa3d.org/meson.html.
-    If you still want to use the autotools build, then add --enable-autotools
-    to the configure command line.])
-fi
-
 # Support silent build rules, requires at least automake-1.11. Disable
 # by either passing --disable-silent-rules to configure or passing V=1
 # to make
@@ -87,12 +74,12 @@ AC_SUBST([OPENCL_VERSION])
 # in the first entry.
 LIBDRM_REQUIRED=2.4.75
 LIBDRM_RADEON_REQUIRED=2.4.71
-LIBDRM_AMDGPU_REQUIRED=2.4.97
+LIBDRM_AMDGPU_REQUIRED=2.4.91
 LIBDRM_INTEL_REQUIRED=2.4.75
 LIBDRM_NVVIEUX_REQUIRED=2.4.66
 LIBDRM_NOUVEAU_REQUIRED=2.4.66
+LIBDRM_FREEDRENO_REQUIRED=2.4.91
 LIBDRM_ETNAVIV_REQUIRED=2.4.89
-LIBDRM_VC4_REQUIRED=2.4.89

 dnl Versions for external dependencies
 DRI2PROTO_REQUIRED=2.8
@@ -102,7 +89,6 @@ LIBOMXIL_TIZONIA_REQUIRED=0.10.0
 LIBVA_REQUIRED=0.39.0
 VDPAU_REQUIRED=1.1
 WAYLAND_REQUIRED=1.11
-WAYLAND_EGL_BACKEND_REQUIRED=3
 WAYLAND_PROTOCOLS_REQUIRED=1.8
 XCB_REQUIRED=1.9.3
 XCBDRI2_REQUIRED=1.8
@@ -120,9 +106,9 @@ dnl LLVM versions
 LLVM_REQUIRED_GALLIUM=3.3.0
 LLVM_REQUIRED_OPENCL=3.9.0
 LLVM_REQUIRED_R600=3.9.0
-LLVM_REQUIRED_RADEONSI=7.0.0
-LLVM_REQUIRED_RADV=7.0.0
-LLVM_REQUIRED_SWR=7.0.0
+LLVM_REQUIRED_RADEONSI=4.0.0
+LLVM_REQUIRED_RADV=4.0.0
+LLVM_REQUIRED_SWR=4.0.0

 dnl Check for progs
 AC_PROG_CPP
@@ -133,12 +119,10 @@ dnl other CC/CXX flags related help
 AC_ARG_VAR([CXX11_CXXFLAGS], [Compiler flag to enable C++11 support (only needed if not
                              enabled by default and different  from -std=c++11)])
 AM_PROG_CC_C_O
-AC_PROG_GREP
 AC_PROG_NM
 AM_PROG_AS
 AX_CHECK_GNU_MAKE
-AM_PATH_PYTHON([2.7],, [AM_PATH_PYTHON([3.4],, [:])])
-
+AC_CHECK_PROGS([PYTHON2], [python2.7 python2 python])
 AC_PROG_SED
 AC_PROG_MKDIR_P

@@ -170,7 +154,7 @@ fi

 AX_CHECK_PYTHON_MAKO_MODULE($PYTHON_MAKO_REQUIRED)

-if test "$PYTHON" = ":"; then
+if test -z "$PYTHON2"; then
    if test ! -f "$srcdir/src/util/format_srgb.c"; then
        AC_MSG_ERROR([Python not found - unable to generate sources])
    fi
@@ -308,12 +292,6 @@ esac

 AM_CONDITIONAL(HAVE_ANDROID, test "x$android" = xyes)

-# Toggle Werror since at some point clang started treating unknown -W
-# flags as warnings, succeeding with the build, yet issuing an annoying
-# warning.
-save_CFLAGS="$CFLAGS"
-export CFLAGS="$CFLAGS -Werror"
-
 dnl
 dnl Check compiler flags
 dnl
@@ -321,19 +299,10 @@ AX_CHECK_COMPILE_FLAG([-Wall],                                 [CFLAGS="$CFLAGS
 AX_CHECK_COMPILE_FLAG([-Werror=implicit-function-declaration], [CFLAGS="$CFLAGS -Werror=implicit-function-declaration"])
 AX_CHECK_COMPILE_FLAG([-Werror=missing-prototypes],            [CFLAGS="$CFLAGS -Werror=missing-prototypes"])
 AX_CHECK_COMPILE_FLAG([-Wmissing-prototypes],                  [CFLAGS="$CFLAGS -Wmissing-prototypes"])
-dnl Dylan Baker: gcc and clang always accepr -Wno-*, hence check for the original warning, then set the no-* flag
-AX_CHECK_COMPILE_FLAG([-Wmissing-field-initializers],          [CFLAGS="$CFLAGS -Wno-missing-field-initializers"])
-AX_CHECK_COMPILE_FLAG([-Wformat-truncation],                   [CFLAGS="$CFLAGS -Wno-format-truncation"])
 AX_CHECK_COMPILE_FLAG([-fno-math-errno],                       [CFLAGS="$CFLAGS -fno-math-errno"])
-
 AX_CHECK_COMPILE_FLAG([-fno-trapping-math],                    [CFLAGS="$CFLAGS -fno-trapping-math"])
 AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],                   [VISIBILITY_CFLAGS="-fvisibility=hidden"])

-CFLAGS="$save_CFLAGS"
-
-# Toggle Werror since at some point clang started treating unknown -W
-# flags as warnings, succeeding with the build, yet issuing an annoying
-# warning.
 dnl
 dnl Check C++ compiler flags
 dnl
@@ -342,8 +311,6 @@ AX_CHECK_COMPILE_FLAG([-Wall],                                 [CXXFLAGS="$CXXFL
 AX_CHECK_COMPILE_FLAG([-fno-math-errno],                       [CXXFLAGS="$CXXFLAGS -fno-math-errno"])
 AX_CHECK_COMPILE_FLAG([-fno-trapping-math],                    [CXXFLAGS="$CXXFLAGS -fno-trapping-math"])
 AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],                   [VISIBILITY_CXXFLAGS="-fvisibility=hidden"])
-AX_CHECK_COMPILE_FLAG([-Wmissing-field-initializers],          [CXXFLAGS="$CXXFLAGS -Wno-missing-field-initializers"])
-AX_CHECK_COMPILE_FLAG([-Wformat-truncation],                   [CXXFLAGS="$CXXFLAGS -Wno-format-truncation"])
 AC_LANG_POP([C++])

 # Flags to help ensure that certain portions of the code -- and only those
@@ -793,6 +760,21 @@ esac

 AC_SUBST([LIB_EXT])

+dnl
+dnl potentially-infringing-but-nobody-knows-for-sure stuff
+dnl
+AC_ARG_ENABLE([texture-float],
+    [AS_HELP_STRING([--enable-texture-float],
+        [enable floating-point textures and renderbuffers @<:@default=disabled@:>@])],
+    [enable_texture_float="$enableval"],
+    [enable_texture_float=no]
+)
+if test "x$enable_texture_float" = xyes; then
+    AC_MSG_WARN([Floating-point textures enabled.])
+    AC_MSG_WARN([Please consult docs/patents.txt with your lawyer before building Mesa.])
+    DEFINES="$DEFINES -DTEXTURE_FLOAT_ENABLED"
+fi
+
 dnl
 dnl Arch/platform-specific settings
 dnl
@@ -898,7 +880,6 @@ AC_HEADER_MAJOR
 AC_CHECK_HEADER([xlocale.h], [DEFINES="$DEFINES -DHAVE_XLOCALE_H"])
 AC_CHECK_HEADER([sys/sysctl.h], [DEFINES="$DEFINES -DHAVE_SYS_SYSCTL_H"])
 AC_CHECK_HEADERS([endian.h])
-AC_CHECK_HEADER([dlfcn.h], [DEFINES="$DEFINES -DHAVE_DLFCN_H"])
 AC_CHECK_FUNC([strtof], [DEFINES="$DEFINES -DHAVE_STRTOF"])
 AC_CHECK_FUNC([mkostemp], [DEFINES="$DEFINES -DHAVE_MKOSTEMP"])
 AC_CHECK_FUNC([timespec_get], [DEFINES="$DEFINES -DHAVE_TIMESPEC_GET"])
@@ -991,22 +972,6 @@ if test "x$pthread_stubs_possible" = xyes; then
    PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs >= 0.4)
 fi

-save_LIBS="$LIBS"
-LIBS="$PTHREAD_LIBS"
-AC_MSG_CHECKING(whether pthread_setaffinity_np is supported)
-AC_LINK_IFELSE([AC_LANG_SOURCE([[
-    #define _GNU_SOURCE
-    #include <pthread.h>
-    int main() {
-       void *a = (void*) &pthread_setaffinity_np;
-       long b = (long) a;
-       return (int) b;
-    }]])],
-  [DEFINES="$DEFINES -DHAVE_PTHREAD_SETAFFINITY"];
-   AC_MSG_RESULT([yes]),
-   AC_MSG_RESULT([no]))
-LIBS="$save_LIBS"
-
 dnl Check for futex for fast inline simple_mtx_t.
 AC_CHECK_HEADER([linux/futex.h], [DEFINES="$DEFINES -DHAVE_LINUX_FUTEX_H"])

@@ -1408,7 +1373,7 @@ GALLIUM_DRIVERS_DEFAULT="r300,r600,svga,swrast"
 AC_ARG_WITH([gallium-drivers],
    [AS_HELP_STRING([--with-gallium-drivers@<:@=DIRS...@:>@],
        [comma delimited Gallium drivers list, e.g.
-        "i915,nouveau,r300,r600,radeonsi,freedreno,kmsro,svga,swrast,swr,tegra,v3d,vc4,virgl,etnaviv"
+        "i915,nouveau,r300,r600,radeonsi,freedreno,pl111,svga,swrast,swr,tegra,vc4,vc5,virgl,etnaviv,imx"
        @<:@default=r300,r600,svga,swrast@:>@])],
    [with_gallium_drivers="$withval"],
    [with_gallium_drivers="$GALLIUM_DRIVERS_DEFAULT"])
@@ -1457,7 +1422,6 @@ AM_CONDITIONAL(NEED_OPENGL_COMMON, test "x$enable_opengl" = xyes -o \
                                        "x$enable_gles1" = xyes -o \
                                        "x$enable_gles2" = xyes)
 AM_CONDITIONAL(NEED_KHRPLATFORM, test "x$enable_egl" = xyes -o \
-                                      "x$enable_opengl" = xyes -o \
                                      "x$enable_gles1" = xyes -o \
                                      "x$enable_gles2" = xyes)

@@ -1546,15 +1510,15 @@ fi
 AC_ARG_WITH([gl-lib-name],
  [AS_HELP_STRING([--with-gl-lib-name@<:@=NAME@:>@],
    [specify GL library name @<:@default=GL@:>@])],
-  [AC_MSG_ERROR([--with-gl-lib-name is no longer supported. Rename the library manually if needed.])],
-  [])
+  [GL_LIB=$withval],
+  [GL_LIB="$DEFAULT_GL_LIB_NAME"])
 AC_ARG_WITH([osmesa-lib-name],
  [AS_HELP_STRING([--with-osmesa-lib-name@<:@=NAME@:>@],
    [specify OSMesa library name @<:@default=OSMesa@:>@])],
-  [AC_MSG_ERROR([--with-osmesa-lib-name is no longer supported. Rename the library manually if needed.])],
-  [])
-GL_LIB="$DEFAULT_GL_LIB_NAME"
-OSMESA_LIB=OSMesa
+  [OSMESA_LIB=$withval],
+  [OSMESA_LIB=OSMesa])
+AS_IF([test "x$GL_LIB" = xyes], [GL_LIB="$DEFAULT_GL_LIB_NAME"])
+AS_IF([test "x$OSMESA_LIB" = xyes], [OSMESA_LIB=OSMesa])

 dnl
 dnl Mangled Mesa support
@@ -1566,9 +1530,6 @@ AC_ARG_ENABLE([mangling],
  [enable_mangling=no]
 )
 if test "x${enable_mangling}" = "xyes" ; then
-  if test "x$enable_libglvnd" = xyes; then
-    AC_MSG_ERROR([Conflicting options --enable-mangling and --enable-libglvnd.])
-  fi
  DEFINES="${DEFINES} -DUSE_MGL_NAMESPACE"
  GL_LIB="Mangled${GL_LIB}"
  OSMESA_LIB="Mangled${OSMESA_LIB}"
@@ -1576,15 +1537,6 @@ fi
 AC_SUBST([GL_LIB])
 AC_SUBST([OSMESA_LIB])

-dnl HACK when building glx + glvnd we ship gl.pc, despite that glvnd should do it
-dnl Thus we need to use GL as a DSO name.
-if test "x$enable_libglvnd" = xyes -a "x$enable_glx" != xno; then
-  GL_PKGCONF_LIB="GL"
-else
-  GL_PKGCONF_LIB="$GL_LIB"
-fi
-AC_SUBST([GL_PKGCONF_LIB])
-
 # Check for libdrm
 PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED],
                  [have_libdrm=yes], [have_libdrm=no])
@@ -1624,7 +1576,6 @@ AM_CONDITIONAL(HAVE_APPLEDRI, test "x$enable_dri" = xyes -a "x$dri_platform" = x
 AM_CONDITIONAL(HAVE_LMSENSORS, test "x$enable_lmsensors" = xyes )
 AM_CONDITIONAL(HAVE_GALLIUM_EXTRA_HUD, test "x$enable_gallium_extra_hud" = xyes )
 AM_CONDITIONAL(HAVE_WINDOWSDRI, test "x$enable_dri" = xyes -a "x$dri_platform" = xwindows )
-AM_CONDITIONAL(HAVE_XLEASE, test "x$have_xlease" = xyes )

 AC_ARG_ENABLE([shared-glapi],
    [AS_HELP_STRING([--enable-shared-glapi],
@@ -1713,8 +1664,6 @@ xxlib | xgallium-xlib)
 xdri)
    # DRI-based GLX

-    require_dri_shared_libs_and_glapi "GLX"
-
    # find the DRI deps for libGL
    dri_modules="x11 xext xdamage >= $XDAMAGE_REQUIRED xfixes x11-xcb xcb xcb-glx >= $XCBGLX_REQUIRED"

@@ -1729,8 +1678,6 @@ xdri)
            if test x"$enable_dri" = xyes; then
               dri_modules="$dri_modules xcb-dri2 >= $XCBDRI2_REQUIRED"
            fi
-
-            dri_modules="$dri_modules xxf86vm"
        fi
        if test x"$dri_platform" = xapple ; then
            DEFINES="$DEFINES -DGLX_USE_APPLEGL"
@@ -1740,6 +1687,12 @@ xdri)
        fi
    fi

+    # add xf86vidmode if available
+    PKG_CHECK_MODULES([XF86VIDMODE], [xxf86vm], HAVE_XF86VIDMODE=yes, HAVE_XF86VIDMODE=no)
+    if test "$HAVE_XF86VIDMODE" = yes ; then
+        dri_modules="$dri_modules xxf86vm"
+    fi
+
    PKG_CHECK_MODULES([DRIGL], [$dri_modules])
    GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV $dri_modules"
    X11_INCLUDES="$X11_INCLUDES $DRIGL_CFLAGS"
@@ -1751,6 +1704,10 @@ xdri)
    ;;
 esac

+# This is outside the case (above) so that it is invoked even for non-GLX
+# builds.
+AM_CONDITIONAL(HAVE_XF86VIDMODE, test "x$HAVE_XF86VIDMODE" = xyes)
+
 GLESv1_CM_LIB_DEPS="$LIBDRM_LIBS -lm $PTHREAD_LIBS $DLOPEN_LIBS"
 GLESv1_CM_PC_LIB_PRIV="-lm $PTHREAD_LIBS $DLOPEN_LIBS"
 GLESv2_LIB_DEPS="$LIBDRM_LIBS -lm $PTHREAD_LIBS $DLOPEN_LIBS"
@@ -1767,6 +1724,8 @@ AC_SUBST([GLESv1_CM_PC_LIB_PRIV])
 AC_SUBST([GLESv2_LIB_DEPS])
 AC_SUBST([GLESv2_PC_LIB_PRIV])

+AC_SUBST([HAVE_XF86VIDMODE])
+
 dnl
 dnl More GLX setup
 dnl
@@ -1849,18 +1808,11 @@ for plat in $platforms; do
        PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client >= $WAYLAND_REQUIRED])
        PKG_CHECK_MODULES([WAYLAND_SERVER], [wayland-server >= $WAYLAND_REQUIRED])
        PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED])
-        if test "x$enable_egl" = xyes; then
-          PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl-backend >= $WAYLAND_EGL_BACKEND_REQUIRED])
-        fi
        WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`

        PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
                          WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
                          WAYLAND_SCANNER='')
-        PKG_CHECK_EXISTS([wayland-scanner >= 1.15],
-                          AC_SUBST(SCANNER_ARG, 'private-code'),
-                          AC_SUBST(SCANNER_ARG, 'code'))
-
        if test "x$WAYLAND_SCANNER" = x; then
            AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
        fi
@@ -1877,7 +1829,6 @@ for plat in $platforms; do
        ;;

    drm)
-        test "x$enable_egl" = "xyes" &&
        test "x$enable_gbm" = "xno" &&
                AC_MSG_ERROR([EGL platform drm needs gbm])
        DEFINES="$DEFINES -DHAVE_DRM_PLATFORM"
@@ -1889,9 +1840,6 @@ for plat in $platforms; do

    android)
        PKG_CHECK_MODULES([ANDROID], [cutils hardware sync])
-        if test -n "$with_gallium_drivers"; then
-            PKG_CHECK_MODULES([BACKTRACE], [backtrace])
-        fi
        DEFINES="$DEFINES -DHAVE_ANDROID_PLATFORM"
        ;;

@@ -1922,50 +1870,17 @@ if test x"$enable_dri3" = xyes; then
    dri3_modifier_modules="xcb-dri3 >= $XCBDRI3_MODIFIERS_REQUIRED xcb-present >= $XCBPRESENT_MODIFIERS_REQUIRED"
    PKG_CHECK_MODULES([XCB_DRI3_MODIFIERS], [$dri3_modifier_modules], [have_dri3_modifiers=yes], [have_dri3_modifiers=no])

-    if test "x$have_dri3_modifiers" = xyes; then
+    if test "x$have_dri3_modifiers" == xyes; then
        DEFINES="$DEFINES -DHAVE_DRI3_MODIFIERS"
    fi
 fi

-
-if echo "$platforms" | grep -q 'x11' && echo "$platforms" | grep -q 'drm'; then
-    have_xlease=yes
-else
-    have_xlease=no
-fi
-
-if test x"$have_xlease" = xyes; then
-    randr_modules="x11-xcb xcb-randr"
-    PKG_CHECK_MODULES([XCB_RANDR], [$randr_modules])
-    xlib_randr_modules="xrandr"
-    PKG_CHECK_MODULES([XLIB_RANDR], [$xlib_randr_modules])
-fi
-
 AM_CONDITIONAL(HAVE_PLATFORM_X11, echo "$platforms" | grep -q 'x11')
 AM_CONDITIONAL(HAVE_PLATFORM_WAYLAND, echo "$platforms" | grep -q 'wayland')
 AM_CONDITIONAL(HAVE_PLATFORM_DRM, echo "$platforms" | grep -q 'drm')
 AM_CONDITIONAL(HAVE_PLATFORM_SURFACELESS, echo "$platforms" | grep -q 'surfaceless')
 AM_CONDITIONAL(HAVE_PLATFORM_ANDROID, echo "$platforms" | grep -q 'android')

-AC_ARG_ENABLE(xlib-lease,
-    [AS_HELP_STRING([--enable-xlib-lease]
-                    [enable VK_acquire_xlib_display using X leases])],
-    [enable_xlib_lease=$enableval], [enable_xlib_lease=auto])
-case "x$enable_xlib_lease" in
-xyes)
-    ;;
-xno)
-    ;;
-*)
-    if echo "$platforms" | grep -q 'x11' && echo "$platforms" | grep -q 'drm'; then
-        enable_xlib_lease=yes
-    else
-        enable_xlib_lease=no
-    fi
-esac
-
-AM_CONDITIONAL(HAVE_XLIB_LEASE, test "x$enable_xlib_lease" = xyes)
-
 dnl
 dnl More DRI setup
 dnl
@@ -2304,13 +2219,13 @@ else
    have_vdpau_platform=no
 fi

-if echo $platforms | egrep -q "x11|drm"; then
+if echo $platforms | grep -q "x11\|drm"; then
    have_omx_platform=yes
 else
    have_omx_platform=no
 fi

-if echo $platforms | egrep -q "x11|drm|wayland"; then
+if echo $platforms | grep -q "x11\|drm\|wayland"; then
    have_va_platform=yes
 else
    have_va_platform=no
@@ -2734,6 +2649,7 @@ if test -n "$with_gallium_drivers"; then
            ;;
        xfreedreno)
            HAVE_GALLIUM_FREEDRENO=yes
+            PKG_CHECK_MODULES([FREEDRENO], [libdrm >= $LIBDRM_FREEDRENO_REQUIRED libdrm_freedreno >= $LIBDRM_FREEDRENO_REQUIRED])
            require_libdrm "freedreno"
            ;;
        xetnaviv)
@@ -2741,6 +2657,9 @@ if test -n "$with_gallium_drivers"; then
            PKG_CHECK_MODULES([ETNAVIV], [libdrm >= $LIBDRM_ETNAVIV_REQUIRED libdrm_etnaviv >= $LIBDRM_ETNAVIV_REQUIRED])
            require_libdrm "etnaviv"
            ;;
+       ximx)
+            HAVE_GALLIUM_IMX=yes
+            ;;
        xtegra)
            HAVE_GALLIUM_TEGRA=yes
            require_libdrm "tegra"
@@ -2812,23 +2731,23 @@ if test -n "$with_gallium_drivers"; then
            ;;
        xvc4)
            HAVE_GALLIUM_VC4=yes
-            PKG_CHECK_MODULES([VC4], [libdrm >= $LIBDRM_VC4_REQUIRED])
+            require_libdrm "vc4"

            PKG_CHECK_MODULES([SIMPENROSE], [simpenrose],
                              [USE_VC4_SIMULATOR=yes;
                               DEFINES="$DEFINES -DUSE_VC4_SIMULATOR"],
                              [USE_VC4_SIMULATOR=no])
            ;;
-        xv3d)
-            HAVE_GALLIUM_V3D=yes
+        xvc5)
+            HAVE_GALLIUM_VC5=yes

-            PKG_CHECK_MODULES([V3D_SIMULATOR], [v3dv3],
-                              [USE_V3D_SIMULATOR=yes;
-                               DEFINES="$DEFINES -DUSE_V3D_SIMULATOR"],
-                              [USE_V3D_SIMULATOR=no])
+            PKG_CHECK_MODULES([VC5_SIMULATOR], [v3dv3],
+                              [USE_VC5_SIMULATOR=yes;
+                               DEFINES="$DEFINES -DUSE_VC5_SIMULATOR"],
+                              [AC_MSG_ERROR([vc5 requires the simulator])])
            ;;
-        xkmsro)
-            HAVE_GALLIUM_KMSRO=yes
+        xpl111)
+            HAVE_GALLIUM_PL111=yes
            ;;
        xvirgl)
            HAVE_GALLIUM_VIRGL=yes
@@ -2845,8 +2764,8 @@ if test -n "$with_gallium_drivers"; then
 fi

 # XXX: Keep in sync with LLVM_REQUIRED_SWR
-AM_CONDITIONAL(SWR_INVALID_LLVM_VERSION, test "x$LLVM_VERSION" != x7.0.0 -a \
-                                              "x$LLVM_VERSION" != x7.0.1)
+AM_CONDITIONAL(SWR_INVALID_LLVM_VERSION, test "x$LLVM_VERSION" != x4.0.0 -a \
+                                              "x$LLVM_VERSION" != x4.0.1)

 if test "x$enable_llvm" = "xyes" -a "$with_gallium_drivers"; then
    llvm_require_version $LLVM_REQUIRED_GALLIUM "gallium"
@@ -2861,8 +2780,12 @@ AM_CONDITIONAL(HAVE_SWR_BUILTIN, test "x$HAVE_SWR_BUILTIN" = xyes)

 dnl We need to validate some needed dependencies for renderonly drivers.

-if test "x$HAVE_GALLIUM_VC4" != xyes -a "x$HAVE_GALLIUM_KMSRO" = xyes  ; then
-    AC_MSG_ERROR([Building with kmsro requires vc4])
+if test "x$HAVE_GALLIUM_ETNAVIV" != xyes -a "x$HAVE_GALLIUM_IMX" = xyes  ; then
+    AC_MSG_ERROR([Building with imx requires etnaviv])
+fi
+
+if test "x$HAVE_GALLIUM_VC4" != xyes -a "x$HAVE_GALLIUM_PL111" = xyes  ; then
+    AC_MSG_ERROR([Building with pl111 requires vc4])
 fi

 if test "x$HAVE_GALLIUM_NOUVEAU" != xyes -a "x$HAVE_GALLIUM_TEGRA" = xyes; then
@@ -2910,7 +2833,6 @@ if test "x$enable_llvm" = xyes; then
    LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
    LLVM_CFLAGS=$LLVM_CPPFLAGS   # CPPFLAGS seem to be sufficient
    LLVM_CXXFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cxxflags"`
-    LLVM_CXXFLAGS="$CXX11_CXXFLAGS $LLVM_CXXFLAGS"

    dnl Set LLVM_LIBS - This is done after the driver configuration so
    dnl that drivers can add additional components to LLVM_COMPONENTS.
@@ -2945,11 +2867,11 @@ if test "x$enable_llvm" = xyes; then
    fi

    dnl The gallium-xlib GLX and gallium OSMesa targets directly embed the
-    dnl swr/llvmpipe driver into the final binary.  Adding LLVM_LIBS results in
+    dnl swr/llvmpipe driver into the final binary.  Adding LLVM_LIBS results in 
    dnl the LLVM library propagated in the Libs.private of the respective .pc
    dnl file which ensures complete dependency information when statically
    dnl linking.
-    if test "x$enable_glx" = xgallium-xlib; then
+    if test "x$enable_glx" == xgallium-xlib; then
        GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $LLVM_LIBS"
    fi
    if test "x$enable_gallium_osmesa" = xyes; then
@@ -2959,13 +2881,14 @@ fi

 AM_CONDITIONAL(HAVE_GALLIUM_SVGA, test "x$HAVE_GALLIUM_SVGA" = xyes)
 AM_CONDITIONAL(HAVE_GALLIUM_I915, test "x$HAVE_GALLIUM_I915" = xyes)
-AM_CONDITIONAL(HAVE_GALLIUM_KMSRO, test "x$HAVE_GALLIUM_KMSRO" = xyes)
+AM_CONDITIONAL(HAVE_GALLIUM_PL111, test "x$HAVE_GALLIUM_PL111" = xyes)
 AM_CONDITIONAL(HAVE_GALLIUM_R300, test "x$HAVE_GALLIUM_R300" = xyes)
 AM_CONDITIONAL(HAVE_GALLIUM_R600, test "x$HAVE_GALLIUM_R600" = xyes)
 AM_CONDITIONAL(HAVE_GALLIUM_RADEONSI, test "x$HAVE_GALLIUM_RADEONSI" = xyes)
 AM_CONDITIONAL(HAVE_GALLIUM_NOUVEAU, test "x$HAVE_GALLIUM_NOUVEAU" = xyes)
 AM_CONDITIONAL(HAVE_GALLIUM_FREEDRENO, test "x$HAVE_GALLIUM_FREEDRENO" = xyes)
 AM_CONDITIONAL(HAVE_GALLIUM_ETNAVIV, test "x$HAVE_GALLIUM_ETNAVIV" = xyes)
+AM_CONDITIONAL(HAVE_GALLIUM_IMX, test "x$HAVE_GALLIUM_IMX" = xyes)
 AM_CONDITIONAL(HAVE_GALLIUM_TEGRA, test "x$HAVE_GALLIUM_TEGRA" = xyes)
 AM_CONDITIONAL(HAVE_GALLIUM_SOFTPIPE, test "x$HAVE_GALLIUM_SOFTPIPE" = xyes)
 AM_CONDITIONAL(HAVE_GALLIUM_LLVMPIPE, test "x$HAVE_GALLIUM_LLVMPIPE" = xyes)
@@ -2973,8 +2896,8 @@ AM_CONDITIONAL(HAVE_GALLIUM_SWR, test "x$HAVE_GALLIUM_SWR" = xyes)
 AM_CONDITIONAL(HAVE_GALLIUM_SWRAST, test "x$HAVE_GALLIUM_SOFTPIPE" = xyes -o \
                                         "x$HAVE_GALLIUM_LLVMPIPE" = xyes -o \
                                         "x$HAVE_GALLIUM_SWR" = xyes)
-AM_CONDITIONAL(HAVE_GALLIUM_V3D, test "x$HAVE_GALLIUM_V3D" = xyes)
 AM_CONDITIONAL(HAVE_GALLIUM_VC4, test "x$HAVE_GALLIUM_VC4" = xyes)
+AM_CONDITIONAL(HAVE_GALLIUM_VC5, test "x$HAVE_GALLIUM_VC5" = xyes)
 AM_CONDITIONAL(HAVE_GALLIUM_VIRGL, test "x$HAVE_GALLIUM_VIRGL" = xyes)

 AM_CONDITIONAL(HAVE_GALLIUM_STATIC_TARGETS, test "x$enable_shared_pipe_drivers" = xno)
@@ -3002,9 +2925,8 @@ AM_CONDITIONAL(HAVE_AMD_DRIVERS, test "x$HAVE_GALLIUM_RADEONSI" = xyes -o \
                                      "x$HAVE_RADEON_VULKAN" = xyes)

 AM_CONDITIONAL(HAVE_BROADCOM_DRIVERS, test "x$HAVE_GALLIUM_VC4" = xyes -o \
-                                      "x$HAVE_GALLIUM_V3D" = xyes)
+                                      "x$HAVE_GALLIUM_VC5" = xyes)

-AM_CONDITIONAL(HAVE_FREEDRENO_DRIVERS, test "x$HAVE_GALLIUM_FREEDRENO" = xyes)
 AM_CONDITIONAL(HAVE_INTEL_DRIVERS, test "x$HAVE_INTEL_VULKAN" = xyes -o \
                                        "x$HAVE_I965_DRI" = xyes)

@@ -3014,8 +2936,8 @@ AM_CONDITIONAL(NEED_RADEON_DRM_WINSYS, test "x$HAVE_GALLIUM_R300" = xyes -o \
 AM_CONDITIONAL(NEED_WINSYS_XLIB, test "x$enable_glx" = xgallium-xlib)
 AM_CONDITIONAL(HAVE_GALLIUM_COMPUTE, test x$enable_opencl = xyes)
 AM_CONDITIONAL(HAVE_GALLIUM_LLVM, test "x$enable_llvm" = xyes)
-AM_CONDITIONAL(USE_V3D_SIMULATOR, test x$USE_V3D_SIMULATOR = xyes)
 AM_CONDITIONAL(USE_VC4_SIMULATOR, test x$USE_VC4_SIMULATOR = xyes)
+AM_CONDITIONAL(USE_VC5_SIMULATOR, test x$USE_VC5_SIMULATOR = xyes)

 AM_CONDITIONAL(HAVE_LIBDRM, test "x$have_libdrm" = xyes)
 AM_CONDITIONAL(HAVE_OSMESA, test "x$enable_osmesa" = xyes)
@@ -3051,7 +2973,7 @@ AC_SUBST([XVMC_MAJOR], 1)
 AC_SUBST([XVMC_MINOR], 0)

 AC_SUBST([XA_MAJOR], 2)
-AC_SUBST([XA_MINOR], 5)
+AC_SUBST([XA_MINOR], 3)
 AC_SUBST([XA_PATCH], 0)
 AC_SUBST([XA_VERSION], "$XA_MAJOR.$XA_MINOR.$XA_PATCH")

@@ -3097,10 +3019,11 @@ AC_CONFIG_FILES([Makefile
                 src/amd/vulkan/Makefile
                 src/broadcom/Makefile
                 src/compiler/Makefile
-                 src/freedreno/Makefile
                 src/egl/Makefile
                 src/egl/main/egl.pc
                 src/egl/wayland/wayland-drm/Makefile
+                 src/egl/wayland/wayland-egl/Makefile
+                 src/egl/wayland/wayland-egl/wayland-egl.pc
                 src/gallium/Makefile
                 src/gallium/auxiliary/Makefile
                 src/gallium/auxiliary/pipe-loader/Makefile
@@ -3108,7 +3031,7 @@ AC_CONFIG_FILES([Makefile
                 src/gallium/drivers/i915/Makefile
                 src/gallium/drivers/llvmpipe/Makefile
                 src/gallium/drivers/nouveau/Makefile
-                 src/gallium/drivers/kmsro/Makefile
+                 src/gallium/drivers/pl111/Makefile
                 src/gallium/drivers/r300/Makefile
                 src/gallium/drivers/r600/Makefile
                 src/gallium/drivers/radeonsi/Makefile
@@ -3117,8 +3040,9 @@ AC_CONFIG_FILES([Makefile
                 src/gallium/drivers/swr/Makefile
                 src/gallium/drivers/tegra/Makefile
                 src/gallium/drivers/etnaviv/Makefile
-                 src/gallium/drivers/v3d/Makefile
+                 src/gallium/drivers/imx/Makefile
                 src/gallium/drivers/vc4/Makefile
+                 src/gallium/drivers/vc5/Makefile
                 src/gallium/drivers/virgl/Makefile
                 src/gallium/state_trackers/clover/Makefile
                 src/gallium/state_trackers/dri/Makefile
@@ -3151,10 +3075,11 @@ AC_CONFIG_FILES([Makefile
                 src/gallium/tests/trivial/Makefile
                 src/gallium/tests/unit/Makefile
                 src/gallium/winsys/etnaviv/drm/Makefile
+                 src/gallium/winsys/imx/drm/Makefile
                 src/gallium/winsys/freedreno/drm/Makefile
                 src/gallium/winsys/i915/drm/Makefile
                 src/gallium/winsys/nouveau/drm/Makefile
-                 src/gallium/winsys/kmsro/drm/Makefile
+                 src/gallium/winsys/pl111/drm/Makefile
                 src/gallium/winsys/radeon/drm/Makefile
                 src/gallium/winsys/amdgpu/drm/Makefile
                 src/gallium/winsys/svga/drm/Makefile
@@ -3164,8 +3089,8 @@ AC_CONFIG_FILES([Makefile
                 src/gallium/winsys/sw/wrapper/Makefile
                 src/gallium/winsys/sw/xlib/Makefile
                 src/gallium/winsys/tegra/drm/Makefile
-                 src/gallium/winsys/v3d/drm/Makefile
                 src/gallium/winsys/vc4/drm/Makefile
+                 src/gallium/winsys/vc5/drm/Makefile
                 src/gallium/winsys/virgl/drm/Makefile
                 src/gallium/winsys/virgl/vtest/Makefile
                 src/gbm/Makefile
@@ -3199,11 +3124,8 @@ AC_CONFIG_FILES([Makefile
                 src/mesa/main/tests/Makefile
                 src/mesa/state_tracker/tests/Makefile
                 src/util/Makefile
-                 src/util/tests/fast_idiv_by_const/Makefile
                 src/util/tests/hash_table/Makefile
-                 src/util/tests/set/Makefile
                 src/util/tests/string_buffer/Makefile
-                 src/util/tests/vma/Makefile
                 src/util/xmlpool/Makefile
                 src/vulkan/Makefile])

@@ -3371,7 +3293,7 @@ if test "x$enable_llvm" = xyes; then
    echo "        LLVM_LDFLAGS:    $LLVM_LDFLAGS"
    echo ""
 fi
-echo "        PYTHON:         $PYTHON"
+echo "        PYTHON2:         $PYTHON2"

 echo ""
 echo "        Run '${MAKE-make}' to build Mesa"
--- a/docs/autoconf.html
+++ b/docs/autoconf.html
@@ -26,12 +26,6 @@
  </ul>
 </ol>

-<h2>ATTENTION:</h2>
-<p>
-    The autotools build is being replaced by the <a href="meson.html">meson</a>
-    build system. If you haven't yet now is a good time to try using meson and
-    report any issues you run into.
-</p>

 <h2 id="basic">1. Basic Usage</h2>

@@ -100,13 +94,6 @@ Currently there's only one config file provided when dri drivers are
 enabled - it's <code>drirc</code>.</p>
 </dd>

-<dt><code>--datadir=DIR</code></dt>
-<dd><p>This option specifies the directory where the data files will
-be installed. The default is <code>${prefix}/share</code>.
-Currently when dri drivers are enabled, <code>drirc.d/</code> is at
-this place.</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
--- a/docs/codingstyle.html
+++ b/docs/codingstyle.html
@@ -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
--- a/docs/download.html
+++ b/docs/download.html
@@ -102,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
@@ -168,7 +168,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
@@ -146,8 +146,8 @@ 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_shader_cache (if
-that variable is set), or else within .cache/mesa_shader_cache within the user's
+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.
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -16,7 +16,7 @@

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

 <br>
@@ -373,16 +373,18 @@ the archives) is a good way to get information.

 <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
@@ -36,7 +36,7 @@ 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 +63,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 +81,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 +90,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)
@@ -110,18 +110,18 @@ GL 3.3, GLSL 3.30 --- all DONE: i965, nv50, nvc0, r600, radeonsi, llvmpipe, soft
  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_gpu_shader5                                    DONE (i965/gen7+)
  - 'precise' qualifier                                 DONE
  - Dynamically uniform sampler array indices           DONE (softpipe)
-  - Dynamically uniform UBO array indices               DONE (freedreno)
+  - Dynamically uniform UBO array indices               DONE ()
  - Implicit signed -> unsigned conversions             DONE
  - Fused multiply-add                                  DONE ()
-  - Packing/bitfield/conversion functions               DONE (freedreno, softpipe)
-  - Enhanced textureGather                              DONE (freedreno, softpipe)
+  - Packing/bitfield/conversion functions               DONE (softpipe)
+  - Enhanced textureGather                              DONE (softpipe)
  - Geometry shader instancing                          DONE (llvmpipe, softpipe)
  - Geometry shader multiple streams                    DONE ()
  - Enhanced per-sample shading                         DONE ()
@@ -139,7 +139,7 @@ GL 4.0, GLSL 4.00 --- all DONE: i965/gen7+, nvc0, r600, radeonsi, virgl
  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)
@@ -149,7 +149,7 @@ GL 4.1, GLSL 4.10 --- all DONE: i965/gen7+, nvc0, r600, radeonsi, virgl
  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, r600, radeonsi

  GL_ARB_texture_compression_bptc                       DONE (freedreno, i965)
  GL_ARB_compressed_texture_pixel_storage               DONE (all drivers)
@@ -165,7 +165,7 @@ GL 4.2, GLSL 4.20 -- all DONE: i965/gen7+, nvc0, r600, radeonsi, virgl
  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, r600, 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)
@@ -196,7 +196,7 @@ GL 4.4, GLSL 4.40 -- all DONE: i965/gen8+, nvc0, r600, 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_enhanced_layouts                               DONE (i965, nv50, llvmpipe, softpipe)
  - compile-time constant expressions                   DONE
  - explicit byte offsets for blocks                    DONE
  - forced alignment within blocks                      DONE
@@ -205,21 +205,21 @@ GL 4.4, GLSL 4.40 -- all DONE: i965/gen8+, nvc0, r600, radeonsi
  - input/output block locations                        DONE
  GL_ARB_multi_bind                                     DONE (all drivers)
  GL_ARB_query_buffer_object                            DONE (i965/hsw+)
-  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_texture_mirror_clamp_to_edge                   DONE (i965, nv50, llvmpipe, softpipe, swr)
+  GL_ARB_texture_stencil8                               DONE (freedreno, i965/hsw+, nv50, llvmpipe, softpipe, swr)
+  GL_ARB_vertex_type_10f_11f_11f_rev                    DONE (i965, nv50, llvmpipe, softpipe, swr)

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

-  GL_ARB_ES3_1_compatibility                            DONE (i965/hsw+, r600, virgl)
+  GL_ARB_ES3_1_compatibility                            DONE (i965/hsw+, r600)
  GL_ARB_clip_control                                   DONE (freedreno, i965, nv50, r600, llvmpipe, softpipe, swr)
-  GL_ARB_conditional_render_inverted                    DONE (freedreno, i965, nv50, r600, llvmpipe, softpipe, swr, virgl)
-  GL_ARB_cull_distance                                  DONE (i965, nv50, r600, llvmpipe, softpipe, swr, virgl)
-  GL_ARB_derivative_control                             DONE (i965, nv50, r600, virgl)
+  GL_ARB_conditional_render_inverted                    DONE (freedreno, i965, nv50, r600, llvmpipe, softpipe, swr)
+  GL_ARB_cull_distance                                  DONE (i965, nv50, r600, 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, r600, virgl)
-  GL_ARB_texture_barrier                                DONE (freedreno, i965, nv50, r600, virgl)
+  GL_ARB_shader_texture_image_samples                   DONE (i965, nv50, r600)
+  GL_ARB_texture_barrier                                DONE (freedreno, i965, nv50, r600)
  GL_KHR_context_flush_control                          DONE (all - but needs GLX/EGL extension to be useful)
  GL_KHR_robustness                                     DONE (i965)
  GL_EXT_shader_integer_mix                             DONE (all drivers that support GLSL)
@@ -229,19 +229,19 @@ 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)
  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, softpipe, virgl)
+  GL_ARB_polygon_offset_clamp                           DONE (freedreno, i965, nv50, nvc0, r600, radeonsi, llvmpipe, swr)
+  GL_ARB_shader_atomic_counter_ops                      DONE (freedreno/a5xx, i965/gen7+, nvc0, r600, radeonsi, softpipe)
  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_ARB_transform_feedback_overflow_query              DONE (i965/gen6+, nvc0, radeonsi, llvmpipe, softpipe)
  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, r600, radeonsi

  GL_ARB_arrays_of_arrays                               DONE (all drivers that support GLSL 1.30)
  GL_ARB_compute_shader                                 DONE (freedreno/a5xx, i965/gen7+, softpipe)
@@ -256,11 +256,11 @@ GLES3.1, GLSL ES 3.1 -- all DONE: i965/hsw+, nvc0, r600, radeonsi, virgl
  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_texture_multisample (Multisample textures)     DONE (i965/gen7+, nv50, 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 (freedreno, i965/gen7+,)
+  GS5 Packing/bitfield/conversion functions             DONE (i965/gen6+)
  GL_EXT_shader_integer_mix                             DONE (all drivers that support GLSL)

  Additional functionality not covered above:
@@ -269,28 +269,28 @@ 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 (i965, nvc0)
+  GL_KHR_blend_equation_advanced                        DONE (i965, nvc0, radeonsi)
  GL_KHR_debug                                          DONE (all drivers)
-  GL_KHR_robustness                                     DONE (i965, nvc0)
+  GL_KHR_robustness                                     DONE (i965, nvc0, radeonsi)
  GL_KHR_texture_compression_astc_ldr                   DONE (freedreno, 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)
+  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)
-  GL_OES_sample_shading                                 DONE (i965, nvc0, r600)
-  GL_OES_sample_variables                               DONE (i965, nvc0, r600)
+  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 (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)
-  GL_OES_texture_cube_map_array                         DONE (i965/hsw+, nvc0)
+  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)

@@ -299,17 +299,17 @@ Khronos, ARB, and OES extensions that are not part of any OpenGL or OpenGL ES ve
  GL_ARB_bindless_texture                               DONE (nvc0, radeonsi)
  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_gpu_shader_int64                               DONE (i965/gen8+, nvc0, radeonsi, softpipe, llvmpipe)
  GL_ARB_parallel_shader_compile                        not started, but Chia-I Wu did some related work in 2014
-  GL_ARB_post_depth_coverage                            DONE (i965, nvc0)
+  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 (freedreno, i965, nvc0, radeonsi, r600, softpipe, swr, virgl)
+  GL_ARB_sample_locations                               not started
+  GL_ARB_seamless_cubemap_per_texture                   DONE (i965, nvc0, radeonsi, r600, softpipe, swr)
  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_clock                                   DONE (i965/gen7+, nv50, nvc0, r600, radeonsi)
+  GL_ARB_shader_stencil_export                          DONE (i965/gen9+, r600, radeonsi, softpipe, llvmpipe, swr)
  GL_ARB_shader_viewport_layer_array                    DONE (i965/gen6+, nvc0, radeonsi)
  GL_ARB_sparse_buffer                                  DONE (radeonsi/CIK+)
  GL_ARB_sparse_texture                                 not started
@@ -319,18 +319,15 @@ Khronos, ARB, and OES extensions that are not part of any OpenGL or OpenGL ES ve
  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_texture_norm16                                 DONE (i965, r600, radeonsi, nvc0)
  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_texture_compression_astc_sliced_3d             DONE (i965/gen9+)
  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_EGL_image_external_essl3                       not started
  GL_OES_required_internalformat                        DONE (all drivers)
  GL_OES_surfaceless_context                            DONE (all drivers)
  GL_OES_texture_compression_astc                       DONE (core only)
@@ -338,69 +335,12 @@ Khronos, ARB, and OES extensions that are not part of any OpenGL or OpenGL ES ve
  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_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,55 +352,39 @@ we DO NOT WANT implementations of these extensions for Mesa.

 Vulkan 1.0 -- all DONE: anv, radv

-Vulkan 1.1 -- all DONE: anv, radv
-
+Khronos extensions that are not part of any Vulkan version:
  VK_KHR_16bit_storage                                  in progress (Alejandro)
-  VK_KHR_bind_memory2                                   DONE (anv, radv)
+  VK_KHR_android_surface                                not started
  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_display                                        not started
+  VK_KHR_display_swapchain                              not started
+  VK_KHR_external_fence                                 not started
+  VK_KHR_external_fence_capabilities                    not started
+  VK_KHR_external_fence_fd                              not started
+  VK_KHR_external_fence_win32                           not started
  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)
-  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                             DONE (radv)
+  VK_KHR_external_semaphore_capabilities                DONE (radv)
+  VK_KHR_external_semaphore_fd                          DONE (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_get_memory_requirements2                       DONE (anv, radv)
+  VK_KHR_get_physical_device_properties2                DONE (anv, radv)
+  VK_KHR_get_surface_capabilities2                      DONE (anv)
  VK_KHR_incremental_present                            DONE (anv, radv)
+  VK_KHR_maintenance1                                   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_shader_draw_parameters                         DONE (anv, radv)
  VK_KHR_shared_presentable_image                       not started
+  VK_KHR_storage_buffer_storage_class                   DONE (anv, radv)
  VK_KHR_surface                                        DONE (anv, radv)
  VK_KHR_swapchain                                      DONE (anv, radv)
+  VK_KHR_variable_pointers                              DONE (anv, radv)
  VK_KHR_wayland_surface                                DONE (anv, radv)
  VK_KHR_win32_keyed_mutex                              not started
  VK_KHR_win32_surface                                  not started
--- a/docs/helpwanted.html
+++ b/docs/helpwanted.html
@@ -47,7 +47,7 @@ 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">
+  <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>
 </ul>

--- a/docs/index.html
+++ b/docs/index.html
@@ -15,173 +15,6 @@
 <div class="content">

 <h1>News</h1>
-<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.
-<br>
-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.
-<br>
-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.
-<br>
-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/docs/install.html
+++ b/docs/install.html
@@ -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>
@@ -40,10 +39,9 @@ Build system.
 </p>

 <ul>
-<li><a href="https://mesonbuild.com">meson</a> is recommended when building on *nix platforms.
-<li>Autoconf is another option when building on *nix platforms.
+<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 autoconf/automake or 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.
@@ -59,7 +57,7 @@ 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>


@@ -74,12 +72,10 @@ 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.
-When building with autotools 2.7, or 3.5 or later are 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.
 <div>
@@ -115,31 +111,11 @@ the packaging tool used by your distro.
  ... # others
 </pre>

-<h1 id="meson">2. Building with meson</h1>
+
+<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.
-</p>
-
-<p>
-The general approach is:
-</p>
-<pre>
-  meson builddir/
-  ninja -C builddir/
-  sudo ninja -C builddir/ install
-</pre>
-<p>
-Please read the <a href="meson.html">detailed meson instructions</a>
-for more information
-</p>
-
-<h1 id="autoconf">3. Building with autoconf (Linux/Unix/X11)</h1>
-
-<p>
-Although meson is recommended, another supported way to build on *nix systems
-is with autoconf.
+The primary method to build Mesa on Unix systems is with autoconf.
 </p>

 <p>
@@ -157,7 +133,7 @@ for more details.



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

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



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

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


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

 <p>
 When compilation has finished, look in the top-level <code>lib/</code>
@@ -250,7 +226,7 @@ versions of libGL and device drivers.
 </p>


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

 <p>
 Running <code>make install</code> will install package configuration files
--- a/docs/mesa.css
+++ b/docs/mesa.css
@@ -29,9 +29,6 @@ pre {
 	/*font-family: monospace;*/
 	font-size: 10pt;
 	/*color: black;*/
-	background-color: #eee;
-	margin-left: 2em;
-	padding: .5em;
 }

 iframe {
--- a/docs/meson.html
+++ b/docs/meson.html
@@ -16,20 +16,18 @@

 <h1>Compilation and Installation using Meson</h1>

-<ul>
-  <li><a href="#basic">Basic Usage</a></li>
-  <li><a href="#cross-compilation">Cross-compilation and 32-bit builds</a></li>
-</ul>
-
 <h2 id="basic">1. Basic Usage</h2>

 <p><strong>The Meson build system is generally considered stable and ready
 for production</strong></p>

-<p>The meson build is tested on Linux, macOS, Cygwin and Haiku, FreeBSD,
-DragonflyBSD, NetBSD, and should work on OpenBSD.</p>
+<p>The meson build is tested on on Linux, macOS, Cygwin and Haiku, it should
+work on FreeBSD, DragonflyBSD, NetBSD, and OpenBSD.</p>

-<p><strong>Mesa requires Meson >= 0.45.0 to build.</strong>
+<p><strong>Mesa requires Meson >= 0.42.0 to build in general.</strong>
+
+Additionaly, to build the Clover OpenCL state tracker or the OpenSWR driver
+meson 0.44.0 or greater is required.

 Some older versions of meson do not check that they are too old and will error
 out in odd ways.
@@ -38,7 +36,7 @@ out in odd ways.
 <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
+be enabled via the --backend switch, as ninja is the default backend on all
 operating systems. 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" for examples.
@@ -53,13 +51,9 @@ To see a description of your options you can run <code>meson configure</code>
 along with a build directory to view the selected options for. This will show
 your meson global arguments and project arguments, along with their defaults
 and your local settings.
-</p>

-<p>
-Meson does not currently support listing options before configure a build
+Moes does not currently support listing options before configure a build
 directory, but this feature is being discussed upstream.
-For now, the only way to see what options exist is to look at the
-<code>meson_options.txt</code> file at the root of the project.
 </p>

 <pre>
@@ -69,21 +63,13 @@ For now, the only way to see what options exist is to look at the
 <p>
 With additional arguments <code>meson configure</code> is used to change
 options on already configured build directory. All options passed to this
-command are in the form <code>-D "command"="value"</code>.
+command are in the form -D "command"="value".
 </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. With ninja, the -C option can be
@@ -99,101 +85,48 @@ Without arguments, it 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, you should run <code>ninja clean</code> before
 changing the configuration, or create a new out of tree build directory for
-each configuration you want to build
-<a href="http://mesonbuild.com/Using-multiple-build-directories.html">as
-recommended in the documentation</a>
+each configuration you want to build.
+
+http://mesonbuild.com/Using-multiple-build-directories.html
 </p>

-<p>
-Autotools automatically updates translation files as part of the build process,
-meson does not do this. Instead if you want translated drirc files you will need 
-to invoke non-default targets for ninja to update them:
-<code>ninja -C build/ xmlpool-pot xmlpool-update-po xmlpool-gmo</code>
-</p>
-
-<dl>
 <dt><code>Environment Variables</code></dt>
-<dd><p>Meson supports the standard CC and CXX environment variables for
-changing the default compiler. Meson does support CFLAGS, CXXFLAGS, etc. But
-their use is discouraged because of the many caveats in using them. Instead it
-is recomended to use <code>-D${lang}_args</code> and
-<code>-D${lang}_link_args</code> instead. Among the benefits of these options
-is that they are guaranteed to persist across rebuilds and reconfigurations.
+<dd><p>Meson supports the standard CC and CXX envrionment variables for
+changing the default compiler, and CFLAGS, CXXFLAGS, and LDFLAGS for setting
+options to the compiler and linker.

-Meson does not allow changing compiler in a configured builddir, you will need
-to create a new build dir for a different compiler.
+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>.
+
+These arguments are consumed and stored by meson when it is initialized or
+re-initialized. Therefore passing them to meson configure will not do anything,
+and passing them to ninja will only do something if ninja decides to
+re-initialze meson, for example, if a meson.build file has been changed.
+Changing these variables will not cause all targets to be rebuilt, so running
+ninja clean is recomended when changing CFLAGS or CXXFLAGS. meson will never
+change compiler in a configured build directory.
 </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
+    touch meson.build
+    CFLAGS=-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>
-
-<p>Meson also honors <code>DESTDIR</code> for installs</p>
+<p>Meson also honors DESTDIR for installs</p>
 </dd>


+<dl>
 <dt><code>LLVM</code></dt>
-<dd><p>Meson includes upstream logic to wrap llvm-config using its standard
-dependency interface.
+<dd><p>Meson includes upstream logic to wrap llvm-config using it's standard
+dependncy interface. It will search $PATH (or %PATH% on windows) for
+llvm-config, so using an LLVM from a non-standard path is as easy as
+<code>PATH=/path/with/llvm-config:$PATH meson build</code>.
 </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:
-
-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>
-</p></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:
-
-cross-llvm.ini
-<pre>
-    [binaries]
-    ...
-    llvm-config = '/usr/lib/llvm-config-32'
-</pre>
-
-Then configure meson:
-
-<pre>
-    meson builddir/ --cross-file cross-llvm.ini
-</pre>
-
-See the <a href="#cross-compilation">Cross Compilation</a> section for more information.
-</dd></p>
-
-<dd><p>
-For older versions of meson <code>$PATH</code> (or <code>%PATH%</code> on
-windows) will be searched for llvm-config (and llvm-config$version and
-llvm-config-$version), you can override this environment variable to control
-the search: <code>PATH=/path/with/llvm-config:$PATH meson build</code>.
-</dd></p>
 </dl>

 <dl>
@@ -213,7 +146,7 @@ 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>

 <p>For those coming from autotools be aware of the following:</p>

@@ -222,13 +155,13 @@ configure</code>. Mesa defined options are always passed as -Doption=foo.
 <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>Note that in meson this defaults to "debugoptimized", and  not setting it to
+"release" will yield non-optimal performance and binary size. Not using "debug"
+may interfer with debbugging 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>
+<p> For those wishing to pass their own optimization flags, use the "plain"
 buildtype, which causes meson to inject no additional compiler arguments, only
 those in the C/CXXFLAGS and those that mesa itself defines.</p>
 </dd>
@@ -236,101 +169,10 @@ those in the C/CXXFLAGS and those that mesa itself defines.</p>

 <dl>
 <dt><code>-Db_ndebug</code></dt>
-<dd><p>This option controls assertions in meson projects. When set to <code>false</code>
+<dd><p>This option controls assertions in meson projects. When set to false
 (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">2. 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:
-<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>
-
-<p>
-32-bit build on x86 linux:
-<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>
-
-<p>
-64-bit build on ARM linux:
-<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>
-
-<p>
-64-bit build on x86 windows:
-<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>
-</p>
-
-</div>
-</body>
-</html>
--- 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://patents.google.com/patent/US6650327B1
+[2] https://www.opengl.org/registry/specs/ARB/texture_float.txt
--- a/docs/precompiled.html
+++ b/docs/precompiled.html
@@ -24,12 +24,10 @@ Some Linux distributions closely follow the latest Mesa releases. On others one
 has to use unofficial channels.
 <br>
 There are some general directions:
-<ul>
 <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>
--- a/docs/release-calendar.html
+++ b/docs/release-calendar.html
@@ -23,16 +23,6 @@ Mesa provides feature/development and stable releases.
 The table below lists the date and release manager that is expected to do the
 specific release.
 <br>
-Regular updates will ensure that the schedule for the current and the
-next two feature releases are shown in the table.
-<br>
-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.
-<br>
-The way the release schedule works is
-explained <a href="releasing.html#schedule" target="_parent">here</a>.
-<br>
 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>
@@ -47,130 +37,97 @@ if you'd like to nominate a patch in the next stable release.
 <th>Release</th>
 <th>Release manager</th>
 <th>Notes</th>
+<tr>
+<td rowspan="3">18.0</td>
+<td>2018-04-20</td>
+<td>18.0.2</td>
+<td>Juan A. Suarez Romero</td>
+<td></td>
 </tr>
 <tr>
-<td rowspan="4">18.3</td>
-<td>2019-01-30</td>
-<td>18.3.3</td>
-<td>Emil Velikov</td>
-<td>
+<td>2018-05-04</td>
+<td>18.0.3</td>
+<td>Juan A. Suarez Romero</td>
+<td></td>
 </tr>
 <tr>
-<td>2019-02-13</td>
-<td>18.3.4</td>
-<td>Emil Velikov</td>
-<td>
+<td>2018-05-18</td>
+<td>18.0.4</td>
+<td>Juan A. Suarez Romero</td>
+<td>Last planned 18.0.x release</td>
 </tr>
 <tr>
-<td>2019-02-27</td>
-<td>18.3.5</td>
-<td>Emil Velikov</td>
-<td>
-</tr>
-<tr>
-<td>2019-03-13</td>
-<td>18.3.6</td>
-<td>Emil Velikov</td>
-<td>Last planned 18.3.x release</td>
-</tr>
-<tr>
-<td rowspan="4">19.0</td>
-<td>2019-01-29</td>
-<td>19.0.0-rc1</td>
+<td rowspan="8">18.1</td>
+<td>2018-04-20</td>
+<td>18.1.0rc1</td>
 <td>Dylan Baker</td>
-<td>
+<td></td>
 </tr>
 <tr>
-<td>2019-02-05</td>
-<td>19.0.0-rc2</td>
+<td>2018-04-27</td>
+<td>18.1.0rc2</td>
 <td>Dylan Baker</td>
-<td>
+<td></td>
 </tr>
 <tr>
-<td>2019-02-12</td>
-<td>19.0.0-rc3</td>
+<td>2018-05-04</td>
+<td>18.1.0rc3</td>
 <td>Dylan Baker</td>
-<td>
+<td></td>
 </tr>
 <tr>
-<td>2019-02-19</td>
-<td>19.0.0-rc4</td>
+<td>2018-05-11</td>
+<td>18.1.0rc4</td>
 <td>Dylan Baker</td>
 <td>Last planned RC/Final release</td>
 </tr>
 <tr>
-<td rowspan="4">19.1</td>
-<td>2019-04-30</td>
-<td>19.1.0-rc1</td>
-<td>Andres Gomez</td>
-<td>
-</tr>
-<tr>
-<td>2019-05-07</td>
-<td>19.1.0-rc2</td>
-<td>Andres Gomez</td>
-<td>
-</tr>
-<tr>
-<td>2019-05-14</td>
-<td>19.1.0-rc3</td>
-<td>Andres Gomez</td>
-<td>
-</tr>
-<tr>
-<td>2019-05-21</td>
-<td>19.1.0-rc4</td>
-<td>Andres Gomez</td>
-<td>Last planned RC/Final release</td>
-</tr>
-<tr>
-<td rowspan="4">19.2</td>
-<td>2019-08-06</td>
-<td>19.2.0-rc1</td>
+<td>TBD</td>
+<td>18.1.1</td>
 <td>Emil Velikov</td>
-<td>
+<td></td>
 </tr>
 <tr>
-<td>2019-08-13</td>
-<td>19.2.0-rc2</td>
+<td>TBD</td>
+<td>18.1.2</td>
 <td>Emil Velikov</td>
-<td>
+<td></td>
 </tr>
 <tr>
-<td>2019-08-20</td>
-<td>19.2.0-rc3</td>
+<td>TBD</td>
+<td>18.1.3</td>
 <td>Emil Velikov</td>
-<td>
+<td></td>
 </tr>
 <tr>
-<td>2019-08-27</td>
-<td>19.2.0-rc4</td>
+<td>TBD</td>
+<td>18.1.4</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>Juan A. Suarez</td>
-<td>
+<td rowspan="4">18.2</td>
+<td>2018-07-20</td>
+<td>18.2.0rc1</td>
+<td>Andres Gomez</td>
+<td></td>
 </tr>
 <tr>
-<td>2019-10-22</td>
-<td>19.3.0-rc2</td>
-<td>Juan A. Suarez</td>
-<td>
+<td>2018-07-27</td>
+<td>18.2.0rc2</td>
+<td>Andres Gomez</td>
+<td></td>
 </tr>
 <tr>
-<td>2019-10-29</td>
-<td>19.3.0-rc3</td>
-<td>Juan A. Suarez</td>
-<td>
+<td>2018-08-03</td>
+<td>18.2.0rc3</td>
+<td>Andres Gomez</td>
+<td></td>
 </tr>
 <tr>
-<td>2019-11-05</td>
-<td>19.3.0-rc4</td>
-<td>Juan A. Suarez</td>
+<td>2018-08-10</td>
+<td>18.2.0rc4</td>
+<td>Andres Gomez</td>
 <td>Last planned RC/Final release</td>
 </tr>
 </table>
--- a/docs/releasing.html
+++ b/docs/releasing.html
@@ -21,7 +21,6 @@
 <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>
@@ -55,11 +54,10 @@ For example:
 <h1 id="schedule">Release schedule</h1>

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

@@ -68,9 +66,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>
@@ -88,12 +83,6 @@ Note: There is one or two releases overlap when changing branches. For example:
 <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.
-<br>
-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>


@@ -122,21 +111,18 @@ the autoconf 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>Following developers have requested permanent exception</p>
-<ul>
-<li><em>Ilia Mirkin</em>
-<li><em>AMD team</em>
-</ul>
+<p>
+Currently Ilia Mirkin and AMD devs have requested "permanent" exception.
+</p>

-<p>The following must pass:</p>
 <ul>
-<li>make distcheck, 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
@@ -144,9 +130,9 @@ 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, mingw-w64 cross
+compilation and AppVeyor plus Travis-CI, the latter as part of their
+Github integration.
 </p>

 <p>
@@ -223,25 +209,6 @@ system and making some every day's use until the release may be a good
 idea too.
 </p>

-<h1 id="stagingbranch">Staging branch</h1>
-
-<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>
-

 <h1 id="branch">Making a branchpoint</h1>

@@ -458,7 +425,7 @@ 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
@@ -525,10 +492,10 @@ Here is one solution that I've been using.
 	# Drop LLVM_CONFIG, if applicable:
 	# unset LLVM_CONFIG

-	__glxinfo_cmd='glxinfo 2&gt;&amp;1 | egrep -o "Mesa.*|Gallium.*|.*dri\.so"'
-	__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"'
+	__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"'
 	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/
--- a/docs/relnotes.html
+++ b/docs/relnotes.html
@@ -21,32 +21,7 @@ The release notes summarize what's new or changed in each Mesa release.
 </p>

 <ul>
-<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>
--- a/docs/relnotes/18.0.0.html
+++ b/docs/relnotes/18.0.0.html
@@ -48,8 +48,8 @@ Note: some of the new features are only available with certain drivers.
 <li>Disk shader cache support for i965 when MESA_GLSL_CACHE_DISABLE environment variable is set to "0" or "false"</li>
 <li>GL_ARB_shader_atomic_counters and GL_ARB_shader_atomic_counter_ops on r600/evergreen+</li>
 <li>GL_ARB_shader_image_load_store and GL_ARB_shader_image_size on r600/evergreen+</li>
-<li>GL_ARB_shader_storage_buffer_object on r600/evergreen+</li>
-<li>GL_ARB_compute_shader on r600/evergreen+</li>
+<li>GL_ARB_shader_storage_buffer_object on r600/evergreen+<li>
+<li>GL_ARB_compute_shader on r600/evergreen+<li>
 <li>GL_ARB_cull_distance on r600/evergreen+</li>
 <li>GL_ARB_enhanced_layouts on r600/evergreen+</li>
 <li>GL_ARB_bindless_texture on nvc0/kepler</li>
--- a/docs/relnotes/18.0.2.html
+++ b/docs/relnotes/18.0.2.html
@@ -1,144 +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>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 18.0.2 Release Notes / April 28, 2018</h1>
-
-<p>
-Mesa 18.0.2 is a bug fix release which fixes bugs found since the 18.0.1 release.
-</p>
-<p>
-Mesa 18.0.2 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation
-because compatibility contexts are not supported.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-SHA256: ffd8dfe3337b474a3baa085f0e7ef1a32c7cdc3bed1ad810b2633919a9324840  mesa-18.0.2.tar.gz
-SHA256: 98fa159768482dc568b9f8bf0f36c7acb823fa47428ffd650b40784f16b9e7b3  mesa-18.0.2.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-<p>None</p>
-
-
-<h2>Bug fixes</h2>
-
-<ul>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=95009">Bug 95009</a> - [SNB] amd_shader_trinary_minmax.execution.built-in-functions.gs-mid3-ivec2-ivec2-ivec2 intermittent</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=95012">Bug 95012</a> - [SNB] glsl-1_50.execution.built-in-functions.gs-op tests intermittent</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98281">Bug 98281</a> - 'message's in ctx-&gt;Debug.LogMessages[] seem to leak.</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105320">Bug 105320</a> - Storage texel buffer access produces wrong results (RX Vega)</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105775">Bug 105775</a> - SI reaches the maximum IB size in dwords and fail to submit</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105994">Bug 105994</a> - surface state leak when creating and destroying image views with aspectMask depth and stencil</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106074">Bug 106074</a> - radv: si_scissor_from_viewport returns incorrect result when using half-pixel viewport offset</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106126">Bug 106126</a> - eglMakeCurrent does not always ensure dri_drawable-&gt;update_drawable_info has been called for a new EGLSurface if another has been created and destroyed first</li>
-
-</ul>
-
-
-<h2>Changes</h2>
-
-<p>Bas Nieuwenhuizen (2):</p>
-<ul>
-  <li>ac/nir: Make the GFX9 buffer size fix apply to image loads/atomics too.</li>
-  <li>radv: Mark GTT memory as device local for APUs.</li>
-</ul>
-
-<p>Dylan Baker (2):</p>
-<ul>
-  <li>bin/install_megadrivers: fix DESTDIR and -D*-path</li>
-  <li>meson: don't build classic mesa tests without dri_drivers</li>
-</ul>
-
-<p>Ian Romanick (1):</p>
-<ul>
-  <li>intel/compiler: Add scheduler deps for instructions that implicitly read g0</li>
-</ul>
-
-<p>Jason Ekstrand (1):</p>
-<ul>
-  <li>i965/fs: Return mlen * 8 for size_read() for INTERPOLATE_AT_*</li>
-</ul>
-
-<p>Johan Klokkhammer Helsing (1):</p>
-<ul>
-  <li>st/dri: Fix dangling pointer to a destroyed dri_drawable</li>
-</ul>
-
-<p>Juan A. Suarez Romero (4):</p>
-<ul>
-  <li>docs: add sha256 checksums for 18.0.1</li>
-  <li>travis: radv needs LLVM 4.0</li>
-  <li>cherry-ignore: add explicit 18.1 only nominations</li>
-  <li>Update version to 18.0.2</li>
-</ul>
-
-<p>Kenneth Graunke (1):</p>
-<ul>
-  <li>i965: Fix shadow batches to be the same size as the real BO.</li>
-</ul>
-
-<p>Lionel Landwerlin (1):</p>
-<ul>
-  <li>anv: fix number of planes for depth &amp; stencil</li>
-</ul>
-
-<p>Lucas Stach (1):</p>
-<ul>
-  <li>etnaviv: fix texture_format_needs_swiz</li>
-</ul>
-
-<p>Marek Olšák (3):</p>
-<ul>
-  <li>radeonsi/gfx9: fix a hang with an empty first IB</li>
-  <li>glsl_to_tgsi: try harder to lower unsupported ir_binop_vector_extract</li>
-  <li>Revert "st/dri: Fix dangling pointer to a destroyed dri_drawable"</li>
-</ul>
-
-<p>Samuel Pitoiset (2):</p>
-<ul>
-  <li>radv: fix scissor computation when using half-pixel viewport offset</li>
-  <li>radv/winsys: allow to submit up to 4 IBs for chips without chaining</li>
-</ul>
-
-<p>Thomas Hellstrom (1):</p>
-<ul>
-  <li>svga: Fix incorrect advertizing of EGL_KHR_gl_colorspace</li>
-</ul>
-
-<p>Timothy Arceri (1):</p>
-<ul>
-  <li>mesa: free debug messages when destroying the debug state</li>
-</ul>
-
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/18.0.3.html
+++ b/docs/relnotes/18.0.3.html
@@ -1,107 +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>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 18.0.3 Release Notes / May 7, 2018</h1>
-
-<p>
-Mesa 18.0.3 is a bug fix release which fixes bugs found since the 18.0.2 release.
-</p>
-<p>
-Mesa 18.0.3 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation
-because compatibility contexts are not supported.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-58cc5c5b1ab2a44e6e47f18ef6c29836ad06f95450adce635ce3c317507a171b  mesa-18.0.3.tar.gz
-099d9667327a76a61741a533f95067d76ea71a656e66b91507b3c0caf1d49e30  mesa-18.0.3.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-<p>None</p>
-
-
-<h2>Bug fixes</h2>
-
-<ul>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105374">Bug 105374</a> - texture3d, a SaschaWillems demo, assert fails</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106147">Bug 106147</a> - SIGBUS in write_reloc() when Sacha Willems' &quot;texture3d&quot; Vulkan demo starts</li>
-
-</ul>
-
-
-<h2>Changes</h2>
-
-<p>Andres Rodriguez (1):</p>
-<ul>
-  <li>radv/winsys: fix leaking resources from bo's imported by fd</li>
-</ul>
-
-<p>Boyuan Zhang (1):</p>
-<ul>
-  <li>radeon/vcn: fix mpeg4 msg buffer settings</li>
-</ul>
-
-<p>Eric Anholt (1):</p>
-<ul>
-  <li>gallium/util: Fix incorrect refcounting of separate stencil.</li>
-</ul>
-
-<p>Jason Ekstrand (1):</p>
-<ul>
-  <li>anv/allocator: Don't shrink either end of the block pool</li>
-</ul>
-
-<p>Juan A. Suarez Romero (3):</p>
-<ul>
-  <li>docs: add sha256 checksums for 18.0.2</li>
-  <li>cherry-ignore: add explicit 18.1 only nominations</li>
-  <li>Update version to 18.0.3</li>
-</ul>
-
-<p>Leo Liu (1):</p>
-<ul>
-  <li>st/omx/enc: fix blit setup for YUV LoadImage</li>
-</ul>
-
-<p>Marek Olšák (2):</p>
-<ul>
-  <li>util/u_queue: fix a deadlock in util_queue_finish</li>
-  <li>radeonsi/gfx9: workaround for INTERP with indirect indexing</li>
-</ul>
-
-<p>Nanley Chery (1):</p>
-<ul>
-  <li>i965/tex_image: Avoid the ASTC LDR workaround on gen9lp</li>
-</ul>
-
-<p>Samuel Pitoiset (1):</p>
-<ul>
-  <li>radv: compute the number of subpass attachments correctly</li>
-</ul>
-
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/18.0.4.html
+++ b/docs/relnotes/18.0.4.html
@@ -1,157 +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>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 18.0.4 Release Notes / May 17, 2018</h1>
-
-<p>
-Mesa 18.0.4 is a bug fix release which fixes bugs found since the 18.0.3 release.
-</p>
-<p>
-Mesa 18.0.4 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation
-because compatibility contexts are not supported.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-d1dc3469faccdd73439479426952d71a9e8f684e8d03b6687063c12b13430801  mesa-18.0.4.tar.gz
-1f3bcfe7cef0a5c20dae2b41df5d7e0a985e06be0183fa4d43b6068fcba2920f  mesa-18.0.4.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-<p>None</p>
-
-
-<h2>Bug fixes</h2>
-
-<ul>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91808">Bug 91808</a> - trine1 misrender r600g</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=100430">Bug 100430</a> - [radv] graphical glitches on dolphin emulator</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106243">Bug 106243</a> - [kbl] GPU HANG: 9:0:0x85dffffb, in Cinnamon</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106480">Bug 106480</a> - A2B10G10R10_SNORM vertex attribute doesn't work.</li>
-
-</ul>
-
-
-<h2>Changes</h2>
-
-<p>Bas Nieuwenhuizen (3):</p>
-<ul>
-  <li>radv: Translate logic ops.</li>
-  <li>radv: Fix up 2_10_10_10 alpha sign.</li>
-  <li>radv: Disable texel buffers with A2 SNORM/SSCALED/SINT for pre-vega.</li>
-</ul>
-
-<p>Dave Airlie (3):</p>
-<ul>
-  <li>r600: fix constant buffer bounds.</li>
-  <li>radv: resolve all layers in compute resolve path.</li>
-  <li>radv: use compute path for multi-layer images.</li>
-</ul>
-
-<p>Deepak Rawat (1):</p>
-<ul>
-  <li>egl/x11: Send invalidate to driver on copy_region path in swap_buffer</li>
-</ul>
-
-<p>Ian Romanick (1):</p>
-<ul>
-  <li>mesa: Add missing support for glFogiv(GL_FOG_DISTANCE_MODE_NV)</li>
-</ul>
-
-<p>Jan Vesely (8):</p>
-<ul>
-  <li>clover: Add explicit virtual destructor to argument class</li>
-  <li>eg/compute: Drop reference on code_bo in destructor.</li>
-  <li>r600: Cleanup constant buffers on context destruction</li>
-  <li>eg/compute: Drop reference to kernel_param bo in destructor</li>
-  <li>pipe-loader: Free driver_name in error path</li>
-  <li>gallium/auxiliary: Add helper function to count the number of entries in hash table</li>
-  <li>winsys/radeon: Destroy fd_hash table when the last winsys is removed.</li>
-  <li>winsys/amdgpu: Destroy dev_hash table when the last winsys is removed.</li>
-</ul>
-
-<p>Jason Ekstrand (1):</p>
-<ul>
-  <li>i965,anv: Set the CS stall bit on the ISP disable PIPE_CONTROL</li>
-</ul>
-
-<p>Jose Maria Casanova Crespo (2):</p>
-<ul>
-  <li>intel/compiler: fix 16-bit int brw_negate_immediate and brw_abs_immediate</li>
-  <li>intel/compiler: fix brw_imm_w for negative 16-bit integers</li>
-</ul>
-
-<p>Juan A. Suarez Romero (7):</p>
-<ul>
-  <li>docs: add sha256 checksums for 18.0.3</li>
-  <li>cherry-ignore: add explicit 18.1 only nominations</li>
-  <li>cherry-ignore: glsl: change ast_type_qualifier bitset size to work around GCC 5.4 bug</li>
-  <li>cherry-ignore: mesa: fix glGetInteger/Float/etc queries for vertex arrays attribs</li>
-  <li>cherry-ignore: mesa: revert GL_[SECONDARY_]COLOR_ARRAY_SIZE glGet type to TYPE_INT</li>
-  <li>cherry-ignore: radv/resolve: do fmask decompress on all layers.</li>
-  <li>Update version to 18.0.4</li>
-</ul>
-
-<p>Kai Wasserbäch (1):</p>
-<ul>
-  <li>opencl: autotools: Fix linking order for OpenCL target</li>
-</ul>
-
-<p>Kenneth Graunke (1):</p>
-<ul>
-  <li>i965: Don't leak blorp on Gen4-5.</li>
-</ul>
-
-<p>Lionel Landwerlin (2):</p>
-<ul>
-  <li>i965: require pixel scoreboard stall prior to ISP disable</li>
-  <li>anv: emit pixel scoreboard stall before ISP disable</li>
-</ul>
-
-<p>Matthew Nicholls (1):</p>
-<ul>
-  <li>radv: fix multisample image copies</li>
-</ul>
-
-<p>Neil Roberts (1):</p>
-<ul>
-  <li>spirv: Apply OriginUpperLeft to FragCoord</li>
-</ul>
-
-<p>Rhys Perry (1):</p>
-<ul>
-  <li>mesa: fix error handling in get_framebuffer_parameteriv</li>
-</ul>
-
-<p>Ross Burton (1):</p>
-<ul>
-  <li>src/intel/Makefile.vulkan.am: add missing MKDIR_GEN</li>
-</ul>
-
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/18.0.5.html
+++ b/docs/relnotes/18.0.5.html
@@ -1,162 +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>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 18.0.5 Release Notes / June 3, 2018</h1>
-
-<p>
-Mesa 18.0.5 is a bug fix release which fixes bugs found since the 18.0.4 release.
-</p>
-<p>
-Mesa 18.0.5 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation
-because compatibility contexts are not supported.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-ea3e00329cea899b1e32db812fd2f426832be37e4baa2e2fd9288a3480f30531  mesa-18.0.5.tar.gz
-5187bba8d72aea78f2062d134ec6079a508e8216062dce9ec9048b5eb2c4fc6b  mesa-18.0.5.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-<p>None</p>
-
-
-<h2>Bug fixes</h2>
-
-<ul>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=78097">Bug 78097</a> - glUniform1ui and friends not supported by display lists</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=102390">Bug 102390</a> - centroid interpolation causes broken attribute values</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105351">Bug 105351</a> - [Gen6+] piglit's arb_shader_image_load_store-host-mem-barrier fails with a glGetTexSubImage fallback path</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106090">Bug 106090</a> - Compiling compute shader crashes RADV</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106315">Bug 106315</a> - The witness + dxvk suffers flickering garbage</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106465">Bug 106465</a> - No test for Image Load/Store on format-incompatible texture buffer</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106479">Bug 106479</a> - NDEBUG not defined for libamdgpu_addrlib</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106481">Bug 106481</a> - No test for Image Load/Store on texture buffer sized greater than MAX_TEXTURE_BUFFER_SIZE_ARB</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106504">Bug 106504</a> - vulkan SPIR-V parsing failed at ../src/compiler/spirv/vtn_cfg.c:381</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106587">Bug 106587</a> - Dota2 is very dark when using vulkan render on a Intel &lt;&lt; AMD prime setup</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106629">Bug 106629</a> - [SNB,IVB,HSW,BDW] dEQP-EGL.functional.image.create.gles2_cubemap_negative_z_rgb_read_pixels</li>
-
-</ul>
-
-
-<h2>Changes</h2>
-
-<p>Anuj Phogat (1):</p>
-<ul>
-  <li>i965/glk: Add l3 banks count for 2x6 configuration</li>
-</ul>
-
-<p>Bas Nieuwenhuizen (2):</p>
-<ul>
-  <li>amd/addrlib: Use defines in autotools build.</li>
-  <li>radv: Fix SRGB compute copies.</li>
-</ul>
-
-<p>Dave Airlie (1):</p>
-<ul>
-  <li>tgsi/scan: add hw atomic to the list of memory accessing files</li>
-</ul>
-
-<p>Francisco Jerez (4):</p>
-<ul>
-  <li>Revert "mesa: simplify _mesa_is_image_unit_valid for buffers"</li>
-  <li>i965: Move buffer texture size calculation into a common helper function.</li>
-  <li>i965: Handle non-zero texture buffer offsets in buffer object range calculation.</li>
-  <li>i965: Use intel_bufferobj_buffer() wrapper in image surface state setup.</li>
-</ul>
-
-<p>Jan Vesely (1):</p>
-<ul>
-  <li>eg/compute: Use reference counting to handle compute memory pool.</li>
-</ul>
-
-<p>Jason Ekstrand (2):</p>
-<ul>
-  <li>intel/eu: Set EXECUTE_1 when setting the rounding mode in cr0</li>
-  <li>intel/blorp: Support blits and clears on surfaces with offsets</li>
-</ul>
-
-<p>Jose Dapena Paz (1):</p>
-<ul>
-  <li>mesa: do not leak ctx-&gt;Shader.ReferencedProgram references</li>
-</ul>
-
-<p>Juan A. Suarez Romero (8):</p>
-<ul>
-  <li>docs: add sha256 checksums for 18.0.4</li>
-  <li>cherry-ignore: i965/miptree: Fix handling of uninitialized MCS buffers</li>
-  <li>cherry-ignore: add explicit 18.1 only nominations</li>
-  <li>cherry-ignore: mesa/st: handle vert_attrib_mask in nir case too</li>
-  <li>cherry-ignore: Tegra is not supported</li>
-  <li>cherry-ignore: st/mesa: fix assertion failures with GL_UNSIGNED_INT64_ARB (v2)</li>
-  <li>cherry-ignore: nv30: ensure that displayable formats are marked accordingly</li>
-  <li>Update version to 18.0.5</li>
-</ul>
-
-<p>Marek Olšák (3):</p>
-<ul>
-  <li>st/mesa: simplify lastLevel determination in st_finalize_texture</li>
-  <li>radeonsi: fix incorrect parentheses around VS-PS varying elimination</li>
-  <li>mesa: handle GL_UNSIGNED_INT64_ARB properly (v2)</li>
-</ul>
-
-<p>Michel Dänzer (1):</p>
-<ul>
-  <li>dri3: Stricter SBC wraparound handling</li>
-</ul>
-
-<p>Nanley Chery (1):</p>
-<ul>
-  <li>i965/miptree: Zero-initialize CCS_D buffers</li>
-</ul>
-
-<p>Samuel Pitoiset (2):</p>
-<ul>
-  <li>spirv: fix visiting inner loops with same break/continue block</li>
-  <li>radv: fix centroid interpolation</li>
-</ul>
-
-<p>Stuart Young (1):</p>
-<ul>
-  <li>etnaviv: Fix missing rnndb file in tarballs</li>
-</ul>
-
-<p>Timothy Arceri (1):</p>
-<ul>
-  <li>mesa: add glUniform*ui{v} support to display lists</li>
-</ul>
-
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/18.1.2.html
+++ b/docs/relnotes/18.1.2.html
@@ -1,170 +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>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 18.1.2 Release Notes / June 15 2018</h1>
-
-<p>
-Mesa 18.1.2 is a bug fix release which fixes bugs found since the 18.1.1 release.
-</p>
-<p>
-Mesa 18.1.2 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-a644df23937f4078a2bd9a54349f6315c1955f5e3a4ac272832da51dea4d3c11  mesa-18.1.1.tar.gz
-070bf0648ba5b242d7303ceed32aed80842f4c0ba16e5acc1a650a46eadfb1f9  mesa-18.1.1.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-
-<p>None</p>
-
-<h2>Bug fixes</h2>
-
-<p>None<p>
-
-<h2>Changes</h2>
-
-<p>Alex Smith (4):</p>
-<ul>
-  <li>radv: Consolidate GFX9 merged shader lookup logic</li>
-  <li>radv: Handle GFX9 merged shaders in radv_flush_constants()</li>
-  <li>radeonsi: Fix crash on shaders using MSAA image load/store</li>
-  <li>radv: Set active_stages the same whether or not shaders were cached</li>
-</ul>
-
-<p>Andrew Galante (2):</p>
-<ul>
-  <li>meson: Test for __atomic_add_fetch in atomic checks</li>
-  <li>configure.ac: Test for __atomic_add_fetch in atomic checks</li>
-</ul>
-
-<p>Bas Nieuwenhuizen (1):</p>
-<ul>
-  <li>radv: Don't pass a TESS_EVAL shader when tesselation is not enabled.</li>
-</ul>
-
-<p>Cameron Kumar (1):</p>
-<ul>
-  <li>vulkan/wsi: Destroy swapchain images after terminating FIFO queues</li>
-</ul>
-
-<p>Dylan Baker (6):</p>
-<ul>
-  <li>docs/relnotes: Add sha256 sums for mesa 18.1.1</li>
-  <li>cherry-ignore: add commits not to pull</li>
-  <li>cherry-ignore: Add patches from Jason that he rebased on 18.1</li>
-  <li>meson: work around gentoo applying -m32 to host compiler in cross builds</li>
-  <li>cherry-ignore: Add another patch</li>
-  <li>version: bump version for 18.1.2 release</li>
-</ul>
-
-<p>Eric Engestrom (3):</p>
-<ul>
-  <li>autotools: add missing android file to package</li>
-  <li>configure: radv depends on mako</li>
-  <li>i965: fix resource leak</li>
-</ul>
-
-<p>Jason Ekstrand (10):</p>
-<ul>
-  <li>intel/eu: Add some brw_get_default_ helpers</li>
-  <li>intel/eu: Copy fields manually in brw_next_insn</li>
-  <li>intel/eu: Set flag [sub]register number differently for 3src</li>
-  <li>intel/blorp: Don't vertex fetch directly from clear values</li>
-  <li>intel/isl: Add bounds-checking assertions in isl_format_get_layout</li>
-  <li>intel/isl: Add bounds-checking assertions for the format_info table</li>
-  <li>i965/screen: Refactor query_dma_buf_formats</li>
-  <li>i965/screen: Use RGBA non-sRGB formats for images</li>
-  <li>anv: Set fence/semaphore types to NONE in impl_cleanup</li>
-  <li>i965/screen: Return false for unsupported formats in query_modifiers</li>
-</ul>
-
-<p>Jordan Justen (1):</p>
-<ul>
-  <li>mesa/program_binary: add implicit UseProgram after successful ProgramBinary</li>
-</ul>
-
-<p>Juan A. Suarez Romero (1):</p>
-<ul>
-  <li>glsl: Add ir_binop_vector_extract in NIR</li>
-</ul>
-
-<p>Kenneth Graunke (2):</p>
-<ul>
-  <li>i965: Fix batch-last mode to properly swap BOs.</li>
-  <li>anv: Disable __gen_validate_value if NDEBUG is set.</li>
-</ul>
-
-<p>Marek Olšák (1):</p>
-<ul>
-  <li>r300g/swtcl: make pipe_context uploaders use malloc'd memory as before</li>
-</ul>
-
-<p>Matt Turner (1):</p>
-<ul>
-  <li>meson: Fix -latomic check</li>
-</ul>
-
-<p>Michel Dänzer (1):</p>
-<ul>
-  <li>glx: Fix number of property values to read in glXImportContextEXT</li>
-</ul>
-
-<p>Nicolas Boichat (1):</p>
-<ul>
-  <li>configure.ac/meson.build: Fix -latomic test</li>
-</ul>
-
-<p>Philip Rebohle (1):</p>
-<ul>
-  <li>radv: Use correct color format for fast clears</li>
-</ul>
-
-<p>Samuel Pitoiset (3):</p>
-<ul>
-  <li>radv: fix a GPU hang when MRTs are sparse</li>
-  <li>radv: fix missing ZRANGE_PRECISION(1) for GFX9+</li>
-  <li>radv: add a workaround for DXVK hangs by setting amdgpu-skip-threshold</li>
-</ul>
-
-<p>Scott D Phillips (1):</p>
-<ul>
-  <li>intel/tools: add intel_sanitize_gpu to EXTRA_DIST</li>
-</ul>
-
-<p>Thomas Petazzoni (1):</p>
-<ul>
-  <li>configure.ac: rework -latomic check</li>
-</ul>
-
-<p>Timothy Arceri (2):</p>
-<ul>
-  <li>ac: fix possible truncation of intrinsic name</li>
-  <li>radeonsi: fix possible truncation on renderer string</li>
-</ul>
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/18.1.3.html
+++ b/docs/relnotes/18.1.3.html
@@ -1,167 +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>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 18.1.3 Release Notes / June 29 2018</h1>
-
-<p>
-Mesa 18.1.3 is a bug fix release which fixes bugs found since the 18.1.2 release.
-</p>
-<p>
-Mesa 18.1.2 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-2a1e36280d01ad18ba6d5b3fbd653ceaa109eaa031b78eb5dfaa4df452742b66  mesa-18.1.3.tar.gz
-54f08deeda0cd2f818e8d40140040ed013de7852573002453b7f50da9ea738ce  mesa-18.1.3.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-
-<p>None</p>
-
-<h2>Bug fixes</h2>
-
-<ul>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105396">Bug 105396</a> - tc compatible htile sets depth of htiles of discarded fragments to 1.0</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105399">Bug 105399</a> - [snb] GPU hang: after geometry shader emits no geometry, the program hangs</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106756">Bug 106756</a> - Wine 3.9 crashes with DXVK on Just Cause 3 and Quantum Break on VEGA but works ON POLARIS</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106774">Bug 106774</a> - GLSL IR copy propagates loads of SSBOs</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106903">Bug 106903</a> - radv: Fragment shader output goes to wrong attachments when render targets are sparse</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106907">Bug 106907</a> - Correct Transform Feedback Varyings information is expected after using ProgramBinary</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106912">Bug 106912</a> - radv: 16-bit depth buffer causes artifacts in Shadow Warrior 2</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106980">Bug 106980</a> - Basemark GPU vulkan benchmark fails.</li>
-
-</ul>
-
-<h2>Changes</h2>
-<p>Andrii Simiklit (1):</p>
-<ul>
-  <li>i965/gen6/gs: Handle case where a GS doesn't allocate VUE</li>
-</ul>
-
-<p>Bas Nieuwenhuizen (2):</p>
-<ul>
-  <li>radv: Fix output for sparse MRTs.</li>
-  <li>ac/surface: Set compressZ for stencil-only surfaces.</li>
-</ul>
-
-<p>Christian Gmeiner (1):</p>
-<ul>
-  <li>util/bitset: include util/macro.h</li>
-</ul>
-
-<p>Dave Airlie (1):</p>
-<ul>
-  <li>glsl: allow standalone semicolons outside main()</li>
-</ul>
-
-<p>Dylan Baker (8):</p>
-<ul>
-  <li>docs: Add release notes for 18.1.2</li>
-  <li>cherry-ignore: Add 587e712eda95c31d88ea9d20e59ad0ae59afef4f</li>
-  <li>meson: Fix auto option for va</li>
-  <li>meson: Fix auto option for xvmc</li>
-  <li>meson: Correct behavior of vdpau=auto</li>
-  <li>cherry-ignore: Ignore cac7ab1192eefdd8d8b3f25053fb006b5c330eb8</li>
-  <li>cherry-ignore: add a2f5292c82ad07731d633b36a663e46adc181db9</li>
-  <li>VERSION: bump version to 18.1.3</li>
-</ul>
-
-<p>Emil Velikov (2):</p>
-<ul>
-  <li>configure: use compliant grep regex checks</li>
-  <li>glsl/tests/glcpp: reinstate "error out if no tests found"</li>
-</ul>
-
-<p>Eric Engestrom (3):</p>
-<ul>
-  <li>radv: fix reported number of available VGPRs</li>
-  <li>radv: fix bitwise check</li>
-  <li>meson: fix i965/anv/isl genX static lib names</li>
-</ul>
-
-<p>Ian Romanick (2):</p>
-<ul>
-  <li>glsl: Don't copy propagate from SSBO or shared variables either</li>
-  <li>glsl: Don't copy propagate elements from SSBO or shared variables either</li>
-</ul>
-
-<p>Jason Ekstrand (2):</p>
-<ul>
-  <li>nir: Handle call instructions in foreach_src</li>
-  <li>nir/validate: Use the type from the tail of call parameter derefs</li>
-</ul>
-
-<p>Lukas Rusak (2):</p>
-<ul>
-  <li>meson: only build vl_winsys_dri.c when x11 platform is used</li>
-  <li>meson: fix private libs when building without glx</li>
-</ul>
-
-<p>Marek Olšák (5):</p>
-<ul>
-  <li>radeonsi/gfx9: fix si_get_buffer_from_descriptors for 48-bit pointers</li>
-  <li>ac/gpu_info: report real total memory sizes</li>
-  <li>ac/gpu_info: add kernel_flushes_hdp_before_ib</li>
-  <li>radeonsi: always put persistent buffers into GTT on radeon</li>
-  <li>mesa: fix glGetInteger64v for arrays of integers</li>
-</ul>
-
-<p>Rob Clark (1):</p>
-<ul>
-  <li>freedreno/ir3: fix base_vertex</li>
-</ul>
-
-<p>Samuel Pitoiset (6):</p>
-<ul>
-  <li>radv: don't fast clear HTILE for 16-bit depth surfaces on GFX8</li>
-  <li>radv: update the ZRANGE_PRECISION value for the TC-compat bug</li>
-  <li>radv: fix emitting the TCS regs on GFX9</li>
-  <li>radv: fix HTILE metadata initialization in presence of subpass clears</li>
-  <li>radv: ignore pInheritanceInfo for primary command buffers</li>
-  <li>radv: use separate bind points for the dynamic buffers</li>
-</ul>
-
-<p>Tapani Pälli (1):</p>
-<ul>
-  <li>glsl: serialize data from glTransformFeedbackVaryings</li>
-</ul>
-
-<p>Tomeu Vizoso (1):</p>
-<ul>
-  <li>virgl: Remove debugging left-overs</li>
-</ul>
-
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/18.1.4.html
+++ b/docs/relnotes/18.1.4.html
@@ -1,150 +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>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 18.1.4 Release Notes / July 13 2018</h1>
-
-<p>
-Mesa 18.1.4 is a bug fix release which fixes bugs found since the 18.1.3 release.
-</p>
-<p>
-Mesa 18.1.4 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-SHA256: 8acd42e4ac4d1e96ed22344073b3d4fef03d10f225f4eaf3f88c001dfc10e2db  mesa-18.1.4.tar.gz
-SHA256: 3061488b5d85504092cf4343816cfb2d96f2ad9bc2edec31fc96933d184cf58b  mesa-18.1.4.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-
-<p>None</p>
-
-<h2>Bug fixes</h2>
-<ul>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106906">Bug 106906</a> - Failed to recongnize keyword “sampler2DRect” and &quot;sampler2DRectShadow&quot;</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106928">Bug 106928</a> - When starting a match Rocket League crashes on &quot;Go&quot;</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107193">Bug 107193</a> - piglit.spec.arb_compute_shader.linker.bug-93840 fails</li>
-
-</ul>
-
-<h2>Changes</h2>
-<p>Adam Jackson (1):</p>
-<ul>
-  <li>glx: Don't allow glXMakeContextCurrent() with only one valid drawable</li>
-</ul>
-
-<p>Dave Airlie (1):</p>
-<ul>
-  <li>r600/sb: cleanup if_conversion iterator to be legal C++</li>
-</ul>
-
-<p>Dylan Baker (2):</p>
-<ul>
-  <li>docs: Add SHA256 sums to notes for 18.1.3</li>
-  <li>Bump version for release</li>
-</ul>
-
-<p>Iago Toral Quiroga (3):</p>
-<ul>
-  <li>anv/cmd_buffer: make descriptors dirty when emitting base state address</li>
-  <li>anv/cmd_buffer: clean dirty push constants flag after emitting push constants</li>
-  <li>anv/cmd_buffer: never shrink the push constant buffer size</li>
-</ul>
-
-<p>Ian Romanick (4):</p>
-<ul>
-  <li>i965/vec4: Don't cmod propagate from CMP to ADD if the writemask isn't compatible</li>
-  <li>intel/compiler: Relax mixed type restriction for saturating immediates</li>
-  <li>i965/vec4: Properly handle sign(-abs(x))</li>
-  <li>i965/fs: Properly handle sign(-abs(x))</li>
-</ul>
-
-<p>Jason Ekstrand (3):</p>
-<ul>
-  <li>intel/fs: Split instructions low to high in lower_simd_width</li>
-  <li>anv: Be more careful about hashing pipeline layouts</li>
-  <li>intel/fs: Mark LINTERP opcode as writing accumulator on platforms without PLN</li>
-</ul>
-
-<p>Jose Maria Casanova Crespo (3):</p>
-<ul>
-  <li>i965/fs: Register allocator shoudn't use grf127 for sends dest</li>
-  <li>intel/compiler: grf127 can not be dest when src and dest overlap in send</li>
-  <li>i965/fs: unspills shoudn't use grf127 as dest since Gen8+</li>
-</ul>
-
-<p>Lionel Landwerlin (1):</p>
-<ul>
-  <li>i965: fix clear color bo address relocation</li>
-</ul>
-
-<p>Marek Olšák (3):</p>
-<ul>
-  <li>radeonsi: fix memory exhaustion issue with DCC statistics gathering with DRI2</li>
-  <li>glsl/cache: save and restore ExternalSamplersUsed</li>
-  <li>st/dri: fix a crash in server_wait_sync</li>
-</ul>
-
-<p>Neil Roberts (1):</p>
-<ul>
-  <li>i965: Fix output register sizes when variable ranges are interleaved</li>
-</ul>
-
-<p>Rhys Perry (1):</p>
-<ul>
-  <li>nvc0/ir: fix TargetNVC0::insnCanLoadOffset()</li>
-</ul>
-
-<p>Roland Scheidegger (1):</p>
-<ul>
-  <li>r600/sb: fix crash in fold_alu_op3</li>
-</ul>
-
-<p>Ross Burton (1):</p>
-<ul>
-  <li>egl: fix build race in automake</li>
-</ul>
-
-<p>Samuel Pitoiset (1):</p>
-<ul>
-  <li>radv: fix emitting the view index on GFX9</li>
-</ul>
-
-<p>Timothy Arceri (2):</p>
-<ul>
-  <li>glsl: skip comparison opt when adding vars of different size</li>
-  <li>nir: fix selection of loop terminator when two or more have the same limit</li>
-</ul>
-
-<p>zhaowei yuan (1):</p>
-<ul>
-  <li>glsl: Treat sampler2DRect and sampler2DRectShadow as reserved in ES2</li>
-</ul>
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/18.1.5.html
+++ b/docs/relnotes/18.1.5.html
@@ -1,183 +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>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 18.1.4 Release Notes / July 13 2018</h1>
-
-<p>
-Mesa 18.1.5 is a bug fix release which fixes bugs found since the 18.1.4 release.
-</p>
-<p>
-Mesa 18.1.5 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-SHA256: f966d5d5d373a5b8a16ed5036c1e7f05d4ad46d130f793bf9782c3ac9133a02e  mesa-18.1.5.tar.gz
-SHA256: 69dbe6f1a6660386f5beb85d4fcf003ee23023ed7b9a603de84e9a37e8d98dea  mesa-18.1.5.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-
-<p>None</p>
-
-<h2>Bug fixes</h2>
-<ul>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=103274">Bug 103274</a> - BRW allocates too much heap memory</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107275">Bug 107275</a> - NIR segfaults after spirv-opt</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107295">Bug 107295</a> - Access violation on glDrawArrays with count &gt;= 2048</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107312">Bug 107312</a> - Mesa-git RPM build fails after commit 8cacf38f527d42e41441ef8c25d95d4b2f4e8602</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107366">Bug 107366</a> - NIR verification crashes on piglit tests</li>
-
-</ul>
-
-<h2>Changes</h2>
-<p>Alex Smith (1):</p>
-<ul>
-  <li>anv: Pay attention to VK_ACCESS_MEMORY_(READ|WRITE)_BIT</li>
-</ul>
-
-<p>Bas Nieuwenhuizen (7):</p>
-<ul>
-  <li>radv: Select correct entries for binning.</li>
-  <li>radv: Fix number of samples used for binning.</li>
-  <li>radv: Disable disabled color buffers in rbplus opts.</li>
-  <li>nir: Do not use continue block after removing it.</li>
-  <li>util/disk_cache: Fix disk_cache_get_function_timestamp with disabled cache.</li>
-  <li>nir: Fix end of function without return warning/error.</li>
-  <li>radv: Still enable inmemory &amp; API level caching if disk cache is not enabled.</li>
-</ul>
-
-<p>Chad Versace (2):</p>
-<ul>
-  <li>anv/android: Fix type error in call to vk_errorf()</li>
-  <li>anv/android: Fix Autotools build for VK_ANDROID_native_buffer</li>
-</ul>
-
-<p>Chih-Wei Huang (1):</p>
-<ul>
-  <li>Android: fix a missing nir_intrinsics.h error</li>
-</ul>
-
-<p>Danylo Piliaiev (1):</p>
-<ul>
-  <li>i965: Sweep NIR after linking phase to free held memory</li>
-</ul>
-
-<p>Dave Airlie (1):</p>
-<ul>
-  <li>r600: enable tess_input_info for TES</li>
-</ul>
-
-<p>Dylan Baker (5):</p>
-<ul>
-  <li>docs: Add sha256 sums for 18.1.4 tarballs</li>
-  <li>cherry-ignore: add 4a67ce886a7b3def5f66c1aedf9e5436d157a03c</li>
-  <li>cherry-ignore: Add 1f616a840eac02241c585d28e9dac8f19a297f39</li>
-  <li>cherry-ignore: add 11712b9ca17e4e1a819dcb7d020e19c6da77bc90</li>
-  <li>bump version to 18.1.5</li>
-</ul>
-
-<p>Eric Anholt (2):</p>
-<ul>
-  <li>vc4: Don't automatically reallocate a PERSISTENT-mapped buffer.</li>
-  <li>meson: Move xvmc test tools from unit tests to installed tools.</li>
-</ul>
-
-<p>Harish Krupo (1):</p>
-<ul>
-  <li>egl: Fix missing clamping in eglSetDamageRegionKHR</li>
-</ul>
-
-<p>Jan Vesely (3):</p>
-<ul>
-  <li>radeonsi: Refuse to accept code with unhandled relocations</li>
-  <li>clover: Report error when pipe driver fails to create compute state</li>
-  <li>clover: Catch errors from executing event action</li>
-</ul>
-
-<p>Jason Ekstrand (6):</p>
-<ul>
-  <li>anv: Stop setting 3DSTATE_PS_EXTRA::PixelShaderHasUAV</li>
-  <li>nir/serialize: Alloc constants off the variable</li>
-  <li>blorp: Handle the RGB workaround more like other workarounds</li>
-  <li>intel/blorp: Handle 3-component formats in clears</li>
-  <li>intel/compiler: Account for built-in uniforms in analyze_ubo_ranges</li>
-  <li>spirv: Fix a couple of image atomic load/store bugs</li>
-</ul>
-
-<p>José Fonseca (1):</p>
-<ul>
-  <li>gallium/tests: Don't ignore S3TC errors.</li>
-</ul>
-
-<p>Karol Herbst (1):</p>
-<ul>
-  <li>nir: fix printing of vec16 type</li>
-</ul>
-
-<p>Lepton Wu (1):</p>
-<ul>
-  <li>virgl: Fix flush in virgl_encoder_inline_write.</li>
-</ul>
-
-<p>Lucas Stach (1):</p>
-<ul>
-  <li>st/mesa: call resource_changed when binding a EGLImage to a texture</li>
-</ul>
-
-<p>Mauro Rossi (2):</p>
-<ul>
-  <li>radv: winsys/amdgpu: include missing pthread.h header</li>
-  <li>android: util/disk_cache: fix building errors in gallium drivers</li>
-</ul>
-
-<p>Michel Dänzer (1):</p>
-<ul>
-  <li>gallium: Check pipe_screen::resource_changed before dereferencing it</li>
-</ul>
-
-<p>Roland Scheidegger (1):</p>
-<ul>
-  <li>draw: force draw pipeline if there's more than 65535 vertices</li>
-</ul>
-
-<p>Samuel Iglesias Gonsálvez (1):</p>
-<ul>
-  <li>anv: fix assert in anv_CmdBindDescriptorSets()</li>
-</ul>
-
-<p>Samuel Pitoiset (3):</p>
-<ul>
-  <li>radv: make sure to wait for CP DMA when needed</li>
-  <li>radv: emit a dummy ZPASS_DONE to prevent GPU hangs on GFX9</li>
-  <li>radv: fix a memleak for merged shaders on GFX9</li>
-</ul>
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/18.1.6.html
+++ b/docs/relnotes/18.1.6.html
@@ -1,188 +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>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 18.1.6 Release Notes / August 13 2018</h1>
-
-<p>
-Mesa 18.1.6 is a bug fix release which fixes bugs found since the 18.1.5 release.
-</p>
-<p>
-Mesa 18.1.6 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-580e03328ffefe1fd43b19ab7669f20d931601a1c0a4c0f8b9c65d6e81a06df3  mesa-18.1.6.tar.gz
-bb7ce759069801804fcfb8152da3457f76cd7b4e0096e4870ff5adcb5c894289  mesa-18.1.6.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-
-<p>None</p>
-
-<h2>Bug fixes</h2>
-<ul>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=13728">Bug 13728</a> - [G965] Some objects in Neverwinter Nights Linux version not displayed correctly</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98699">Bug 98699</a> - &quot;float[a+++4 ? 1:1] f;&quot; crashes glsl_compiler</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99730">Bug 99730</a> - Metro Redux game(s) needs override for midshader extension declaration</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106382">Bug 106382</a> - Shader cache breaks INTEL_DEBUG=shader_time</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107117">Bug 107117</a> - mesa-18.1: regression with TFP on intel with modesettings and glamor acceleration</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107212">Bug 107212</a> - Dual-Core CPU E5500 / G45: RetroArch with reicast core results in corrupted graphics</li>
-
-</ul>
-
-<h2>Changes</h2>
-<p>Adam Jackson (1):</p>
-<ul>
-  <li>glx: GLX_MESA_multithread_makecurrent is direct-only</li>
-</ul>
-
-<p>Andres Gomez (3):</p>
-<ul>
-  <li>ddebug: use util_snprintf() in dd_get_debug_filename_and_mkdir</li>
-  <li>gallium/aux/util: use util_snprintf() in test_texture_barrier</li>
-  <li>glsl: use util_snprintf()</li>
-</ul>
-
-<p>Christian Gmeiner (1):</p>
-<ul>
-  <li>etnaviv: fix typo in query names</li>
-</ul>
-
-<p>Dave Airlie (1):</p>
-<ul>
-  <li>r600: reduce num compute threads to 1024.</li>
-</ul>
-
-<p>Dylan Baker (6):</p>
-<ul>
-  <li>docs: Add sha-256 sums for 18.1.5</li>
-  <li>nir/meson: fix c vs cpp args for nir test</li>
-  <li>gallium: fix ddebug on windows</li>
-  <li>cherry-ignore: add patches that get-pick-list is finding in error</li>
-  <li>cherry-ignore: Add some additional patches that are for 18.2</li>
-  <li>bump version to 18.1.6</li>
-</ul>
-
-<p>Emil Velikov (5):</p>
-<ul>
-  <li>swr: don't export swr_create_screen_internal</li>
-  <li>automake: require shared glapi when using DRI based libGL</li>
-  <li>autotools: error out when using the broken --with-{gl, osmesa}-lib-name</li>
-  <li>autotools: error out when building with mangling and glvnd</li>
-  <li>autotools: use correct gl.pc LIBS when using glvnd</li>
-</ul>
-
-<p>Eric Anholt (4):</p>
-<ul>
-  <li>vc4: Fix a leak of the no-vertex-elements workaround BO.</li>
-  <li>vc4: Respect a sampler view's first_layer field.</li>
-  <li>vc4: Ignore samplers for finding uniform offsets.</li>
-  <li>egl: Fix leak of X11 pixmaps backing pbuffers in DRI3.</li>
-</ul>
-
-<p>Gert Wollny (1):</p>
-<ul>
-  <li>meson, install_megadrivers: Also remove stale symlinks</li>
-</ul>
-
-<p>Jan Vesely (2):</p>
-<ul>
-  <li>clover: Reduce wait_count in abort path.</li>
-  <li>clover: Don't extend illegal integer types.</li>
-</ul>
-
-<p>Jason Ekstrand (2):</p>
-<ul>
-  <li>nir: Take if uses into account in ssa_def_components_read</li>
-  <li>i965/fs: Flag all slots of a flat input as flat</li>
-</ul>
-
-<p>Jon Turney (1):</p>
-<ul>
-  <li>meson: use correct keyword to fix a meson warning</li>
-</ul>
-
-<p>Jordan Justen (2):</p>
-<ul>
-  <li>i965, anv: Use INTEL_DEBUG for disk_cache driver flags</li>
-  <li>i965: Disable shader cache with INTEL_DEBUG=shader_time</li>
-</ul>
-
-<p>Juan A. Suarez Romero (2):</p>
-<ul>
-  <li>wayland/egl: update surface size on window resize</li>
-  <li>wayland/egl: initialize window surface size to window size</li>
-</ul>
-
-<p>Karol Herbst (2):</p>
-<ul>
-  <li>nir/lower_int64: mark all metadata as dirty</li>
-  <li>nvc0/ir: return 0 in imageLoad on incomplete textures</li>
-</ul>
-
-<p>Kenneth Graunke (1):</p>
-<ul>
-  <li>intel: Fix SIMD16 unaligned payload GRF reads on Gen4-5.</li>
-</ul>
-
-<p>Marek Olšák (1):</p>
-<ul>
-  <li>ac/surface: fix MSAA corruption on Vega due to FMASK tile swizzle</li>
-</ul>
-
-<p>Mauro Rossi (2):</p>
-<ul>
-  <li>radv: generate entrypoints for VK_ANDROID_native_buffer</li>
-  <li>radv: move vk_format_table.c to generated sources</li>
-</ul>
-
-<p>Olivier Fourdan (1):</p>
-<ul>
-  <li>dri3: For 1.2, use root window instead of pixmap drawable</li>
-</ul>
-
-<p>Tapani Pälli (1):</p>
-<ul>
-  <li>glsl: handle error case with ast_post_inc, ast_post_dec</li>
-</ul>
-
-<p>Vlad Golovkin (1):</p>
-<ul>
-  <li>swr: Remove unnecessary memset call</li>
-</ul>
-
-<p>vadym.shovkoplias (1):</p>
-<ul>
-  <li>drirc: Allow extension midshader for Metro Redux</li>
-</ul>
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/18.1.7.html
+++ b/docs/relnotes/18.1.7.html
@@ -1,104 +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>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 18.1.7 Release Notes / August 24 2018</h1>
-
-<p>
-Mesa 18.1.7 is a bug fix release which fixes bugs found since the 18.1.6 release.
-</p>
-<p>
-Mesa 18.1.7 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-0c3c240bcd1352d179e65993214f9d55a399beac852c3ab4433e8df9b6c51c83  mesa-18.1.7.tar.gz
-655e3b32ce3bdddd5e6e8768596e5d4bdef82d0dd37067c324cc4b2daa207306  mesa-18.1.7.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-
-<p>None</p>
-
-<h2>Bug fixes</h2>
-<ul>
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105975">Bug 105975</a> - i965 always reports 0 viewport subpixel bits</li>
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107098">Bug 107098</a> - Segfault after munmap(kms_sw_dt-&gt;ro_mapped)</li>
-</ul>
-
-<h2>Changes</h2>
-<p>Alexander Tsoy (1):</p>
-<ul>
-  <li>meson: fix build for egl platform_x11 without dri3 and gbm</li>
-</ul>
-
-<p>Bas Nieuwenhuizen (1):</p>
-<ul>
-  <li>radv: Fix missing Android platform define.</li>
-</ul>
-
-<p>Danylo Piliaiev (1):</p>
-<ul>
-  <li>i965: Advertise 8 bits subpixel precision for viewport bounds on gen6+</li>
-</ul>
-
-<p>Dave Airlie (1):</p>
-<ul>
-  <li>r600/eg: rework atomic counter emission with flushes</li>
-</ul>
-
-<p>Dylan Baker (7):</p>
-<ul>
-  <li>docs: Add sha256 sums for 18.1.6</li>
-  <li>cherry-ignore: Add additional 18.2 only patches</li>
-  <li>cherry-ignore: Add more 18.2 patches</li>
-  <li>cherry-ignore: Add more 18.2 patches</li>
-  <li>cherry-ignore: Add a couple of patches with &gt; 1 fixes tags</li>
-  <li>cherry-ignore: more 18.2 patches</li>
-  <li>bump version for 18.1.7 release</li>
-</ul>
-
-<p>Jason Ekstrand (2):</p>
-<ul>
-  <li>intel: Switch the order of the 2x MSAA sample positions</li>
-  <li>anv/lower_ycbcr: Use the binding array size for bounds checks</li>
-</ul>
-
-<p>Ray Strode (1):</p>
-<ul>
-  <li>gallium/winsys/kms: don't unmap what wasn't mapped</li>
-</ul>
-
-<p>Samuel Pitoiset (1):</p>
-<ul>
-  <li>radv/winsys: fix creating the BO list for virtual buffers</li>
-</ul>
-
-<p>Timothy Arceri (1):</p>
-<ul>
-  <li>radv: add Doom workaround</li>
-</ul>
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/18.1.8.html
+++ b/docs/relnotes/18.1.8.html
@@ -1,180 +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>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 18.1.8 Release Notes / September 7 2018</h1>
-
-<p>
-Mesa 18.1.8 is a bug fix release which fixes bugs found since the 18.1.7 release.
-</p>
-<p>
-Mesa 18.1.8 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-8ec62f215dd1bb3910987f9941c6fc31632a0874e618815cf1e8e29445c86e0a  mesa-18.1.8.tar.gz
-bd1be67fe9c73b517765264ac28911c84144682d28dbff140e1c2deb2f44c21b  mesa-18.1.8.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-<p>None</p>
-
-<h2>Bug fixes</h2>
-<ul>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=93355">Bug 93355</a> - [BXT,SKLGT4e] intermittent ext_framebuffer_multisample.accuracy fails</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=101247">Bug 101247</a> - Mesa fails to link GLSL programs with unused output blocks</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=104809">Bug 104809</a> - anv: DOOM 2016 and Wolfenstein II:The New Colossus crash due to not having depthBoundsTest</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105904">Bug 105904</a> - Needed to delete mesa shader cache after driver upgrade for 32 bit wine vulkan programs to work.</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106738">Bug 106738</a> - No test for miptrees with DRI modifiers</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106865">Bug 106865</a> - [GLK] piglit.spec.ext_framebuffer_multisample.accuracy stencil tests fail</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107359">Bug 107359</a> - [Regression] [bisected] [OpenGL CTS] [SKL,BDW] KHR-GL46.texture_barrier*-texels, GTF-GL46.gtf21.GL2FixedTests.buffer_corners.buffer_corners, and GTF-GL46.gtf21.GL2FixedTests.stencil_plane_corners.stencil_plane_corners fail with some configuration</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107477">Bug 107477</a> - [DXVK] Setting high shader quality in GTA V results in LLVM error</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107579">Bug 107579</a> - [SNB] The graphic corruption when we reuse the GS compiled and used for TFB when statebuffer contain magic trash in the unused space</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107601">Bug 107601</a> - Rise of the Tomb Raider Segmentation Fault when the game starts</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107760">Bug 107760</a> - GPU Hang when Playing DiRT 3 Complete Edition using Steam Play with DXVK</li>
-
-</ul>
-
-<h2>Changes</h2>
-<p>Andrii Simiklit (1):</p>
-<ul>
-  <li>i965/gen6/xfb: handle case where transform feedback is not active</li>
-</ul>
-
-<p>Bas Nieuwenhuizen (3):</p>
-<ul>
-  <li>radv: Add missing checks in radv_get_image_format_properties.</li>
-  <li>radv: Fix CMASK dimensions.</li>
-  <li>radv: Use a lower max offchip buffer count.</li>
-</ul>
-
-<p>Christian Gmeiner (1):</p>
-<ul>
-  <li>tegra: fix memory leak</li>
-</ul>
-
-<p>Daniel Stone (1):</p>
-<ul>
-  <li>st/dri: Don't expose sRGB formats to clients</li>
-</ul>
-
-<p>Dave Airlie (1):</p>
-<ul>
-  <li>ac/radeonsi: fix CIK copy max size</li>
-</ul>
-
-<p>Dylan Baker (10):</p>
-<ul>
-  <li>docs: Add mesa 18.1.7 notes</li>
-  <li>cherry-ignore: add a patch</li>
-  <li>cherry-ignore: Add more 18.2 only patches</li>
-  <li>meson: Actually load translation files</li>
-  <li>cherry-ignore: Add more 18.2 patches</li>
-  <li>cherry-ignore: Add additional patch</li>
-  <li>cherry-ignore: Add patch that doesn't apply to 18.1</li>
-  <li>cherry-ignore: Add a couple of two fixes warning patches</li>
-  <li>cherry-ignore: Add patch that needs more significant patches to function</li>
-  <li>Bump version to 18.1.8</li>
-</ul>
-
-<p>Emil Velikov (1):</p>
-<ul>
-  <li>docs: update required mako version</li>
-</ul>
-
-<p>Grazvydas Ignotas (1):</p>
-<ul>
-  <li>radv: place pointer length into cache uuid</li>
-</ul>
-
-<p>Gurchetan Singh (2):</p>
-<ul>
-  <li>meson: fix egl build for surfaceless</li>
-  <li>meson: fix egl build for android</li>
-</ul>
-
-<p>Ian Romanick (2):</p>
-<ul>
-  <li>i965/vec4: Clamp indirect tes input array reads with 0x0fffffff</li>
-  <li>i965/vec4: Correctly handle uniform sources in generate_tes_add_indirect_urb_offset</li>
-</ul>
-
-<p>Jason Ekstrand (5):</p>
-<ul>
-  <li>anv: Fill holes in the VF VUE to zero</li>
-  <li>nir/algebraic: Be more careful converting ushr to extract_u8/16</li>
-  <li>egl/dri2: Add a helper for the number of planes for a FOURCC format</li>
-  <li>egl/dri2: Guard against invalid fourcc formats</li>
-  <li>anv/blorp: Do more flushing around HiZ clears</li>
-</ul>
-
-<p>Juan A. Suarez Romero (1):</p>
-<ul>
-  <li>egl/wayland: do not leak wl_buffer when it is locked</li>
-</ul>
-
-<p>Lionel Landwerlin (1):</p>
-<ul>
-  <li>anv: blorp: support multiple aspect blits</li>
-</ul>
-
-<p>Marek Olšák (1):</p>
-<ul>
-  <li>glapi: actually implement GL_EXT_robustness for GLES</li>
-</ul>
-
-<p>Nanley Chery (7):</p>
-<ul>
-  <li>intel/isl: Avoid tiling some 16K-wide render targets</li>
-  <li>i965: Make blt_pitch public</li>
-  <li>i965/miptree: Drop an if case from retile_as_linear</li>
-  <li>i965/miptree: Use the correct BLT pitch</li>
-  <li>i965/miptree: Use miptree_map in map_blit functions</li>
-  <li>i965/miptree: Fix can_blit_slice()</li>
-  <li>i965/gen7_urb: Re-emit PUSH_CONSTANT_ALLOC on some gen9</li>
-</ul>
-
-<p>Samuel Pitoiset (1):</p>
-<ul>
-  <li>radv: fix passing clip/cull distances from VS to PS</li>
-</ul>
-
-<p>vadym.shovkoplias (1):</p>
-<ul>
-  <li>glsl/linker: Allow unused in blocks which are not declated on previous stage</li>
-</ul>
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/18.1.9.html
+++ b/docs/relnotes/18.1.9.html
@@ -1,178 +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>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 18.1.8 Release Notes / September 24 2018</h1>
-
-<p>
-Mesa 18.1.9 is a bug fix release which fixes bugs found since the 18.1.8 release.
-</p>
-<p>
-Mesa 18.1.9 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-0f825dc834b1b3e3d9a6c3ce58b42977f0d9a248a7627a36dd3b313ffe41a499  mesa-18.1.9.tar.gz
-55f5778d58a710a63d6635f000535768faf7db9e8144dc0f4fd1989f936c1a83  mesa-18.1.9.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-<p>None</p>
-
-<h2>Bug fixes</h2>
-<ul>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=103241">Bug 103241</a> - Anv crashes when using 64-bit vertex inputs</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=104926">Bug 104926</a> - swrast: Mesa 17.3.3 produces:  HW cursor for format 875713089 not supported</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107280">Bug 107280</a> - [DXVK] Batman: Arkham City with tessellation enabled hangs on SKL GT4</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107772">Bug 107772</a> - Mesa preprocessor matches if(def)s &amp; endifs incorrectly</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107779">Bug 107779</a> - Access violation with some games</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107810">Bug 107810</a> - The 'va_end' call is missed after 'va_copy' in 'util_vsnprintf' function under windows</li>
-
-</ul>
-
-<h2>Changes</h2>
-<p>Andrii Simiklit (4):</p>
-<ul>
-  <li>apple/glx/log: added missing va_end() after va_copy()</li>
-  <li>mesa/util: don't use the same 'va_list' instance twice</li>
-  <li>mesa/util: don't ignore NULL returned from 'malloc'</li>
-  <li>mesa/util: add missing va_end() after va_copy()</li>
-</ul>
-
-<p>Bas Nieuwenhuizen (4):</p>
-<ul>
-  <li>radv: Use build ID if available for cache UUID.</li>
-  <li>radv: Only allow 16 user SGPRs for compute on GFX9+.</li>
-  <li>radv: Set the user SGPR MSB for Vega.</li>
-  <li>radv: Fix driver UUID SHA1 init.</li>
-</ul>
-
-<p>Christopher Egert (1):</p>
-<ul>
-  <li>radeon: fix ColorMask</li>
-</ul>
-
-<p>Dave Airlie (1):</p>
-<ul>
-  <li>virgl: don't send a shader create with no data. (v2)</li>
-</ul>
-
-<p>Dylan Baker (10):</p>
-<ul>
-  <li>docs/relnotes: Add sha256 sums for mesa 18.1.8</li>
-  <li>cherry-ignore: Add additional 18.2 patch</li>
-  <li>meson: Print a message about why a libdrm version was selected</li>
-  <li>cherry-ignore: add another 18.2 patch</li>
-  <li>cherry-ignore: Add patches that don't apply cleanly and are for developer tools</li>
-  <li>cherry-ignore: Add more 18.2 patches</li>
-  <li>cherry-ignore: add 18.2 patchs</li>
-  <li>cherry-ignore: add a patch that was reverted on master</li>
-  <li>cherry-ignore: one final update</li>
-  <li>Bump version to 18.1.9</li>
-</ul>
-
-<p>Erik Faye-Lund (2):</p>
-<ul>
-  <li>winsys/virgl: avoid unintended behavior</li>
-  <li>virgl: adjust strides when mapping temp-resources</li>
-</ul>
-
-<p>Gert Wollny (1):</p>
-<ul>
-  <li>winsys/virgl: correct resource and handle allocation (v2)</li>
-</ul>
-
-<p>Jason Ekstrand (6):</p>
-<ul>
-  <li>anv/pipeline: Only consider double elements which actually exist</li>
-  <li>i965: Workaround the gen9 hw astc5x5 sampler bug</li>
-  <li>anv: Re-emit vertex buffers when the pipeline changes</li>
-  <li>anv: Disable the vertex cache when tessellating on SKL GT4</li>
-  <li>anv: Clamp scissors to the framebuffer boundary</li>
-  <li>anv/query: Write both dwords in emit_zero_queries</li>
-</ul>
-
-<p>Josh Pieper (1):</p>
-<ul>
-  <li>st/mesa: Validate the result of pipe_transfer_map in make_texture (v2)</li>
-</ul>
-
-<p>Kenneth Feng (1):</p>
-<ul>
-  <li>amd: Add Picasso device id</li>
-</ul>
-
-<p>Marek Olšák (4):</p>
-<ul>
-  <li>st/mesa: help fix stencil border color for GL_DEPTH_STENCIL textures</li>
-  <li>radeonsi: fix HTILE for NPOT textures with mipmapping on SI/CI</li>
-  <li>r600: fix HTILE for NPOT textures with mipmapping</li>
-  <li>radeonsi: fix printing a BO list into ddebug reports</li>
-</ul>
-
-<p>Mathias Fröhlich (1):</p>
-<ul>
-  <li>tnl: Fix green gun regression in xonotic.</li>
-</ul>
-
-<p>Mauro Rossi (3):</p>
-<ul>
-  <li>android: broadcom/genxml: fix collision with intel/genxml header-gen macro</li>
-  <li>android: broadcom/cle: add gallium include path</li>
-  <li>android: broadcom/cle: export the broadcom top level path headers</li>
-</ul>
-
-<p>Michal Srb (1):</p>
-<ul>
-  <li>st/dri: don't set queryDmaBufFormats/queryDmaBufModifiers if the driver does not implement it</li>
-</ul>
-
-<p>Michel Dänzer (1):</p>
-<ul>
-  <li>loader/dri3: Only wait for back buffer fences in dri3_get_buffer</li>
-</ul>
-
-<p>Pierre Moreau (1):</p>
-<ul>
-  <li>nvir: Always split 64-bit IMAD/IMUL operations</li>
-</ul>
-
-<p>Sergii Romantsov (1):</p>
-<ul>
-  <li>intel: compiler option msse2 and mstackrealign</li>
-</ul>
-
-<p>Timothy Arceri (1):</p>
-<ul>
-  <li>glsl: fixer lexer for unreachable defines</li>
-</ul>
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/18.2.0.html
+++ b/docs/relnotes/18.2.0.html
@@ -1,284 +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>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 18.2.0 Release Notes / September 7, 2018</h1>
-
-<p>
-Mesa 18.2.0 is a new development release. People who are concerned
-with stability and reliability should stick with a previous release or
-wait for Mesa 18.2.1.
-</p>
-<p>
-Mesa 18.2.0 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-</p>
-
-<p>
-libwayland-egl is now distributed by Wayland (since 1.15,
-<a href="https://lists.freedesktop.org/archives/wayland-devel/2018-April/037767.html">see announcement</a>),
-and has been removed from Mesa in this release. Make sure you're using
-an up-to-date version of Wayland to keep the functionality.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-b9e6bb3eb7660b0726ba28405ffa0cb77de619e925b910b72f4d7a85c0098596  mesa-18.2.0.tar.gz
-22452bdffff8e11bf4284278155a9f77cb28d6d73a12c507f1490732d0d9ddce  mesa-18.2.0.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-
-<p>
-Note: some of the new features are only available with certain drivers.
-</p>
-
-<ul>
-<li>OpenGL 4.3 on virgl</li>
-<li>OpenGL 4.4 Compatibility profile on radeonsi</li>
-<li>OpenGL ES 3.2 on radeonsi and virgl</li>
-<li>GL_ARB_ES3_2_compatibility on radeonsi</li>
-<li>GL_ARB_fragment_shader_interlock on i965</li>
-<li>GL_ARB_sample_locations and GL_NV_sample_locations on nvc0 (GM200+)</li>
-<li>GL_ANDROID_extension_pack_es31a on radeonsi.</li>
-<li>GL_KHR_texture_compression_astc_ldr on radeonsi</li>
-<li>GL_NV_conservative_raster and GL_NV_conservative_raster_dilate on nvc0 (GM200+)</li>
-<li>GL_NV_conservative_raster_pre_snap_triangles on nvc0 (GP102+)</li>
-<li>multisampled images on nvc0 (GM107+) (now supported on GF100+)</li>
-</ul>
-
-<h2>Bug fixes</h2>
-<ul>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=13728">Bug 13728</a> - [G965] Some objects in Neverwinter Nights Linux version not displayed correctly</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=61761">Bug 61761</a> - glPolygonOffsetEXT, OFFSET_BIAS incorrectly set to a huge number</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=65422">Bug 65422</a> - Rename api_validate.[ch] to draw_validate.[ch]</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=78097">Bug 78097</a> - glUniform1ui and friends not supported by display lists</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91808">Bug 91808</a> - trine1 misrender r600g</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=93355">Bug 93355</a> - [BXT,SKLGT4e] intermittent ext_framebuffer_multisample.accuracy fails</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=95009">Bug 95009</a> - [SNB] amd_shader_trinary_minmax.execution.built-in-functions.gs-mid3-ivec2-ivec2-ivec2 intermittent</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=95012">Bug 95012</a> - [SNB] glsl-1_50.execution.built-in-functions.gs-op tests intermittent</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98699">Bug 98699</a> - &quot;float[a+++4 ? 1:1] f;&quot; crashes glsl_compiler</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99116">Bug 99116</a> - Wine DirectDraw programs showing only a blackscreen when using Mesa Gallium drivers</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99730">Bug 99730</a> - Metro Redux game(s) needs override for midshader extension declaration</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=100177">Bug 100177</a> - [GM206] Misrendering in XCOM Ennemy Within</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=100430">Bug 100430</a> - [radv] graphical glitches on dolphin emulator</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=101247">Bug 101247</a> - Mesa fails to link GLSL programs with unused output blocks</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=102390">Bug 102390</a> - centroid interpolation causes broken attribute values</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=102678">Bug 102678</a> - gl_BaseVertex should always be zero when the draw command has no &lt;basevertex&gt; parameter</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=103274">Bug 103274</a> - BRW allocates too much heap memory</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=104388">Bug 104388</a> - [snb] GPU HANG: ecode 6:0:0x85fffff8 in fgfs</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=104626">Bug 104626</a> - broadcom/vc5: double compare</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=104809">Bug 104809</a> - anv: DOOM 2016 and Wolfenstein II:The New Colossus crash due to not having depthBoundsTest</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105351">Bug 105351</a> - [Gen6+] piglit's arb_shader_image_load_store-host-mem-barrier fails with a glGetTexSubImage fallback path</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105374">Bug 105374</a> - texture3d, a SaschaWillems demo, assert fails</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105396">Bug 105396</a> - tc compatible htile sets depth of htiles of discarded fragments to 1.0</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105399">Bug 105399</a> - [snb] GPU hang: after geometry shader emits no geometry, the program hangs</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105497">Bug 105497</a> - shader-db crashes on 72 core system after ast_type_qualifier bitset change</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105613">Bug 105613</a> - Compute shader locks up within nested &quot;for&quot; loop</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105731">Bug 105731</a> - linker error &quot;fragment shader input ... has no matching output in the previous stage&quot; when previous stage's output declaration in a separate shader object</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105904">Bug 105904</a> - Needed to delete mesa shader cache after driver upgrade for 32 bit wine vulkan programs to work.</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105975">Bug 105975</a> - i965 always reports 0 viewport subpixel bits</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106090">Bug 106090</a> - Compiling compute shader crashes RADV</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106133">Bug 106133</a> - make check &quot;OSError: [Errno 24] Too many open files&quot;</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106163">Bug 106163</a> - r600/sb: optimizer tries to schedule access to different array elements in one instruction group</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106174">Bug 106174</a> - vulkan dota2 broken (segfaulting), found bug commit</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106180">Bug 106180</a> - [bisected] radv vulkan smoke test black screen (Add support for DRI3 v1.2)</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106232">Bug 106232</a> - LLVM unit tests have error in random number handling</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106243">Bug 106243</a> - [kbl] GPU HANG: 9:0:0x85dffffb, in Cinnamon</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106315">Bug 106315</a> - The witness + dxvk suffers flickering garbage</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106331">Bug 106331</a> - radv doesnt support VK_FORMAT_R32G32B32_SFLOAT</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106382">Bug 106382</a> - Shader cache breaks INTEL_DEBUG=shader_time</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106393">Bug 106393</a> - glsl-fs-shader-stencil-export hangs forever</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106450">Bug 106450</a> - glGetIntegerv return wrong value in some cases</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106462">Bug 106462</a> - piglit.spec.arb_vertex_array_bgra.get regression</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106479">Bug 106479</a> - NDEBUG not defined for libamdgpu_addrlib</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106480">Bug 106480</a> - A2B10G10R10_SNORM vertex attribute doesn't work.</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106499">Bug 106499</a> - [regression, bisected] Several games crash on start</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106504">Bug 106504</a> - vulkan SPIR-V parsing failed at ../src/compiler/spirv/vtn_cfg.c:381</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106511">Bug 106511</a> - radv: MSAA broken on SI (assertion failure in vkCreateImage)</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106587">Bug 106587</a> - Dota2 is very dark when using vulkan render on a Intel &lt;&lt; AMD prime setup</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106594">Bug 106594</a> - [regression,apitrace,bisected] Prison Architect rendered unplayable by multicoloured flickering triangles and overlayed triangles when performing certain actions</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106619">Bug 106619</a> - [OpenCL][llvm-svn]build failure  addPassesToEmitFile candidate expects 6 arguments, 3 provided</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106629">Bug 106629</a> - [SNB,IVB,HSW,BDW] dEQP-EGL.functional.image.create.gles2_cubemap_negative_z_rgb_read_pixels</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106642">Bug 106642</a> - X server crashes in i965 on desktop startup when DRI3 v1.2 / modifier support is enabled</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106643">Bug 106643</a> - double free when exporting a temporarily imported semaphore</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106673">Bug 106673</a> - [bisected] Steam is unusable since commit 5c33e8c7</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106687">Bug 106687</a> - radv: Fast color clears use incorrect format</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106708">Bug 106708</a> - [SKL/KBL/GLK] 2-3% performance drop in SynMark DrvState and 5-9% drop on SynMark Multithread</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106748">Bug 106748</a> - st/mesa: use PIPE_CAP_GLSL_FEATURE_LEVEL_COMPATIBILITY broke qemu -display sdl,gl=on</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106756">Bug 106756</a> - Wine 3.9 crashes with DXVK on Just Cause 3 and Quantum Break on VEGA but works ON POLARIS</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106774">Bug 106774</a> - GLSL IR copy propagates loads of SSBOs</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106776">Bug 106776</a> - vma_random unrecognized command line option &quot;-std=c++11&quot;</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106778">Bug 106778</a> - Files missing from tarball - intel_sanitize_gpu.*</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106779">Bug 106779</a> - Files missing from tarball - u_debug_stack_android.cpp</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106784">Bug 106784</a> - 18.1.1 autotools build fail without mako</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106801">Bug 106801</a> - vma_random_test.cpp:239:18: error: non-constant-expression cannot be narrowed from type 'unsigned long' to 'uint_fast32_t' (aka 'unsigned int') in initializer list [-Wc++11-narrowing]</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106810">Bug 106810</a> - ProgramBinary does not switch program correctly when using transform feedback</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106823">Bug 106823</a> - Failed to recongnize keyword of shader code</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106830">Bug 106830</a> - [bisected] 32 bit tests (deqp, piglit, glcts, vulkancts) crashing on all platforms</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106861">Bug 106861</a> - fatal error: wayland-egl-backend.h: No such file or directory compilation terminated.</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106865">Bug 106865</a> - [GLK] piglit.spec.ext_framebuffer_multisample.accuracy stencil tests fail</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106903">Bug 106903</a> - radv: Fragment shader output goes to wrong attachments when render targets are sparse</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106906">Bug 106906</a> - Failed to recongnize keyword “sampler2DRect” and &quot;sampler2DRectShadow&quot;</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106907">Bug 106907</a> - Correct Transform Feedback Varyings information is expected after using ProgramBinary</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106912">Bug 106912</a> - radv: 16-bit depth buffer causes artifacts in Shadow Warrior 2</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106928">Bug 106928</a> - When starting a match Rocket League crashes on &quot;Go&quot;</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106941">Bug 106941</a> - Intel ANV vulkan driver exposing version 1.1.0 which is incorrect</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106986">Bug 106986</a> - glGetQueryiv error when querying number of result bits for GL_ANY_SAMPLES_PASSED_CONSERVATIVE</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106997">Bug 106997</a> - [Regression]. Dying light game is crashing on latest mesa</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107098">Bug 107098</a> - Segfault after munmap(kms_sw_dt-&gt;ro_mapped)</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107117">Bug 107117</a> - mesa-18.1: regression with TFP on intel with modesettings and glamor acceleration</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107190">Bug 107190</a> - Got seg fault on snb when use INTEL_DEBUG=bat</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107193">Bug 107193</a> - piglit.spec.arb_compute_shader.linker.bug-93840 fails</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107212">Bug 107212</a> - Dual-Core CPU E5500 / G45: RetroArch with reicast core results in corrupted graphics</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107223">Bug 107223</a> - [GEN9+] 50% perf drop in SynMark Fill* tests (E2E RBC gets disabled?)</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107248">Bug 107248</a> - [G45 ILK G965] Texture handling broken</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107275">Bug 107275</a> - NIR segfaults after spirv-opt</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107276">Bug 107276</a> - radv: OpBitfieldUExtract returns incorrect result when count is zero</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107295">Bug 107295</a> - Access violation on glDrawArrays with count &gt;= 2048</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107305">Bug 107305</a> - glsl/opt_copy_propagation_elements.cpp:72:9: error: delegating constructors are permitted only in C++11</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107312">Bug 107312</a> - Mesa-git RPM build fails after commit 8cacf38f527d42e41441ef8c25d95d4b2f4e8602</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107359">Bug 107359</a> - [Regression] [bisected] [OpenGL CTS] [SKL,BDW] KHR-GL46.texture_barrier*-texels, GTF-GL46.gtf21.GL2FixedTests.buffer_corners.buffer_corners, and GTF-GL46.gtf21.GL2FixedTests.stencil_plane_corners.stencil_plane_corners fail with some configuration</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107366">Bug 107366</a> - NIR verification crashes on piglit tests</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107423">Bug 107423</a> - vc4 build failure: &quot;v3d_decoder.c:893: undefined reference to `clif_lookup_bo'&quot;</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107443">Bug 107443</a> - Build error on arm64: v3d_decoder.c:837:17: error: format not a string literal and no format arguments [-Werror=format-security]</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107460">Bug 107460</a> - radv: OpControlBarrier does not always work correctly (bisected)</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107477">Bug 107477</a> - [DXVK] Setting high shader quality in GTA V results in LLVM error</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107510">Bug 107510</a> - [GEN8+] up to 10% perf drop on several 3D benchmarks</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107544">Bug 107544</a> - intel/decoder: out of bounds group_iter</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107550">Bug 107550</a> - &quot;0[2]&quot; as function parameter hits assert</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107579">Bug 107579</a> - [SNB] The graphic corruption when we reuse the GS compiled and used for TFB when statebuffer contain magic trash in the unused space</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107601">Bug 107601</a> - Rise of the Tomb Raider Segmentation Fault when the game starts</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107610">Bug 107610</a> - Dolphin emulator mis-renders shadow overlay in Super Mario Sunshine</li>
-
-</ul>
-
-<h2>Changes</h2>
-
-<ul>
-<li>Removed GL_EXT_polygon_offset applications should use glPolygonOffset instead.</li>
-<li>Removed libwayland-egl, now part of Wayland</li>
-</ul>
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/18.2.1.html
+++ b/docs/relnotes/18.2.1.html
@@ -1,227 +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>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 18.2.1 Release Notes / September 21, 2018</h1>
-
-<p>
-Mesa 18.2.1 is a bug fix release which fixes bugs found since the 18.2.0 release.
-</p>
-<p>
-Mesa 18.2.0 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-SHA256: 45419ccbe1bf9a2e15ffe71ced34615002e1b42c24b917fbe2b2f58ab1970562  mesa-18.2.1.tar.gz
-SHA256: 9636dc6f3d188abdcca02da97cedd73640d9035224efd5db724187d062c81056  mesa-18.2.1.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-<p>None</p>
-
-
-<h2>Bug fixes</h2>
-
-<ul>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=103241">Bug 103241</a> - Anv crashes when using 64-bit vertex inputs</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107280">Bug 107280</a> - [DXVK] Batman: Arkham City with tessellation enabled hangs on SKL GT4</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107772">Bug 107772</a> - Mesa preprocessor matches if(def)s &amp; endifs incorrectly</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107779">Bug 107779</a> - Access violation with some games</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107810">Bug 107810</a> - The 'va_end' call is missed after 'va_copy' in 'util_vsnprintf' function under windows</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107832">Bug 107832</a> - Gallium picking A16L16 formats when emulating INTENSITY16 conflicts with mesa</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107843">Bug 107843</a> - 32bit Mesa build failes with meson.</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107879">Bug 107879</a> - crash happens when link program</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107891">Bug 107891</a> - [wine, regression, bisected] RAGE, Wolfenstein The New Order hangs in menu</li>
-
-</ul>
-
-
-<h2>Changes</h2>
-
-<p>Andres Gomez (3):</p>
-<ul>
-  <li>docs: add sha256 checksums for 18.2.0</li>
-  <li>Revert "Revert "glsl: skip stringification in preprocessor if in unreachable branch""</li>
-  <li>cherry-ignore: i965/tools: 32bit compilation with meson</li>
-</ul>
-
-<p>Andrii Simiklit (4):</p>
-<ul>
-  <li>apple/glx/log: added missing va_end() after va_copy()</li>
-  <li>mesa/util: don't use the same 'va_list' instance twice</li>
-  <li>mesa/util: don't ignore NULL returned from 'malloc'</li>
-  <li>mesa/util: add missing va_end() after va_copy()</li>
-</ul>
-
-<p>Bas Nieuwenhuizen (5):</p>
-<ul>
-  <li>radv: Support v3 of VK_EXT_vertex_attribute_divisor.</li>
-  <li>radv: Set the user SGPR MSB for Vega.</li>
-  <li>radv: Only allow 16 user SGPRs for compute on GFX9+.</li>
-  <li>radv: Use build ID if available for cache UUID.</li>
-  <li>radv: Fix driver UUID SHA1 init.</li>
-</ul>
-
-<p>Christopher Egert (1):</p>
-<ul>
-  <li>radeon: fix ColorMask</li>
-</ul>
-
-<p>Dave Airlie (1):</p>
-<ul>
-  <li>virgl: don't send a shader create with no data. (v2)</li>
-</ul>
-
-<p>Dylan Baker (1):</p>
-<ul>
-  <li>meson: Print a message about why a libdrm version was selected</li>
-</ul>
-
-<p>Eric Anholt (2):</p>
-<ul>
-  <li>v3d: Fix SRC_ALPHA_SATURATE blending for RTs without alpha.</li>
-  <li>v3d: Fix setup of the VCM cache size.</li>
-</ul>
-
-<p>Erik Faye-Lund (2):</p>
-<ul>
-  <li>winsys/virgl: avoid unintended behavior</li>
-  <li>virgl: adjust strides when mapping temp-resources</li>
-</ul>
-
-<p>Fritz Koenig (2):</p>
-<ul>
-  <li>mesa: Additional FlipY applications</li>
-  <li>mesa: FramebufferParameteri parameter checking</li>
-</ul>
-
-<p>Gert Wollny (2):</p>
-<ul>
-  <li>winsys/virgl: correct resource and handle allocation (v2)</li>
-  <li>mesa/texture: Also check for LA texture when querying intensity component size</li>
-</ul>
-
-<p>Ian Romanick (1):</p>
-<ul>
-  <li>i965/fs: Don't propagate conditional modifiers from integer compares to adds</li>
-</ul>
-
-<p>Jason Ekstrand (11):</p>
-<ul>
-  <li>anv/pipeline: Only consider double elements which actually exist</li>
-  <li>i965: Workaround the gen9 hw astc5x5 sampler bug</li>
-  <li>anv: Re-emit vertex buffers when the pipeline changes</li>
-  <li>anv: Disable the vertex cache when tessellating on SKL GT4</li>
-  <li>anv: Clamp scissors to the framebuffer boundary</li>
-  <li>vulkan: Update the XML and headers to 1.1.84</li>
-  <li>anv: Support v3 of VK_EXT_vertex_attribute_divisor</li>
-  <li>anv/query: Write both dwords in emit_zero_queries</li>
-  <li>nir: Add a small pass to rematerialize derefs per-block</li>
-  <li>nir/loop_unroll: Re-materialize derefs in use blocks before unrolling</li>
-  <li>nir/opt_if: Re-materialize derefs in use blocks before peeling loops</li>
-</ul>
-
-<p>Josh Pieper (1):</p>
-<ul>
-  <li>st/mesa: Validate the result of pipe_transfer_map in make_texture (v2)</li>
-</ul>
-
-<p>Juan A. Suarez Romero (2):</p>
-<ul>
-  <li>cherry-ignore: radv: fix descriptor pool allocation size</li>
-  <li>Update version to 18.2.1</li>
-</ul>
-
-<p>Kenneth Feng (1):</p>
-<ul>
-  <li>amd: Add Picasso device id</li>
-</ul>
-
-<p>Marek Olšák (5):</p>
-<ul>
-  <li>radeonsi: fix HTILE for NPOT textures with mipmapping on SI/CI</li>
-  <li>winsys/radeon: fix CMASK fast clear for NPOT textures with mipmapping on SI/CI</li>
-  <li>r600: fix HTILE for NPOT textures with mipmapping</li>
-  <li>radeonsi: fix printing a BO list into ddebug reports</li>
-  <li>ac: revert new LLVM 7.0 behavior for fdiv</li>
-</ul>
-
-<p>Mathias Fröhlich (1):</p>
-<ul>
-  <li>tnl: Fix green gun regression in xonotic.</li>
-</ul>
-
-<p>Mauro Rossi (3):</p>
-<ul>
-  <li>android: broadcom/genxml: fix collision with intel/genxml header-gen macro</li>
-  <li>android: broadcom/cle: add gallium include path</li>
-  <li>android: broadcom/cle: export the broadcom top level path headers</li>
-</ul>
-
-<p>Michel Dänzer (1):</p>
-<ul>
-  <li>loader/dri3: Only wait for back buffer fences in dri3_get_buffer</li>
-</ul>
-
-<p>Pierre Moreau (1):</p>
-<ul>
-  <li>nvir: Always split 64-bit IMAD/IMUL operations</li>
-</ul>
-
-<p>Samuel Pitoiset (7):</p>
-<ul>
-  <li>radv: fix function names for VK_EXT_conditional_rendering</li>
-  <li>radv: fix VK_EXT_conditional_rendering visibility</li>
-  <li>radv: bump the maximum number of arguments to 64</li>
-  <li>radv: handle loc-&gt;indirect correctly for the first descriptor</li>
-  <li>radv: fix GPU hangs with 32-bit indirect descriptors</li>
-  <li>radv: fix flushing indirect descriptors</li>
-  <li>radv: fix setting global locations for indirect descriptors</li>
-</ul>
-
-<p>Sergii Romantsov (3):</p>
-<ul>
-  <li>intel: compiler option msse2 and mstackrealign</li>
-  <li>i965/tools: 32bit compilation with meson</li>
-  <li>mesa/meson: 32bit xmlconfig linkage</li>
-</ul>
-
-<p>Timothy Arceri (2):</p>
-<ul>
-  <li>glsl: fixer lexer for unreachable defines</li>
-  <li>Revert "radeonsi: avoid syncing the driver thread in si_fence_finish"</li>
-</ul>
-
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/18.2.2.html
+++ b/docs/relnotes/18.2.2.html
@@ -1,155 +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>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 18.2.2 Release Notes / October 5, 2018</h1>
-
-<p>
-Mesa 18.2.2 is a bug fix release which fixes bugs found since the 18.2.1 release.
-</p>
-<p>
-Mesa 18.2.2 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-SHA256: c51711168971957037cc7e3e19e8abe1ec6eeab9cf236d419a1e7728a41cac8a  mesa-18.2.2.tar.gz
-SHA256: c3ba82b12a89d3d9fed2bdd96b4702dbb7ab675034650a8b1b718320daf073c4  mesa-18.2.2.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-<p>None</p>
-
-
-<h2>Bug fixes</h2>
-
-<ul>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=104602">Bug 104602</a> - [apitrace] Graphical artifacts in Civilization VI on RX Vega</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=104926">Bug 104926</a> - swrast: Mesa 17.3.3 produces:  HW cursor for format 875713089 not supported</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107276">Bug 107276</a> - radv: OpBitfieldUExtract returns incorrect result when count is zero</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107786">Bug 107786</a> - [DXVK] MSAA reflections are broken in GTA V</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108024">Bug 108024</a> - [Debian Stretch]Fail to build because &quot;xcb_randr_lease_t&quot;</li>
-
-</ul>
-
-
-<h2>Changes</h2>
-
-<p>Alex Deucher (1):</p>
-<ul>
-  <li>pci_ids: add new polaris pci id</li>
-</ul>
-
-<p>Andres Rodriguez (1):</p>
-<ul>
-  <li>radv: only emit ZPASS_DONE for timestamp queries on gfx queues</li>
-</ul>
-
-<p>Axel Davy (3):</p>
-<ul>
-  <li>st/nine: Clamp RCP when 0*inf!=0</li>
-  <li>st/nine: Avoid redundant SetCursorPos calls</li>
-  <li>st/nine: Increase maximum number of temp registers</li>
-</ul>
-
-<p>Dylan Baker (1):</p>
-<ul>
-  <li>meson: Don't compile pipe loader with dri support when not using dri</li>
-</ul>
-
-<p>Eric Anholt (1):</p>
-<ul>
-  <li>vc4: Fix sin(0.0) and cos(0.0) accuracy to fix SDL rendering rotation.</li>
-</ul>
-
-<p>Eric Engestrom (1):</p>
-<ul>
-  <li>vulkan/wsi/display: check if wsi_swapchain_init() succeeded</li>
-</ul>
-
-<p>Jason Ekstrand (1):</p>
-<ul>
-  <li>anv,radv: Implement vkAcquireNextImage2</li>
-</ul>
-
-<p>Juan A. Suarez Romero (2):</p>
-<ul>
-  <li>docs: add sha256 checksums for 18.2.1</li>
-  <li>Update version to 18.2.2</li>
-</ul>
-
-<p>Leo Liu (1):</p>
-<ul>
-  <li>radeon/uvd: use bitstream coded number for symbols of Huffman tables</li>
-</ul>
-
-<p>Marek Olšák (2):</p>
-<ul>
-  <li>glsl_to_tgsi: invert gl_SamplePosition.y for the default framebuffer</li>
-  <li>radeonsi: NaN should pass kill_if</li>
-</ul>
-
-<p>Maxime (1):</p>
-<ul>
-  <li>vulkan: Disable randr lease for libxcb &lt; 1.13</li>
-</ul>
-
-<p>Michal Srb (1):</p>
-<ul>
-  <li>st/dri: don't set queryDmaBufFormats/queryDmaBufModifiers if the driver does not implement it</li>
-</ul>
-
-<p>Rhys Perry (2):</p>
-<ul>
-  <li>nvc0: Update counter reading shaders to new NVC0_CB_AUX_MP_INFO</li>
-  <li>nvc0: fix bindless multisampled images on Maxwell+</li>
-</ul>
-
-<p>Samuel Iglesias Gonsálvez (1):</p>
-<ul>
-  <li>anv: Add support for protected memory properties on anv_GetPhysicalDeviceProperties2()</li>
-</ul>
-
-<p>Samuel Pitoiset (1):</p>
-<ul>
-  <li>radv: use the resolve compute path if dest uses multiple layers</li>
-</ul>
-
-<p>Stuart Young (1):</p>
-<ul>
-  <li>docs: Update FAQ with respect to s3tc support</li>
-</ul>
-
-<p>Timothy Arceri (1):</p>
-<ul>
-  <li>radeonsi: add a workaround for bitfield_extract when count is 0</li>
-</ul>
-
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/18.2.3.html
+++ b/docs/relnotes/18.2.3.html
@@ -1,167 +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>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 18.2.3 Release Notes / October 19, 2018</h1>
-
-<p>
-Mesa 18.2.3 is a bug fix release which fixes bugs found since the 18.2.2 release.
-</p>
-<p>
-Mesa 18.2.3 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-0e13e2342eae74d8848df23595c4bb4b2f8874c9e1213b8466b1fbfa7ef99375  mesa-18.2.3.tar.gz
-e2bf83c17e1abdecb1ee81af22652e27e9aa38f963e95e60f34275cc0376304f  mesa-18.2.3.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-<p>None</p>
-
-
-<h2>Bug fixes</h2>
-
-<ul>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99507">Bug 99507</a> - Corrupted frame contents with Vulkan version of DOTA2, Talos Principle and Sascha Willems' demos when they're run Vsynched in fullscreen</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107857">Bug 107857</a> - GPU hang - GS_EMIT without shader outputs</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107926">Bug 107926</a> - [anv] Rise of the Tomb Raider always misrendering, segfault and gpu hang.</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108012">Bug 108012</a> - Compiler crashes on access of non-existent member incremental operations</li>
-
-</ul>
-
-
-<h2>Changes</h2>
-
-<p>Boyuan Zhang (1):</p>
-<ul>
-  <li>st/va: use provided sizes and coords for vlVaGetImage</li>
-</ul>
-
-<p>Dave Airlie (1):</p>
-<ul>
-  <li>anv: add missing unlock in error path.</li>
-</ul>
-
-<p>Dylan Baker (1):</p>
-<ul>
-  <li>meson: Don't allow building EGL on Windows or MacOS</li>
-</ul>
-
-<p>Emil Velikov (5):</p>
-<ul>
-  <li>st/nine: do not double-close the fd on teardown</li>
-  <li>egl: make eglSwapInterval a no-op for !window surfaces</li>
-  <li>egl: make eglSwapBuffers* a no-op for !window surfaces</li>
-  <li>vl/dri3: do full teardown on screen_destroy</li>
-  <li>Revert "mesa: remove unnecessary 'sort by year' for the GL extensions"</li>
-</ul>
-
-<p>Eric Engestrom (1):</p>
-<ul>
-  <li>radv: add missing meson c++ visibility arguments</li>
-</ul>
-
-<p>Fritz Koenig (1):</p>
-<ul>
-  <li>i965: Replace checks for rb-&gt;Name with FlipY (v2)</li>
-</ul>
-
-<p>Gert Wollny (1):</p>
-<ul>
-  <li>virgl, vtest: Correct the transfer size calculation</li>
-</ul>
-
-<p>Ilia Mirkin (4):</p>
-<ul>
-  <li>glsl: fix array assignments of a swizzled vector</li>
-  <li>nv50,nvc0: mark RGBX_UINT formats as renderable</li>
-  <li>nv50,nvc0: guard against zero-size blits</li>
-  <li>nvc0: fix blitting red to srgb8_alpha</li>
-</ul>
-
-<p>Jason Ekstrand (7):</p>
-<ul>
-  <li>nir/cf: Remove phi sources if needed in nir_handle_add_jump</li>
-  <li>anv: Use separate MOCS settings for external BOs</li>
-  <li>intel/fs: Fix a typo in need_matching_subreg_offset</li>
-  <li>nir/from_ssa: Don't rewrite derefs destinations to registers</li>
-  <li>anv/batch_chain: Don't start a new BO just for BATCH_BUFFER_START</li>
-  <li>nir/alu_to_scalar: Use ssa_for_alu_src in hand-rolled expansions</li>
-  <li>intel: Don't propagate conditional modifiers if a UD source is negated</li>
-</ul>
-
-<p>Juan A. Suarez Romero (2):</p>
-<ul>
-  <li>docs: add sha256 checksums for 18.2.2</li>
-  <li>Update version to 18.2.3</li>
-</ul>
-
-<p>Józef Kucia (1):</p>
-<ul>
-  <li>radeonsi: avoid sending GS_EMIT in shaders without outputs</li>
-</ul>
-
-<p>Marek Olšák (1):</p>
-<ul>
-  <li>drirc: add a workaround for ARMA 3</li>
-</ul>
-
-<p>Samuel Pitoiset (1):</p>
-<ul>
-  <li>radv: add a workaround for a VGT hang with prim restart and strips</li>
-</ul>
-
-<p>Tapani Pälli (1):</p>
-<ul>
-  <li>glsl: do not attempt assignment if operand type not parsed correctly</li>
-</ul>
-
-<p>Timothy Arceri (11):</p>
-<ul>
-  <li>glsl: ignore trailing whitespace when define redefined</li>
-  <li>util: disable cache if we have no build-id and timestamp is zero</li>
-  <li>util: rename timestamp param in disk_cache_create()</li>
-  <li>util: add disk_cache_get_function_identifier()</li>
-  <li>radeonsi: use build-id when available for disk cache</li>
-  <li>nouveau: use build-id when available for disk cache</li>
-  <li>r600: use build-id when available for disk cache</li>
-  <li>mesa/st: add force_compat_profile option to driconfig</li>
-  <li>util: use force_compat_profile for Wolfenstein The Old Blood</li>
-  <li>util: better handle program names from wine</li>
-  <li>util: add drirc workarounds for RAGE</li>
-</ul>
-
-<p>Vinson Lee (1):</p>
-<ul>
-  <li>r600/sb: Fix constant-logical-operand warning.</li>
-</ul>
-
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/18.2.4.html
+++ b/docs/relnotes/18.2.4.html
@@ -1,154 +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>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 18.2.4 Release Notes / October 31, 2018</h1>
-
-<p>
-Mesa 18.2.4 is a bug fix release which fixes bugs found since the 18.2.4 release.
-</p>
-<p>
-Mesa 18.2.4 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-968bfe78605e9397ddf244933b1fa62edb8429fc55aaec2ae7e20bb1c82abdea  mesa-18.2.4.tar.gz
-621d1aebb57876d5b6a5d2dcf4eb7e0620e650c6fe5cf3655c65e243adc9cb4e  mesa-18.2.4.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-<p>None</p>
-
-
-<h2>Bug fixes</h2>
-
-<ul>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107865">Bug 107865</a> - swr fail to build with llvm-libs 6.0.1</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108272">Bug 108272</a> - [polaris10] opencl-mesa: Anything using OpenCL segfaults, XFX Radeon RX 580</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108524">Bug 108524</a> - [RADV]  GPU lockup on event synchronization</li>
-
-</ul>
-
-
-<h2>Changes</h2>
-
-<p>Alex Smith (2):</p>
-<ul>
-  <li>ac/nir: Use context-specific LLVM types</li>
-  <li>anv: Fix sanitization of stencil state when the depth test is disabled</li>
-</ul>
-
-<p>Alok Hota (2):</p>
-<ul>
-  <li>swr/rast: ignore CreateElementUnorderedAtomicMemCpy</li>
-  <li>swr/rast: fix intrinsic/function for LLVM 7 compatibility</li>
-</ul>
-
-<p>Andres Rodriguez (1):</p>
-<ul>
-  <li>radv: fix check for perftest options size</li>
-</ul>
-
-<p>Bas Nieuwenhuizen (1):</p>
-<ul>
-  <li>radv: Emit enqueued pipeline barriers on event write.</li>
-</ul>
-
-<p>Connor Abbott (2):</p>
-<ul>
-  <li>ac: Introduce ac_build_expand()</li>
-  <li>ac: Fix loading a dvec3 from an SSBO</li>
-</ul>
-
-<p>David McFarland (1):</p>
-<ul>
-  <li>util: Change remaining uint32 cache ids to sha1</li>
-</ul>
-
-<p>Dylan Baker (1):</p>
-<ul>
-  <li>meson: don't require libelf for r600 without LLVM</li>
-</ul>
-
-<p>Elie Tournier (1):</p>
-<ul>
-  <li>gallium: Correctly handle no config context creation</li>
-</ul>
-
-<p>Eric Engestrom (1):</p>
-<ul>
-  <li>radv: s/abs/fabsf/ for floats</li>
-</ul>
-
-<p>Jan Vesely (1):</p>
-<ul>
-  <li>radeonsi: Bump number of allowed global buffers to 32</li>
-</ul>
-
-<p>Jason Ekstrand (3):</p>
-<ul>
-  <li>spirv: Use the right bit-size for spec constant ops</li>
-  <li>blorp: Emit a dummy 3DSTATE_WM prior to 3DSTATE_WM_HZ_OP</li>
-  <li>anv: Flag semaphore BOs as external</li>
-</ul>
-
-<p>Juan A. Suarez Romero (3):</p>
-<ul>
-  <li>docs: add sha256 checksums for 18.2.3</li>
-  <li>cherry-ignore: Revert "anv/skylake: disable ForceThreadDispatchEnable"</li>
-  <li>Update version to 18.2.4</li>
-</ul>
-
-<p>Liviu Prodea (1):</p>
-<ul>
-  <li>scons: Put to rest zombie texture_float build option.</li>
-</ul>
-
-<p>Marek Olšák (1):</p>
-<ul>
-  <li>radeonsi: fix a VGT hang with primitive restart on Polaris10 and later</li>
-</ul>
-
-<p>Michel Dänzer (1):</p>
-<ul>
-  <li>loader/dri3: Also wait for front buffer fence if we triggered it</li>
-</ul>
-
-<p>Nanley Chery (1):</p>
-<ul>
-  <li>intel/blorp: Define the clear value bounds for HiZ clears</li>
-</ul>
-
-<p>Rob Clark (2):</p>
-<ul>
-  <li>freedreno: fix inorder rendering case</li>
-  <li>freedreno: don't flush when new and old pfb is identical</li>
-</ul>
-
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/18.2.5.html
+++ b/docs/relnotes/18.2.5.html
@@ -1,172 +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>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 18.2.5 Release Notes / November 15, 2018</h1>
-
-<p>
-Mesa 18.2.5 is a bug fix release which fixes bugs found since the 18.2.4 release.
-</p>
-<p>
-Mesa 18.2.5 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-dddc28928b6f4083a0d5120b58c1c8e2dc189ab5c14299c08a386607fdbbdce7  mesa-18.2.5.tar.gz
-b12c32872832e5353155e1e8026e1f1ab75bba9dc5b178d712045684d26c2b73  mesa-18.2.5.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-<p>None</p>
-
-
-<h2>Bug fixes</h2>
-
-<ul>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105731">Bug 105731</a> - linker error &quot;fragment shader input ... has no matching output in the previous stage&quot; when previous stage's output declaration in a separate shader object</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107511">Bug 107511</a> - KHR/khrplatform.h not always installed when needed</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107626">Bug 107626</a> - [SNB] The graphical corruption and GPU hang occur sometimes on the piglit test &quot;arb_texture_multisample-large-float-texture&quot; with parameter --fp16</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108082">Bug 108082</a> - warning: unknown warning option '-Wno-format-truncation' [-Wunknown-warning-option]</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108560">Bug 108560</a> - Mesa 32 is built without sse</li>
-
-</ul>
-
-
-<h2>Changes</h2>
-
-<p>Andre Heider (1):</p>
-<ul>
-  <li>st/nine: fix stack corruption due to ABI mismatch</li>
-</ul>
-
-<p>Andrii Simiklit (1):</p>
-<ul>
-  <li>i965/batch: don't ignore the 'brw_new_batch' call for a 'new batch'</li>
-</ul>
-
-<p>Dylan Baker (2):</p>
-<ul>
-  <li>meson: link gallium nine with pthreads</li>
-  <li>meson: fix libatomic tests</li>
-</ul>
-
-<p>Emil Velikov (2):</p>
-<ul>
-  <li>egl/glvnd: correctly report errors when vendor cannot be found</li>
-  <li>m4: add Werror when checking for compiler flags</li>
-</ul>
-
-<p>Eric Engestrom (6):</p>
-<ul>
-  <li>svga: add missing meson build dependency</li>
-  <li>clover: add missing meson build dependency</li>
-  <li>wsi/wayland: use proper VkResult type</li>
-  <li>wsi/wayland: only finish() a successfully init()ed display</li>
-  <li>configure: install KHR/khrplatform.h when needed</li>
-  <li>meson: install KHR/khrplatform.h when needed</li>
-</ul>
-
-<p>Gert Wollny (1):</p>
-<ul>
-  <li>virgl/vtest-winsys: Use virgl version of bind flags</li>
-</ul>
-
-<p>Jonathan Gray (1):</p>
-<ul>
-  <li>intel/tools: include stdarg.h in error2aub</li>
-</ul>
-
-<p>Juan A. Suarez Romero (4):</p>
-<ul>
-  <li>docs: add sha256 checksums for 18.2.4</li>
-  <li>cherry-ignore: add explicit 18.3 only nominations</li>
-  <li>cherry-ignore: i965/batch: avoid reverting batch buffer if saved state is an empty</li>
-  <li>Update version to 18.2.5</li>
-</ul>
-
-<p>Lionel Landwerlin (1):</p>
-<ul>
-  <li>anv/android: mark gralloc allocated BOs as external</li>
-</ul>
-
-<p>Marek Olšák (3):</p>
-<ul>
-  <li>ac: fix ac_build_fdiv for f64</li>
-  <li>st/va: fix incorrect use of resource_destroy</li>
-  <li>include: update GL &amp; GLES headers (v2)</li>
-</ul>
-
-<p>Matt Turner (2):</p>
-<ul>
-  <li>util/ralloc: Switch from DEBUG to NDEBUG</li>
-  <li>util/ralloc: Make sizeof(linear_header) a multiple of 8</li>
-</ul>
-
-<p>Olivier Fourdan (1):</p>
-<ul>
-  <li>wayland/egl: Resize EGL surface on update buffer for swrast</li>
-</ul>
-
-<p>Rhys Perry (1):</p>
-<ul>
-  <li>glsl_to_tgsi: don't create 64-bit integer MAD/FMA</li>
-</ul>
-
-<p>Samuel Pitoiset (2):</p>
-<ul>
-  <li>radv: disable conditional rendering for vkCmdCopyQueryPoolResults()</li>
-  <li>radv: only expose VK_SUBGROUP_FEATURE_ARITHMETIC_BIT for VI+</li>
-</ul>
-
-<p>Sergii Romantsov (1):</p>
-<ul>
-  <li>autotools: library-dependency when no sse and 32-bit</li>
-</ul>
-
-<p>Timothy Arceri (4):</p>
-<ul>
-  <li>st/mesa: calculate buffer size correctly for packed uniforms</li>
-  <li>st/glsl_to_nir: fix next_stage gathering</li>
-  <li>nir: add glsl_type_is_integer() helper</li>
-  <li>nir: don't pack varyings ints with floats unless flat</li>
-</ul>
-
-<p>Vadym Shovkoplias (1):</p>
-<ul>
-  <li>glsl/linker: Fix out variables linking during single stage</li>
-</ul>
-
-<p>Vinson Lee (1):</p>
-<ul>
-  <li>r600/sb: Fix constant logical operand in assert.</li>
-</ul>
-
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/18.2.6.html
+++ b/docs/relnotes/18.2.6.html
@@ -1,179 +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>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 18.2.6 Release Notes / November 28, 2018</h1>
-
-<p>
-Mesa 18.2.6 is a bug fix release which fixes bugs found since the 18.2.5 release.
-</p>
-<p>
-Mesa 18.2.6 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-e0ea1236dbc6c412b02e1b5d7f838072525971a6630246fa82ae4466a6d8a587  mesa-18.2.6.tar.gz
-9ebafa4f8249df0c718e93b9ca155e3593a1239af303aa2a8b0f2056a7efdc12  mesa-18.2.6.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-<p>None</p>
-
-
-<h2>Bug fixes</h2>
-
-<ul>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107626">Bug 107626</a> - [SNB] The graphical corruption and GPU hang occur sometimes on the piglit test &quot;arb_texture_multisample-large-float-texture&quot; with parameter --fp16</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107856">Bug 107856</a> - i965 incorrectly calculates the number of layers for texture views (assert)</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108630">Bug 108630</a> - [G965] piglit.spec.!opengl 1_2.tex3d-maxsize spins forever</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108713">Bug 108713</a> - Gallium: use after free with transform feedback</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108829">Bug 108829</a> - [meson] libglapi exports internal API</li>
-
-</ul>
-
-
-<h2>Changes</h2>
-
-<p>Andrii Simiklit (1):</p>
-<ul>
-  <li>i965/batch: avoid reverting batch buffer if saved state is an empty</li>
-</ul>
-
-<p>Bas Nieuwenhuizen (1):</p>
-<ul>
-  <li>radv: Fix opaque metadata descriptor last layer.</li>
-</ul>
-
-<p>Brian Paul (1):</p>
-<ul>
-  <li>scons/svga: remove opt from the list of valid build types</li>
-</ul>
-
-<p>Danylo Piliaiev (1):</p>
-<ul>
-  <li>i965: Fix calculation of layers array length for isl_view</li>
-</ul>
-
-<p>Dylan Baker (2):</p>
-<ul>
-  <li>meson: Don't set -Wall</li>
-  <li>meson: Don't force libva to required from auto</li>
-</ul>
-
-<p>Emil Velikov (13):</p>
-<ul>
-  <li>bin/get-pick-list.sh: simplify git oneline printing</li>
-  <li>bin/get-pick-list.sh: prefix output with "[stable] "</li>
-  <li>bin/get-pick-list.sh: handle "typod" usecase.</li>
-  <li>bin/get-pick-list.sh: handle the fixes tag</li>
-  <li>bin/get-pick-list.sh: tweak the commit sha matching pattern</li>
-  <li>bin/get-pick-list.sh: flesh out is_sha_nomination</li>
-  <li>bin/get-pick-list.sh: handle fixes tag with missing colon</li>
-  <li>bin/get-pick-list.sh: handle unofficial "broken by" tag</li>
-  <li>bin/get-pick-list.sh: use test instead of [ ]</li>
-  <li>bin/get-pick-list.sh: handle reverts prior to the branchpoint</li>
-  <li>travis: drop unneeded x11proto-xf86vidmode-dev</li>
-  <li>glx: make xf86vidmode mandatory for direct rendering</li>
-  <li>travis: adding missing x11-xcb for meson+vulkan</li>
-</ul>
-
-<p>Eric Anholt (1):</p>
-<ul>
-  <li>vc4: Make sure we make ro scanout resources for create_with_modifiers.</li>
-</ul>
-
-<p>Eric Engestrom (5):</p>
-<ul>
-  <li>meson: only run vulkan's meson.build when building vulkan</li>
-  <li>gbm: remove unnecessary meson include</li>
-  <li>meson: fix wayland-less builds</li>
-  <li>egl: add missing glvnd entrypoint for EGL_ANDROID_blob_cache</li>
-  <li>glapi: add missing visibility args</li>
-</ul>
-
-<p>Erik Faye-Lund (1):</p>
-<ul>
-  <li>mesa/main: remove bogus error for zero-sized images</li>
-</ul>
-
-<p>Gert Wollny (3):</p>
-<ul>
-  <li>mesa: Reference count shaders that are used by transform feedback objects</li>
-  <li>r600: clean up the GS ring buffers when the context is destroyed</li>
-  <li>glsl: free or reuse memory allocated for TF varying</li>
-</ul>
-
-<p>Jason Ekstrand (2):</p>
-<ul>
-  <li>nir/lower_alu_to_scalar: Don't try to lower unpack_32_2x16</li>
-  <li>anv: Put robust buffer access in the pipeline hash</li>
-</ul>
-
-<p>Juan A. Suarez Romero (6):</p>
-<ul>
-  <li>cherry-ignore: add explicit 18.3 only nominations</li>
-  <li>cherry-ignore: intel/aub_viewer: fix dynamic state printing</li>
-  <li>cherry-ignore: intel/aub_viewer: Print blend states properly</li>
-  <li>cherry-ignore: mesa/main: fix incorrect depth-error</li>
-  <li>docs: add sha256 checksums for 18.2.5</li>
-  <li>Update version to 18.2.6</li>
-</ul>
-
-<p>Karol Herbst (1):</p>
-<ul>
-  <li>nir/spirv: cast shift operand to u32</li>
-</ul>
-
-<p>Kenneth Graunke (1):</p>
-<ul>
-  <li>i965: Add PCI IDs for new Amberlake parts that are Coffeelake based</li>
-</ul>
-
-<p>Lionel Landwerlin (1):</p>
-<ul>
-  <li>egl/dri: fix error value with unknown drm format</li>
-</ul>
-
-<p>Marek Olšák (2):</p>
-<ul>
-  <li>winsys/amdgpu: fix a buffer leak in amdgpu_bo_from_handle</li>
-  <li>winsys/amdgpu: fix a device handle leak in amdgpu_winsys_create</li>
-</ul>
-
-<p>Rodrigo Vivi (4):</p>
-<ul>
-  <li>i965: Add a new CFL PCI ID.</li>
-  <li>intel: aubinator: Adding missed platforms to the error message.</li>
-  <li>intel: Introducing Amber Lake platform</li>
-  <li>intel: Introducing Whiskey Lake platform</li>
-</ul>
-
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/18.2.7.html
+++ b/docs/relnotes/18.2.7.html
@@ -1,167 +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>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 18.2.7 Release Notes / December 13, 2018</h1>
-
-<p>
-Mesa 18.2.7 is a bug fix release which fixes bugs found since the 18.2.6 release.
-</p>
-<p>
-Mesa 18.2.7 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-092351cfbcd430ec595fbd3a3d8d253fd62c29074e1740d7198b00289ab400f8  mesa-18.2.7.tar.gz
-9c7b02560d89d77ca279cd21f36ea9a49e9ffc5611f6fe35099357d744d07ae6  mesa-18.2.7.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-<p>None</p>
-
-
-<h2>Bug fixes</h2>
-
-<ul>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106577">Bug 106577</a> - broken rendering with nine and nouveau (GM107)</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108245">Bug 108245</a> - RADV/Vega: Low mip levels of large BCn textures get corrupted by vkCmdCopyBufferToImage</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108311">Bug 108311</a> - Query buffer object support is broken on r600.</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108894">Bug 108894</a> - [anv] vkCmdCopyBuffer() and vkCmdCopyQueryPoolResults() write-after-write hazard</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108909">Bug 108909</a> - Vkd3d test failure test_resolve_non_issued_query_data()</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108914">Bug 108914</a> - blocky shadow artifacts in The Forest with DXVK, RADV_DEBUG=nohiz fixes this</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108925">Bug 108925</a> - vkCmdCopyQueryPoolResults(VK_QUERY_RESULT_WAIT_BIT) for timestamps with large query count hangs</li>
-
-</ul>
-
-
-<h2>Changes</h2>
-
-<p>Alex Smith (1):</p>
-<ul>
-  <li>radv: Flush before vkCmdWriteTimestamp() if needed</li>
-</ul>
-
-<p>Bas Nieuwenhuizen (4):</p>
-<ul>
-  <li>radv: Align large buffers to the fragment size.</li>
-  <li>radv: Clamp gfx9 image view extents to the allocated image extents.</li>
-  <li>radv/android: Mark android WSI image as shareable.</li>
-  <li>radv/android: Use buffer metadata to determine scanout compat.</li>
-</ul>
-
-<p>Dave Airlie (2):</p>
-<ul>
-  <li>r600: make suballocator 256-bytes align</li>
-  <li>radv: use 3d shader for gfx9 copies if dst is 3d</li>
-</ul>
-
-<p>Emil Velikov (2):</p>
-<ul>
-  <li>egl/wayland: bail out when drmGetMagic fails</li>
-  <li>egl/wayland: plug memory leak in drm_handle_device()</li>
-</ul>
-
-<p>Eric Anholt (3):</p>
-<ul>
-  <li>v3d: Fix a leak of the transfer helper on screen destroy.</li>
-  <li>vc4: Fix a leak of the transfer helper on screen destroy.</li>
-  <li>v3d: Fix a leak of the disassembled instruction string during debug dumps.</li>
-</ul>
-
-<p>Eric Engestrom (3):</p>
-<ul>
-  <li>anv: correctly use vulkan 1.0 by default</li>
-  <li>wsi/display: fix mem leak when freeing swapchains</li>
-  <li>vulkan/wsi: fix s/,/;/ typo</li>
-</ul>
-
-<p>Gurchetan Singh (3):</p>
-<ul>
-  <li>virgl: quadruple command buffer size</li>
-  <li>virgl: avoid large inline transfers</li>
-  <li>virgl: don't mark buffers as unclean after a write</li>
-</ul>
-
-<p>Juan A. Suarez Romero (4):</p>
-<ul>
-  <li>docs: add sha256 checksums for 18.2.6</li>
-  <li>cherry-ignore: freedreno: Fix autotools build.</li>
-  <li>cherry-ignore: mesa: Revert INTEL_fragment_shader_ordering support</li>
-  <li>Update version to 18.2.7</li>
-</ul>
-
-<p>Karol Herbst (1):</p>
-<ul>
-  <li>nv50,nvc0: Fix gallium nine regression regarding sampler bindings</li>
-</ul>
-
-<p>Lionel Landwerlin (2):</p>
-<ul>
-  <li>anv: flush pipeline before query result copies</li>
-  <li>anv/query: flush render target before copying results</li>
-</ul>
-
-<p>Michal Srb (2):</p>
-<ul>
-  <li>gallium: Constify drisw_loader_funcs struct</li>
-  <li>drisw: Use separate drisw_loader_funcs for shm</li>
-</ul>
-
-<p>Nicolai Hähnle (2):</p>
-<ul>
-  <li>egl/wayland: rather obvious build fix</li>
-  <li>meson: link LLVM 'native' component when LLVM is available</li>
-</ul>
-
-<p>Samuel Pitoiset (1):</p>
-<ul>
-  <li>radv: rework the TC-compat HTILE hardware bug with COND_EXEC</li>
-</ul>
-
-<p>Thomas Hellstrom (2):</p>
-<ul>
-  <li>st/xa: Fix a memory leak</li>
-  <li>winsys/svga: Fix a memory leak</li>
-</ul>
-
-<p>Tobias Klausmann (1):</p>
-<ul>
-  <li>amd/vulkan: meson build - use radv_deps for libvulkan_radeon</li>
-</ul>
-
-<p>Vinson Lee (1):</p>
-<ul>
-  <li>st/xvmc: Add X11 include path.</li>
-</ul>
-
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/18.2.8.html
+++ b/docs/relnotes/18.2.8.html
@@ -1,183 +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>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 18.2.8 Release Notes / December 27, 2018</h1>
-
-<p>
-Mesa 18.2.8 is a bug fix release which fixes bugs found since the 18.2.7 release.
-</p>
-<p>
-Mesa 18.2.8 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-77512edc0a84e19c7131a0e2e5ebf1beaf1494dc4b71508fcc92d06d65f9f4f5  mesa-18.2.8.tar.gz
-1d2ed9fd435d86d95b7215b287258d3e6b1180293a36f688e5a2efc18298d863  mesa-18.2.8.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-<p>None</p>
-
-
-<h2>Bug fixes</h2>
-
-<ul>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108114">Bug 108114</a> - [vulkancts] new VK_KHR_16bit_storage tests fail.</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108116">Bug 108116</a> - [vulkancts] stencil partial clear tests fail.</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108910">Bug 108910</a> - Vkd3d test failure test_multisample_array_texture()</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108911">Bug 108911</a> - Vkd3d test failure test_clear_render_target_view()</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=109081">Bug 109081</a> - [bisected] [HSW] Regression in clipping.user_defined.clip_* vulkancts tests</li>
-
-</ul>
-
-
-<h2>Changes</h2>
-
-<p>Alex Deucher (3):</p>
-<ul>
-  <li>pci_ids: add new vega10 pci ids</li>
-  <li>pci_ids: add new vega20 pci id</li>
-  <li>pci_ids: add new VegaM pci id</li>
-</ul>
-
-<p>Axel Davy (3):</p>
-<ul>
-  <li>st/nine: Fix volumetexture dtor on ctor failure</li>
-  <li>st/nine: Bind src not dst in nine_context_box_upload</li>
-  <li>st/nine: Add src reference to nine_context_range_upload</li>
-</ul>
-
-<p>Caio Marcelo de Oliveira Filho (1):</p>
-<ul>
-  <li>nir: properly clear the entry sources in copy_prop_vars</li>
-</ul>
-
-<p>Dylan Baker (1):</p>
-<ul>
-  <li>meson: Fix ppc64 little endian detection</li>
-</ul>
-
-<p>Emil Velikov (9):</p>
-<ul>
-  <li>glx: mandate xf86vidmode only for "drm" dri platforms</li>
-  <li>bin/get-pick-list.sh: rework handing of sha nominations</li>
-  <li>bin/get-pick-list.sh: warn when commit lists invalid sha</li>
-  <li>meson: don't require glx/egl/gbm with gallium drivers</li>
-  <li>pipe-loader: meson: reference correct library</li>
-  <li>TODO: glx: meson: build dri based glx tests, only with -Dglx=dri</li>
-  <li>glx: meson: drop includes from a link-only library</li>
-  <li>glx: meson: wire up the dispatch-index-check test</li>
-  <li>glx/test: meson: assorted include fixes</li>
-</ul>
-
-<p>Eric Anholt (2):</p>
-<ul>
-  <li>v3d: Make sure that a thrsw doesn't split a multop from its umul24.</li>
-  <li>v3d: Add missing flagging of SYNCB as a TSY op.</li>
-</ul>
-
-<p>Erik Faye-Lund (2):</p>
-<ul>
-  <li>virgl: wrap vertex element state in a struct</li>
-  <li>virgl: work around bad assumptions in virglrenderer</li>
-</ul>
-
-<p>Iago Toral Quiroga (1):</p>
-<ul>
-  <li>intel/compiler: do not copy-propagate strided regions to ddx/ddy arguments</li>
-</ul>
-
-<p>Ian Romanick (2):</p>
-<ul>
-  <li>i965/vec4/dce: Don't narrow the write mask if the flags are used</li>
-  <li>Revert "nir/lower_indirect: Bail early if modes == 0"</li>
-</ul>
-
-<p>Jan Vesely (1):</p>
-<ul>
-  <li>clover: Fix build after clang r348827</li>
-</ul>
-
-<p>Jason Ekstrand (1):</p>
-<ul>
-  <li>nir/constant_folding: Fix source bit size logic</li>
-</ul>
-
-<p>Jon Turney (1):</p>
-<ul>
-  <li>glx: Fix compilation with GLX_USE_WINDOWSGL</li>
-</ul>
-
-<p>Juan A. Suarez Romero (7):</p>
-<ul>
-  <li>docs: add sha256 checksums for 18.2.7</li>
-  <li>cherry-ignore: add explicit 18.3 only nominations</li>
-  <li>cherry-ignore: meson: libfreedreno depends upon libdrm (for fence support)</li>
-  <li>cherry-ignore: radv: Fix multiview depth clears</li>
-  <li>cherry-ignore: nir: properly find the entry to keep in copy_prop_vars</li>
-  <li>cherry-ignore: intel/compiler: move nir_lower_bool_to_int32 before nir_lower_locals_to_regs</li>
-  <li>Update version to 18.2.8</li>
-</ul>
-
-<p>Kirill Burtsev (1):</p>
-<ul>
-  <li>loader: free error state, when checking the drawable type</li>
-</ul>
-
-<p>Lionel Landwerlin (1):</p>
-<ul>
-  <li>anv: don't do partial resolve on layer &gt; 0</li>
-</ul>
-
-<p>Rhys Perry (2):</p>
-<ul>
-  <li>radv: don't set surf_index for stencil-only images</li>
-  <li>ac: split 16-bit ssbo loads that may not be dword aligned</li>
-</ul>
-
-<p>Rob Clark (1):</p>
-<ul>
-  <li>mesa/st/nir: fix missing nir_compact_varyings</li>
-</ul>
-
-<p>Samuel Pitoiset (1):</p>
-<ul>
-  <li>radv: switch on EOP when primitive restart is enabled with triangle strips</li>
-</ul>
-
-<p>Vinson Lee (2):</p>
-<ul>
-  <li>meson: Fix typo.</li>
-  <li>meson: Fix libsensors detection.</li>
-</ul>
-
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/18.3.0.html
+++ b/docs/relnotes/18.3.0.html
@@ -1,283 +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>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 18.3.0 Release Notes / December 7, 2018</h1>
-
-<p>
-Mesa 18.3.0 is a new development release. People who are concerned
-with stability and reliability should stick with a previous release or
-wait for Mesa 18.3.1.
-</p>
-<p>
-Mesa 18.3.0 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-</p>
-
-<p>
-libwayland-egl is now distributed by Wayland (since 1.15,
-<a href="https://lists.freedesktop.org/archives/wayland-devel/2018-April/037767.html">see announcement</a>),
-and has been removed from Mesa in this release. Make sure you're using
-an up-to-date version of Wayland to keep the functionality.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-17a124d4dbc712505d22a7815c9b0cee22214c96c8abb91539a2b1351e38a000  mesa-18.3.0.tar.gz
-b63f947e735d6ef3dfaa30c789a9adfbae18aea671191eaacde95a18c17fc38a  mesa-18.3.0.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-
-<p>
-Note: some of the new features are only available with certain drivers.
-</p>
-
-<ul>
-<li>GL_AMD_depth_clamp_separate on r600, radeonsi.</li>
-<li>GL_AMD_framebuffer_multisample_advanced on radeonsi.</li>
-<li>GL_AMD_gpu_shader_int64 on i965, nvc0, radeonsi.</li>
-<li>GL_AMD_multi_draw_indirect on all GL 4.x drivers.</li>
-<li>GL_AMD_query_buffer_object on i965, nvc0, r600, radeonsi.</li>
-<li>GL_EXT_disjoint_timer_query on radeonsi and most other Gallium drivers (ES extension)</li>
-<li>GL_EXT_texture_compression_s3tc on all drivers (ES extension)<li>
-<li>GL_EXT_vertex_attrib_64bit on i965, nvc0, radeonsi.</li>
-<li>GL_EXT_window_rectangles on radeonsi.</li>
-<li>GL_KHR_texture_compression_astc_sliced_3d on radeonsi.</li>
-<li>GL_NV_fragment_shader_interlock on i965.</li>
-<li>EGL_EXT_device_base for all drivers.</li>
-<li>EGL_EXT_device_drm for all drivers.</li>
-<li>EGL_MESA_device_software for all drivers.</li>
-</ul>
-
-<h2>Bug fixes</h2>
-
-<ul>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=13728">Bug 13728</a> - [G965] Some objects in Neverwinter Nights Linux version not displayed correctly</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=91433">Bug 91433</a> - piglit.spec.arb_depth_buffer_float.fbo-depth-gl_depth_component32f-copypixels fails</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=93355">Bug 93355</a> - [BXT,SKLGT4e] intermittent ext_framebuffer_multisample.accuracy fails</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=94957">Bug 94957</a> - dEQP failures on llvmpipe</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=98699">Bug 98699</a> - &quot;float[a+++4 ? 1:1] f;&quot; crashes glsl_compiler</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99507">Bug 99507</a> - Corrupted frame contents with Vulkan version of DOTA2, Talos Principle and Sascha Willems' demos when they're run Vsynched in fullscreen</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=99730">Bug 99730</a> - Metro Redux game(s) needs override for midshader extension declaration</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=100200">Bug 100200</a> - Default Unreal Engine 4 frag shader fails to compile</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=101247">Bug 101247</a> - Mesa fails to link GLSL programs with unused output blocks</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=102597">Bug 102597</a> - [Regression] mpv, high rendering times (two to three times higher)</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=103241">Bug 103241</a> - Anv crashes when using 64-bit vertex inputs</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=104602">Bug 104602</a> - [apitrace] Graphical artifacts in Civilization VI on RX Vega</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=104809">Bug 104809</a> - anv: DOOM 2016 and Wolfenstein II:The New Colossus crash due to not having depthBoundsTest</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=104926">Bug 104926</a> - swrast: Mesa 17.3.3 produces:  HW cursor for format 875713089 not supported</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105333">Bug 105333</a> - [gallium-nine] missing geometry after commit ac: replace ac_build_kill with ac_build_kill_if_false</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105371">Bug 105371</a> - r600_shader_from_tgsi - GPR limit exceeded - shader requires 360 registers</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105731">Bug 105731</a> - linker error &quot;fragment shader input ... has no matching output in the previous stage&quot; when previous stage's output declaration in a separate shader object</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105904">Bug 105904</a> - Needed to delete mesa shader cache after driver upgrade for 32 bit wine vulkan programs to work.</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=105975">Bug 105975</a> - i965 always reports 0 viewport subpixel bits</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106231">Bug 106231</a> - llvmpipe blends produce bad code after llvm patch https://reviews.llvm.org/D44785</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106283">Bug 106283</a> - Shader replacements works only for limited use cases</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106577">Bug 106577</a> - broken rendering with nine and nouveau (GM107)</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106833">Bug 106833</a> - glLinkProgram is expected to fail when vertex attribute aliasing happens on ES3.0 context or later</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106865">Bug 106865</a> - [GLK] piglit.spec.ext_framebuffer_multisample.accuracy stencil tests fail</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106980">Bug 106980</a> - Basemark GPU vulkan benchmark hangs on GFX9</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106997">Bug 106997</a> - [Regression]. Dying light game is crashing on latest mesa</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107088">Bug 107088</a> - [GEN8+] Hang when discarding a fragment if dual source blending is enabled but shader doesn't support it</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107098">Bug 107098</a> - Segfault after munmap(kms_sw_dt-&gt;ro_mapped)</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107212">Bug 107212</a> - Dual-Core CPU E5500 / G45: RetroArch with reicast core results in corrupted graphics</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107223">Bug 107223</a> - [GEN9+] 50% perf drop in SynMark Fill* tests (E2E RBC gets disabled?)</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107276">Bug 107276</a> - radv: OpBitfieldUExtract returns incorrect result when count is zero</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107280">Bug 107280</a> - [DXVK] Batman: Arkham City with tessellation enabled hangs on SKL GT4</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107313">Bug 107313</a> - Meson instructions on web site are non-optimal</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107359">Bug 107359</a> - [Regression] [bisected] [OpenGL CTS] [SKL,BDW] KHR-GL46.texture_barrier*-texels, GTF-GL46.gtf21.GL2FixedTests.buffer_corners.buffer_corners, and GTF-GL46.gtf21.GL2FixedTests.stencil_plane_corners.stencil_plane_corners fail with some configuration</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107460">Bug 107460</a> - radv: OpControlBarrier does not always work correctly (bisected)</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107477">Bug 107477</a> - [DXVK] Setting high shader quality in GTA V results in LLVM error</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107483">Bug 107483</a> - DispatchSanity_test.GL31_CORE regression</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107487">Bug 107487</a> - [intel] [tools] intel gpu tools don't honor -D tools=[]</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107488">Bug 107488</a> - gl.h:2090: error: redefinition of typedef ‘GLeglImageOES’</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107510">Bug 107510</a> - [GEN8+] up to 10% perf drop on several 3D benchmarks</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107511">Bug 107511</a> - KHR/khrplatform.h not always installed when needed</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107524">Bug 107524</a> - Broken packDouble2x32 at llvmpipe</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107544">Bug 107544</a> - intel/decoder: out of bounds group_iter</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107547">Bug 107547</a> - shader crashing glsl_compiler (uniform block assigned to vec2, then component substraced by 1)</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107550">Bug 107550</a> - &quot;0[2]&quot; as function parameter hits assert</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107563">Bug 107563</a> - [RADV] Broken rendering in Unity demos</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107565">Bug 107565</a> - TypeError: __init__() got an unexpected keyword argument 'future_imports'</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107579">Bug 107579</a> - [SNB] The graphic corruption when we reuse the GS compiled and used for TFB when statebuffer contain magic trash in the unused space</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107601">Bug 107601</a> - Rise of the Tomb Raider Segmentation Fault when the game starts</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107610">Bug 107610</a> - Dolphin emulator mis-renders shadow overlay in Super Mario Sunshine</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107626">Bug 107626</a> - [SNB] The graphical corruption and GPU hang occur sometimes on the piglit test &quot;arb_texture_multisample-large-float-texture&quot; with parameter --fp16</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107658">Bug 107658</a> - [Regression] [bisected] [OpenGLES CTS] KHR-GLES3.packed_pixels.*rectangle.r*8_snorm</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107734">Bug 107734</a> - [GLSL] glsl-fface-invariant, glsl-fcoord-invariant and glsl-pcoord-invariant should fail</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107745">Bug 107745</a> - [bisected] [bdw bsw] piglit.spec.arb_fragment_shader_interlock.arb_fragment_shader_interlock-image-load-store failure</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107760">Bug 107760</a> - GPU Hang when Playing DiRT 3 Complete Edition using Steam Play with DXVK</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107765">Bug 107765</a> - [regression] Batman Arkham City crashes with DXVK under wine</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107772">Bug 107772</a> - Mesa preprocessor matches if(def)s &amp; endifs incorrectly</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107779">Bug 107779</a> - Access violation with some games</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107786">Bug 107786</a> - [DXVK] MSAA reflections are broken in GTA V</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107806">Bug 107806</a> - glsl_get_natural_size_align_bytes() ABORT with GfxBench Vulkan AztecRuins</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107810">Bug 107810</a> - The 'va_end' call is missed after 'va_copy' in 'util_vsnprintf' function under windows</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107832">Bug 107832</a> - Gallium picking A16L16 formats when emulating INTENSITY16 conflicts with mesa</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107843">Bug 107843</a> - 32bit Mesa build failes with meson.</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107856">Bug 107856</a> - i965 incorrectly calculates the number of layers for texture views (assert)</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107857">Bug 107857</a> - GPU hang - GS_EMIT without shader outputs</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107865">Bug 107865</a> - swr fail to build with llvm-libs 6.0.1</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107869">Bug 107869</a> - u_thread.h:87:4: error: use of undeclared identifier 'cpu_set_t'</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107870">Bug 107870</a> - Undefined symbols for architecture x86_64: &quot;_util_cpu_caps&quot;</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107879">Bug 107879</a> - crash happens when link program</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107891">Bug 107891</a> - [wine, regression, bisected] RAGE, Wolfenstein The New Order hangs in menu</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107923">Bug 107923</a> - build_id.c:126: multiple definition of `build_id_length'</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107926">Bug 107926</a> - [anv] Rise of the Tomb Raider always misrendering, segfault and gpu hang.</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107941">Bug 107941</a> - GPU hang and system crash with Dota 2 using Vulkan</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107971">Bug 107971</a> - SPV_GOOGLE_hlsl_functionality1 / SPV_GOOGLE_decorate_string</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108012">Bug 108012</a> - Compiler crashes on access of non-existent member incremental operations</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108024">Bug 108024</a> - [Debian Stretch]Fail to build because &quot;xcb_randr_lease_t&quot;</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108082">Bug 108082</a> - warning: unknown warning option '-Wno-format-truncation' [-Wunknown-warning-option]</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108109">Bug 108109</a> - [GLSL] no-overloads.vert fails</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108112">Bug 108112</a> - [vulkancts] some of the coherent memory tests fail.</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108113">Bug 108113</a> - [vulkancts] r32g32b32 transfer operations not implemented</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108115">Bug 108115</a> - [vulkancts] dEQP-VK.subgroups.vote.graphics.subgroupallequal.* fails</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108164">Bug 108164</a> - [radv] VM faults since 5d6a560a2986c9ab421b3c7904d29bb7bc35e36f</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108245">Bug 108245</a> - RADV/Vega: Low mip levels of large BCn textures get corrupted by vkCmdCopyBufferToImage</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108272">Bug 108272</a> - [polaris10] opencl-mesa: Anything using OpenCL segfaults, XFX Radeon RX 580</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108311">Bug 108311</a> - Query buffer object support is broken on r600.</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108319">Bug 108319</a> - [GLK BXT BSW] Assertion in piglit.spec.arb_gpu_shader_fp64.execution.built-in-functions.vs-sign-sat-neg-abs</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108491">Bug 108491</a> - Commit baa38c14 causes output issues on my VEGA with RADV</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108524">Bug 108524</a> - [RADV]  GPU lockup on event synchronization</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108530">Bug 108530</a> - (mesa-18.3) [Tracker] Mesa 18.3 Release Tracker</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108532">Bug 108532</a> - make check nir_copy_prop_vars_test.store_store_load_different_components regression</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108560">Bug 108560</a> - Mesa 32 is built without sse</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108595">Bug 108595</a> - ir3_compiler valgrind build error</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108617">Bug 108617</a> - [deqp] Mesa fails conformance for egl_ext_device</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108630">Bug 108630</a> - [G965] piglit.spec.!opengl 1_2.tex3d-maxsize spins forever</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108635">Bug 108635</a> - Mesa master commit 68dc591af16ebb36814e4c187e4998948103c99c causes XWayland to segfault</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108713">Bug 108713</a> - Gallium: use after free with transform feedback</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108829">Bug 108829</a> - [meson] libglapi exports internal API</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108894">Bug 108894</a> - [anv] vkCmdCopyBuffer() and vkCmdCopyQueryPoolResults() write-after-write hazard</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108909">Bug 108909</a> - Vkd3d test failure test_resolve_non_issued_query_data()</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108914">Bug 108914</a> - blocky shadow artifacts in The Forest with DXVK, RADV_DEBUG=nohiz fixes this</li>
-
-<h2>Changes</h2>
-
-<ul>
-<li>TBD</li>
-</ul>
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/18.3.1.html
+++ b/docs/relnotes/18.3.1.html
@@ -1,63 +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>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 18.3.1 Release Notes / December 11, 2018</h1>
-
-<p>
-Mesa 18.3.1 is a bug fix release which fixes bugs found since the 18.3.0 release.
-</p>
-<p>
-Mesa 18.3.0 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-256d0c3d88e380c1b8e3fc5c6ac34001e3b7c30458b8b852407ec68b8ccd9fda  mesa-18.3.1.tar.gz
-5b1f827d28684a25f6657289f8b7d47ac56395988c7ac23e0ec9a62b644bdc63  mesa-18.3.1.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-<p>None</p>
-
-
-<h2>Bug fixes</h2>
-<p>None</p>
-
-
-<h2>Changes</h2>
-
-<p>Emil Velikov (2):</p>
-<ul>
-  <li>docs: add sha256 checksums for 18.3.0</li>
-  <li>Update version to 18.3.1</li>
-</ul>
-
-<p>Jason Ekstrand (1):</p>
-<ul>
-  <li>anv,radv: Disable VK_EXT_pci_bus_info</li>
-</ul>
-
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/18.3.2.html
+++ b/docs/relnotes/18.3.2.html
@@ -1,265 +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>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 18.3.2 Release Notes / January 17, 2019</h1>
-
-<p>
-Mesa 18.3.2 is a bug fix release which fixes bugs found since the 18.3.1 release.
-</p>
-<p>
-Mesa 18.3.2 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-1cde4fafd40cd1ad4ee3a13b364b7a0175a08b7afdd127fb46f918c1e1dfd4b0  mesa-18.3.2.tar.gz
-f7ce7181c07b6d8e0132da879af1729523a6c8aa87f79a9d59dfd064024cfb35  mesa-18.3.2.tar.xz
-</pre>
-
-
-<h2>New features</h2>
-<p>None</p>
-
-
-<h2>Bug fixes</h2>
-
-<ul>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=106595">Bug 106595</a> - [RADV] Rendering distortions only when MSAA is enabled</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107728">Bug 107728</a> - Wrong background in Sascha Willem's Multisampling Demo</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108114">Bug 108114</a> - [vulkancts] new VK_KHR_16bit_storage tests fail.</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108116">Bug 108116</a> - [vulkancts] stencil partial clear tests fail.</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108624">Bug 108624</a> - [regression][bisected] &quot;nir: Copy propagation between blocks&quot; regression</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108910">Bug 108910</a> - Vkd3d test failure test_multisample_array_texture()</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108911">Bug 108911</a> - Vkd3d test failure test_clear_render_target_view()</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=108943">Bug 108943</a> - Build fails on ppc64le with meson</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=109072">Bug 109072</a> - GPU hang in blender 2.80</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=109081">Bug 109081</a> - [bisected] [HSW] Regression in clipping.user_defined.clip_* vulkancts tests</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=109151">Bug 109151</a> - [KBL-G][vulkan] dEQP-VK.texture.explicit_lod.2d.sizes.31x55_nearest_linear_mipmap_nearest_repeat failed verification.</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=109202">Bug 109202</a> - nv50_ir.cpp:749:19: error: cannot use typeid with -fno-rtti</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=109204">Bug 109204</a> - [regression, bisected] retroarch's crt-royale shader crash radv</li>
-
-</ul>
-
-
-<h2>Changes</h2>
-
-<p>Alex Deucher (3):</p>
-<ul>
-  <li>pci_ids: add new vega10 pci ids</li>
-  <li>pci_ids: add new vega20 pci id</li>
-  <li>pci_ids: add new VegaM pci id</li>
-</ul>
-
-<p>Alexander von Gluck IV (1):</p>
-<ul>
-  <li>egl/haiku: Fix reference to disp vs dpy</li>
-</ul>
-
-<p>Andres Gomez (2):</p>
-<ul>
-  <li>glsl: correct typo in GLSL compilation error message</li>
-  <li>glsl/linker: specify proper direction in location aliasing error</li>
-</ul>
-
-<p>Axel Davy (3):</p>
-<ul>
-  <li>st/nine: Fix volumetexture dtor on ctor failure</li>
-  <li>st/nine: Bind src not dst in nine_context_box_upload</li>
-  <li>st/nine: Add src reference to nine_context_range_upload</li>
-</ul>
-
-<p>Bas Nieuwenhuizen (5):</p>
-<ul>
-  <li>radv: Do a cache flush if needed before reading predicates.</li>
-  <li>radv: Implement buffer stores with less than 4 components.</li>
-  <li>anv/android: Do not reject storage images.</li>
-  <li>radv: Fix rasterization precision bits.</li>
-  <li>spirv: Fix matrix parameters in function calls.</li>
-</ul>
-
-<p>Caio Marcelo de Oliveira Filho (3):</p>
-<ul>
-  <li>nir: properly clear the entry sources in copy_prop_vars</li>
-  <li>nir: properly find the entry to keep in copy_prop_vars</li>
-  <li>nir: remove dead code from copy_prop_vars</li>
-</ul>
-
-<p>Dave Airlie (2):</p>
-<ul>
-  <li>radv/xfb: fix counter buffer bounds checks.</li>
-  <li>virgl/vtest: fix front buffer flush with protocol version 0.</li>
-</ul>
-
-<p>Dylan Baker (6):</p>
-<ul>
-  <li>meson: Fix ppc64 little endian detection</li>
-  <li>meson: Add support for gnu hurd</li>
-  <li>meson: Add toggle for glx-direct</li>
-  <li>meson: Override C++ standard to gnu++11 when building with altivec on ppc64</li>
-  <li>meson: Error out if building nouveau and using LLVM without rtti</li>
-  <li>autotools: Remove tegra vdpau driver</li>
-</ul>
-
-<p>Emil Velikov (12):</p>
-<ul>
-  <li>docs: add sha256 checksums for 18.3.1</li>
-  <li>bin/get-pick-list.sh: rework handing of sha nominations</li>
-  <li>bin/get-pick-list.sh: warn when commit lists invalid sha</li>
-  <li>cherry-ignore: meson: libfreedreno depends upon libdrm (for fence support)</li>
-  <li>glx: mandate xf86vidmode only for "drm" dri platforms</li>
-  <li>meson: don't require glx/egl/gbm with gallium drivers</li>
-  <li>pipe-loader: meson: reference correct library</li>
-  <li>TODO: glx: meson: build dri based glx tests, only with -Dglx=dri</li>
-  <li>glx: meson: drop includes from a link-only library</li>
-  <li>glx: meson: wire up the dispatch-index-check test</li>
-  <li>glx/test: meson: assorted include fixes</li>
-  <li>Update version to 18.3.2</li>
-</ul>
-
-<p>Eric Anholt (6):</p>
-<ul>
-  <li>v3d: Fix a leak of the transfer helper on screen destroy.</li>
-  <li>vc4: Fix a leak of the transfer helper on screen destroy.</li>
-  <li>v3d: Fix a leak of the disassembled instruction string during debug dumps.</li>
-  <li>v3d: Make sure that a thrsw doesn't split a multop from its umul24.</li>
-  <li>v3d: Add missing flagging of SYNCB as a TSY op.</li>
-  <li>gallium/ttn: Fix setup of outputs_written.</li>
-</ul>
-
-<p>Erik Faye-Lund (2):</p>
-<ul>
-  <li>virgl: wrap vertex element state in a struct</li>
-  <li>virgl: work around bad assumptions in virglrenderer</li>
-</ul>
-
-<p>Francisco Jerez (5):</p>
-<ul>
-  <li>intel/fs: Handle source modifiers in lower_integer_multiplication().</li>
-  <li>intel/fs: Implement quad swizzles on ICL+.</li>
-  <li>intel/fs: Fix bug in lower_simd_width while splitting an instruction which was already split.</li>
-  <li>intel/eu/gen7: Fix brw_MOV() with DF destination and strided source.</li>
-  <li>intel/fs: Respect CHV/BXT regioning restrictions in copy propagation pass.</li>
-</ul>
-
-<p>Ian Romanick (2):</p>
-<ul>
-  <li>i965/vec4/dce: Don't narrow the write mask if the flags are used</li>
-  <li>Revert "nir/lower_indirect: Bail early if modes == 0"</li>
-</ul>
-
-<p>Jan Vesely (1):</p>
-<ul>
-  <li>clover: Fix build after clang r348827</li>
-</ul>
-
-<p>Jason Ekstrand (6):</p>
-<ul>
-  <li>nir/constant_folding: Fix source bit size logic</li>
-  <li>intel/blorp: Be more conservative about copying clear colors</li>
-  <li>spirv: Handle any bit size in vector_insert/extract</li>
-  <li>anv/apply_pipeline_layout: Set the cursor in lower_res_reindex_intrinsic</li>
-  <li>spirv: Sign-extend array indices</li>
-  <li>intel/peephole_ffma: Fix swizzle propagation</li>
-</ul>
-
-<p>Karol Herbst (1):</p>
-<ul>
-  <li>nv50/ir: fix use-after-free in ConstantFolding::visit</li>
-</ul>
-
-<p>Kirill Burtsev (1):</p>
-<ul>
-  <li>loader: free error state, when checking the drawable type</li>
-</ul>
-
-<p>Lionel Landwerlin (5):</p>
-<ul>
-  <li>anv: don't do partial resolve on layer &gt; 0</li>
-  <li>i965: include draw_params/derived_draw_params for VF cache workaround</li>
-  <li>i965: add CS stall on VF invalidation workaround</li>
-  <li>anv: explictly specify format for blorp ccs/mcs op</li>
-  <li>anv: flush fast clear colors into compressed surfaces</li>
-</ul>
-
-<p>Marek Olšák (1):</p>
-<ul>
-  <li>st/mesa: don't leak pipe_surface if pipe_context is not current</li>
-</ul>
-
-<p>Mario Kleiner (1):</p>
-<ul>
-  <li>radeonsi: Fix use of 1- or 2- component GL_DOUBLE vbo's.</li>
-</ul>
-
-<p>Nicolai Hähnle (1):</p>
-<ul>
-  <li>meson: link LLVM 'native' component when LLVM is available</li>
-</ul>
-
-<p>Rhys Perry (3):</p>
-<ul>
-  <li>radv: don't set surf_index for stencil-only images</li>
-  <li>ac/nir,radv,radeonsi/nir: use correct indices for interpolation intrinsics</li>
-  <li>ac: split 16-bit ssbo loads that may not be dword aligned</li>
-</ul>
-
-<p>Rob Clark (2):</p>
-<ul>
-  <li>freedreno/drm: fix memory leak</li>
-  <li>mesa/st/nir: fix missing nir_compact_varyings</li>
-</ul>
-
-<p>Samuel Pitoiset (1):</p>
-<ul>
-  <li>radv: switch on EOP when primitive restart is enabled with triangle strips</li>
-</ul>
-
-<p>Timothy Arceri (2):</p>
-<ul>
-  <li>tgsi/scan: fix loop exit point in tgsi_scan_tess_ctrl()</li>
-  <li>tgsi/scan: correctly walk instructions in tgsi_scan_tess_ctrl()</li>
-</ul>
-
-<p>Vinson Lee (2):</p>
-<ul>
-  <li>meson: Fix typo.</li>
-  <li>meson: Fix libsensors detection.</li>
-</ul>
-
-
-
-</div>
-</body>
-</html>
--- a/docs/relnotes/19.0.0.html
+++ b/docs/relnotes/19.0.0.html
--- a/docs/relnotes/19.0.1.html
+++ b/docs/relnotes/19.0.1.html
@@ -1,158 +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>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 19.0.1 Release Notes / March 27, 2019</h1>
-
-<p>
-Mesa 19.0.1 is a bug fix release which fixes bugs found since the 19.0.0 release.
-</p>
-<p>
-Mesa 19.0.1 implements the OpenGL 4.5 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 4.5.  OpenGL
-4.5 is <strong>only</strong> available if requested at context creation.
-Compatibility contexts may report a lower version depending on each driver.
-</p>
-
-
-<h2>SHA256 checksums</h2>
-<pre>
-  TBD
-</pre>
-
-
-<h2>New features</h2>
-<p>None</p>
-
-
-<h2>Bug fixes</h2>
-
-<ul>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=100316">Bug 100316</a> - Linking GLSL 1.30 shaders with invariant and deprecated variables triggers an 'mismatching invariant qualifiers' error</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=107563">Bug 107563</a> - [RADV] Broken rendering in Unity demos</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=109698">Bug 109698</a> - dri.pc contents invalid when built with meson</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=109980">Bug 109980</a> - [i915 CI][HSW] spec&#64;arb_fragment_shader_interlock&#64;arb_fragment_shader_interlock-image-load-store - fail</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=110211">Bug 110211</a> - If DESTDIR is set to an empty string, the dri drivers are not installed</li>
-
-<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=110221">Bug 110221</a> - build error with meson</li>
-
-</ul>
-
-<h2>Changes</h2>
-
-<p>Andres Gomez (4):</p>
-<ul>
-  <li>glsl: correctly validate component layout qualifier for dvec{3,4}</li>
-  <li>glsl/linker: don't fail non static used inputs without matching outputs</li>
-  <li>glsl/linker: simplify xfb_offset vs xfb_stride overflow check</li>
-  <li>Revert "glsl: relax input-&gt;output validation for SSO programs"</li>
-</ul>
-
-<p>Bas Nieuwenhuizen (2):</p>
-<ul>
-  <li>radv: Use correct image view comparison for fast clears.</li>
-  <li>ac/nir: Return frag_coord as integer.</li>
-</ul>
-
-<p>Danylo Piliaiev (2):</p>
-<ul>
-  <li>anv: Treat zero size XFB buffer as disabled</li>
-  <li>glsl: Cross validate variable's invariance by explicit invariance only</li>
-</ul>
-
-<p>Dave Airlie (1):</p>
-<ul>
-  <li>softpipe: fix texture view crashes</li>
-</ul>
-
-<p>Dylan Baker (5):</p>
-<ul>
-  <li>docs: Add SHA256 sums for 19.0.0</li>
-  <li>cherry-ignore: Add commit that doesn't apply</li>
-  <li>bin/install_megadrivers.py: Correctly handle DESTDIR=''</li>
-  <li>bin/install_megadrivers.py: Fix regression for set DESTDIR</li>
-  <li>bump version for 19.0.1</li>
-</ul>
-
-<p>Eric Anholt (1):</p>
-<ul>
-  <li>v3d: Fix leak of the renderonly struct on screen destruction.</li>
-</ul>
-
-<p>Jason Ekstrand (6):</p>
-<ul>
-  <li>glsl/lower_vector_derefs: Don't use a temporary for TCS outputs</li>
-  <li>glsl/list: Add a list variant of insert_after</li>
-  <li>anv/pass: Flag the need for a RT flush for resolve attachments</li>
-  <li>nir/builder: Add a vector extract helper</li>
-  <li>nir: Add a new pass to lower array dereferences on vectors</li>
-  <li>intel/nir: Lower array-deref-of-vector UBO and SSBO loads</li>
-</ul>
-
-<p>Józef Kucia (2):</p>
-<ul>
-  <li>radv: Fix driverUUID</li>
-  <li>mesa: Fix GL_NUM_DEVICE_UUIDS_EXT</li>
-</ul>
-
-<p>Kenneth Graunke (1):</p>
-<ul>
-  <li>intel/fs: Fix opt_peephole_csel to not throw away saturates.</li>
-</ul>
-
-<p>Kevin Strasser (1):</p>
-<ul>
-  <li>egl/dri: Avoid out of bounds array access</li>
-</ul>
-
-<p>Mark Janes (1):</p>
-<ul>
-  <li>mesa: properly report the length of truncated log messages</li>
-</ul>
-
-<p>Plamena Manolova (1):</p>
-<ul>
-  <li>i965: Disable ARB_fragment_shader_interlock for platforms prior to GEN9</li>
-</ul>
-
-<p>Samuel Pitoiset (3):</p>
-<ul>
-  <li>radv: set the maximum number of IBs per submit to 192</li>
-  <li>radv: always initialize HTILE when the src layout is UNDEFINED</li>
-  <li>radv: fix binding transform feedback buffers</li>
-</ul>
-
-<p>Sergii Romantsov (1):</p>
-<ul>
-  <li>d3d: meson: do not prefix user provided d3d-drivers-path</li>
-</ul>
-
-<p>Tapani Pälli (2):</p>
-<ul>
-  <li>isl: fix automake build when sse41 is not supported</li>
-  <li>anv/radv: release memory allocated by glsl types during spirv_to_nir</li>
-</ul>
-
-
-</div>
-</body>
-</html>
--- a/docs/repository.html
+++ b/docs/repository.html
@@ -35,9 +35,9 @@ You may access the repository either as an

 <p>
 You may also 
-<a href="https://gitlab.freedesktop.org/mesa/mesa"
+<a href="https://cgit.freedesktop.org/mesa/mesa/"
 >browse the main Mesa git repository</a> and the
-<a href="https://gitlab.freedesktop.org/mesa/demos"
+<a href="https://cgit.freedesktop.org/mesa/demos"
 >Mesa demos and tests git repository</a>.
 </p>

@@ -52,7 +52,7 @@ To get the Mesa sources anonymously (read-only):
 <li>Install the git software on your computer if needed.<br><br>
 <li>Get an initial, local copy of the repository with:
    <pre>
-    git clone https://gitlab.freedesktop.org/mesa/mesa.git
+    git clone git://anongit.freedesktop.org/git/mesa/mesa
    </pre>
 <li>Later, you can update your tree from the master repository with:
    <pre>
@@ -60,7 +60,7 @@ To get the Mesa sources anonymously (read-only):
    </pre>
 <li>If you also want the Mesa demos/tests repository:
    <pre>
-    git clone https://gitlab.freedesktop.org/mesa/demos.git
+    git clone git://anongit.freedesktop.org/git/mesa/demos
    </pre>
 </ol>

@@ -98,17 +98,24 @@ on a particular driver, add a new extension, etc.) in the bugzilla record.
 </ol>

 <p>
-Once your account is established, you can update your push url to use SSH:
-<pre>
-git remote set-url --push <em>origin</em> git@gitlab.freedesktop.org:mesa/mesa.git
-</pre>
+Once your account is established:
+</p>

-You can also use <a href="https://gitlab.freedesktop.org/profile/personal_access_tokens">personal access tokens</a>
-to push over HTTPS instead (useful for people behind strict proxies).
-In this case, create a token, and put it in the url as shown here:
-<pre>
-git remote set-url --push <em>origin</em> https://<em>USER</em>:<em>TOKEN</em>@gitlab.freedesktop.org/mesa/mesa.git
-</pre>
+<ol>
+<li>Get an initial, local copy of the repository with:
+    <pre>
+    git clone git+ssh://username@git.freedesktop.org/git/mesa/mesa
+    </pre>
+    Replace <em>username</em> with your actual login name.<br><br>
+<li>Later, you can update your tree from the master repository with:
+    <pre>
+    git pull origin
+    </pre>
+<li>If you also want the Mesa demos/tests repository:
+    <pre>
+    git clone git+ssh://username@git.freedesktop.org/git/mesa/demos
+    </pre>
+</ol>


 <h2>Windows Users</h2>
@@ -142,12 +149,12 @@ code while a branch has the latest stable code.
 </p>

 <p>
-The command <code>git branch</code> will list all available branches.
+The command <code>git-branch</code> will list all available branches.
 </p>

 <p>
 Questions about branch status/activity should be posted to the
-mesa-dev mailing list.
+mesa3d-dev mailing list.
 </p>

 <h2>Developer Git Tips</h2>
--- a/docs/shading.html
+++ b/docs/shading.html
@@ -85,7 +85,7 @@ should match the filenames of the corresponding dumped shaders.
 <p>
 Setting <b>MESA_SHADER_CAPTURE_PATH</b> to a directory will cause the compiler
 to write <tt>.shader_test</tt> files for use with
-<a href="https://gitlab.freedesktop.org/mesa/shader-db">shader-db</a>, a tool
+<a href="https://cgit.freedesktop.org/mesa/shader-db">shader-db</a>, a tool
 which compiler developers can use to gather statistics about shaders
 (instructions, cycles, memory accesses, and so on).
 </p>
--- a/docs/sourcedocs.html
+++ b/docs/sourcedocs.html
@@ -31,7 +31,7 @@ the <code>doxygen</code> directory and run <code>make</code>.

 <p>
 For an example of Doxygen usage in Mesa, see a recent source file
-such as <a href="https://gitlab.freedesktop.org/mesa/mesa/blob/master/src/mesa/main/bufferobj.c">bufferobj.c</a>.
+such as <a href="https://cgit.freedesktop.org/mesa/mesa/tree/src/mesa/main/bufferobj.c">bufferobj.c</a>.
 </p>


--- a/docs/specs/EGL_MESA_device_software.txt
+++ b/docs/specs/EGL_MESA_device_software.txt
@@ -1,82 +0,0 @@
-Name
-
-    MESA_device_software
-
-Name Strings
-
-    EGL_MESA_device_software
-
-Contributors
-
-    Adam Jackson <ajax@redhat.com>
-    Emil Velikov <emil.velikov@collabora.com>
-
-Contacts
-
-    Adam Jackson <ajax@redhat.com>
-
-Status
-
-    DRAFT
-
-Version
-
-    Version 2, 2018-10-03
-
-Number
-
-    EGL Extension #TODO
-
-Extension Type
-
-    EGL device extension
-
-Dependencies
-
-    Requires EGL_EXT_device_query.
-
-    This extension is written against the EGL 1.5 Specification.
-
-Overview
-
-    This extension defines a software EGL "device". The device is not backed by
-    any actual device node and simply renders into client memory.
-
-    By defining this as an extension, EGL_EXT_device_enumeration is able to
-    sanely enumerate a software device.
-
-New Types
-
-    None
-
-New Procedures and Functions
-
-    None
-
-New Tokens
-
-    None
-
-Additions to the EGL Specification
-
-    None
-
-New Behavior
-
-    The device list produced by eglQueryDevicesEXT will include a software
-    device. This can be distinguished from other device classes in the usual
-    way by calling eglQueryDeviceStringEXT(EGL_EXTENSIONS) and matching this
-    extension's string in the result.
-
-Issues
-
-    None
-
-Revision History
-
-    Version 2, 2018-10-03 (Emil Velikov)
-        - Drop "fallback" from "software fallback device"
-        - Add Emil Velikov as contributor
-
-    Version 1, 2017-07-06 (Adam Jackson)
-        - Initial version
--- a/docs/specs/EGL_MESA_query_driver.txt
+++ b/docs/specs/EGL_MESA_query_driver.txt
@@ -1,95 +0,0 @@
-Name
-
-    MESA_query_driver
-
-Name Strings
-
-    EGL_MESA_query_driver
-
-Contact
-
-    Rob Clark      <robdclark 'at' gmail.com>
-    Nicolai Hähnle <Nicolai.Haehnle 'at' amd.com>
-
-Contibutors
-
-    Veluri Mithun <velurimithun38 'at' gmail.com>
-
-Status
-
-    Complete
-
-Version
-
-    Version 3, 2019-01-24
-
-Number
-
-    EGL Extension 131
-
-Dependencies
-
-    EGL 1.0 is required.
-
-Overview
-
-    When an application has to query the name of a driver and for
-    obtaining driver's option list (UTF-8 encoded XML) of a driver
-    the below functions are useful.
-
-    XML file formally describes all available options and also
-    includes verbal descriptions in multiple languages. Its main purpose
-    is to be automatically processed by configuration GUIs.
-    The XML shall respect the following DTD:
-
-    <!ELEMENT driinfo      (section*)>
-    <!ELEMENT section      (description+, option+)>
-    <!ELEMENT description  (enum*)>
-    <!ATTLIST description  lang CDATA #REQUIRED
-                           text CDATA #REQUIRED>
-    <!ELEMENT option       (description+)>
-    <!ATTLIST option       name CDATA #REQUIRED
-                           type (bool|enum|int|float) #REQUIRED
-                           default CDATA #REQUIRED
-                           valid CDATA #IMPLIED>
-    <!ELEMENT enum         EMPTY>
-    <!ATTLIST enum         value CDATA #REQUIRED
-                           text CDATA #REQUIRED>
-
-New Procedures and Functions
-
-    char* eglGetDisplayDriverConfig(EGLDisplay dpy);
-    const char* eglGetDisplayDriverName(EGLDisplay dpy);
-
-Description
-
-    By passing EGLDisplay as parameter to `eglGetDisplayDriverName` one can retrieve
-    driverName. Similarly passing EGLDisplay to `eglGetDisplayDriverConfig` we can retrieve
-    driverConfig options of the driver in XML format.
-
-    The string returned by `eglGetDisplayDriverConfig` is heap-allocated and caller
-    is responsible for freeing it.
-
-    EGL_BAD_DISPLAY is generated if `disp` is not an EGL display connection.
-
-    EGL_NOT_INITIALIZED is generated if `disp` has not been initialized.
-
-    If the implementation does not have enough resources to allocate the XML then an
-    EGL_BAD_ALLOC error is generated.
-
-New Tokens
-
-    No new tokens
-
-Issues
-
-    None
-
-
-Revision History
-
-    Version 1, 2018-11-05 - First draft (Veluri Mithun)
-    Version 2, 2019-01-23 - Final version (Veluri Mithun)
-    Version 3, 2019-01-24 - Mark as complete, add Khronos extension
-                            number, fix parameter name in prototypes,
-                            write revision history (Eric Engestrom)
--- a/docs/specs/INTEL_shader_atomic_float_minmax.txt
+++ b/docs/specs/INTEL_shader_atomic_float_minmax.txt
@@ -1,200 +0,0 @@
-Name
-
-    INTEL_shader_atomic_float_minmax
-
-Name Strings
-
-    GL_INTEL_shader_atomic_float_minmax
-
-Contact
-
-    Ian Romanick (ian . d . romanick 'at' intel . com)
-
-Contributors
-
-
-Status
-
-    In progress
-
-Version
-
-    Last Modified Date: 06/22/2018
-    Revision: 4
-
-Number
-
-    TBD
-
-Dependencies
-
-    OpenGL 4.2, OpenGL ES 3.1, ARB_shader_storage_buffer_object, or
-    ARB_compute_shader is required.
-
-    This extension is written against version 4.60 of the OpenGL Shading
-    Language Specification.
-
-Overview
-
-    This extension provides GLSL built-in functions allowing shaders to
-    perform atomic read-modify-write operations to floating-point buffer
-    variables and shared variables.  Minimum, maximum, exchange, and
-    compare-and-swap are enabled.
-
-
-New Procedures and Functions
-
-    None.
-
-New Tokens
-
-    None.
-
-IP Status
-
-    None.
-
-Modifications to the OpenGL Shading Language Specification, Version 4.60
-
-    Including the following line in a shader can be used to control the
-    language features described in this extension:
-
-      #extension GL_INTEL_shader_atomic_float_minmax : <behavior>
-
-    where <behavior> is as specified in section 3.3.
-
-    New preprocessor #defines are added to the OpenGL Shading Language:
-
-      #define GL_INTEL_shader_atomic_float_minmax   1
-
-Additions to Chapter 8 of the OpenGL Shading Language Specification
-(Built-in Functions)
-
-    Modify Section 8.11, "Atomic Memory Functions"
-
-    (add a new row after the existing "atomicMin" table row, p. 179)
-
-        float atomicMin(inout float mem, float data)
-
-
-        Computes a new value by taking the minimum of the value of data and
-        the contents of mem.  If one of these is an IEEE signaling NaN (i.e.,
-        a NaN with the most-significant bit of the mantissa cleared), it is
-        always considered smaller.  If one of these is an IEEE quiet NaN
-        (i.e., a NaN with the most-significant bit of the mantissa set), it is
-        always considered larger.  If both are IEEE quiet NaNs or both are
-        IEEE signaling NaNs, the result of the comparison is undefined.
-
-    (add a new row after the exiting "atomicMax" table row, p. 179)
-
-        float atomicMax(inout float mem, float data)
-
-        Computes a new value by taking the maximum of the value of data and
-        the contents of mem.  If one of these is an IEEE signaling NaN (i.e.,
-        a NaN with the most-significant bit of the mantissa cleared), it is
-        always considered larger.  If one of these is an IEEE quiet NaN (i.e.,
-        a NaN with the most-significant bit of the mantissa set), it is always
-        considered smaller.  If both are IEEE quiet NaNs or both are IEEE
-        signaling NaNs, the result of the comparison is undefined.
-
-    (add to "atomicExchange" table cell, p. 180)
-
-        float atomicExchange(inout float mem, float data)
-
-    (add to "atomicCompSwap" table cell, p. 180)
-
-        float atomicCompSwap(inout float mem, float compare, float data)
-
-Interactions with OpenGL 4.6 and ARB_gl_spirv
-
-    If OpenGL 4.6 or ARB_gl_spirv is supported, then
-    SPV_INTEL_shader_atomic_float_minmax must also be supported.
-
-    The AtomicFloatMinmaxINTEL capability is available whenever the OpenGL or
-    OpenGL ES implementation supports INTEL_shader_atomic_float_minmax.
-
-Issues
-
-    1) Why call this extension INTEL_shader_atomic_float_minmax?
-
-    RESOLVED: Several other extensions already set the precedent of
-    VENDOR_shader_atomic_float and VENDOR_shader_atomic_float64 for extensions
-    that enable floating-point atomic operations.  Using that as a base for
-    the name seems logical.
-
-    There already exists NV_shader_atomic_float, but the two extensions have
-    nearly zero overlap in functionality.  NV_shader_atomic_float adds
-    atomicAdd and image atomic operations that currently shipping Intel GPUs
-    do not support.  Calling this extension INTEL_shader_atomic_float would
-    likely have been confusing.
-
-    Adding something to describe the actual functions added by this extension
-    seemed reasonable.  INTEL_shader_atomic_float_compare was considered, but
-    that name was deemed to be not properly descriptive.  Calling this
-    extension INTEL_shader_atomic_float_min_max_exchange_compswap is right
-    out.
-
-    2) What atomic operations should we support for floating-point targets?
-
-    RESOLVED.  Exchange, min, max, and compare-swap make sense, and these are
-    all supported by the hardware.  Future extensions may add other functions.
-
-    For buffer variables and shared variables it is not possible to bit-cast
-    the memory location in GLSL, so existing integer operations, such as
-    atomicOr, cannot be used.  However, the underlying hardware implementation
-    can do this by treating the memory as an integer.  It would be possible to
-    implement atomicNegate using this technique with atomicXor.  It is unclear
-    whether this provides any actual utility.
-
-    3) What should be said about the NaN behavior?
-
-    RESOLVED.  There are several aspects of NaN behavior that should be
-    documented in this extension.  However, some of this behavior varies based
-    on NaN concepts that do not exist in the GLSL specification.
-
-    * atomicCompSwap performs the comparison as the floating-point equality
-      operator (==).  That is, if either 'mem' or 'compare' is NaN, the
-      comparison result is always false.
-
-    * atomicMin and atomicMax implement the IEEE specification with respect to
-      NaN.  IEEE considers two different kinds of NaN: signaling NaN and quiet
-      NaN.  A quiet NaN has the most significant bit of the mantissa set, and
-      a signaling NaN does not.  This concept does not exist in SPIR-V,
-      Vulkan, or OpenGL.  Let qNaN denote a quiet NaN and sNaN denote a
-      signaling NaN.  atomicMin and atomicMax specifically implement
-
-      - fmin(qNaN, x) = fmin(x, qNaN) = fmax(qNaN, x) = fmax(x, qNaN) = x
-      - fmin(sNaN, x) = fmin(x, sNaN) = fmax(sNaN, x) = fmax(x, sNaN) = sNaN
-      - fmin(sNaN, qNaN) = fmin(qNaN, sNaN) = fmax(sNaN, qNaN) =
-        fmax(qNaN, sNaN) = sNaN
-      - fmin(sNaN, sNaN) = sNaN.  This specification does not define which of
-        the two arguments is stored.
-      - fmax(sNaN, sNaN) = sNaN.  This specification does not define which of
-        the two arguments is stored.
-      - fmin(qNaN, qNaN) = qNaN.  This specification does not define which of
-        the two arguments is stored.
-      - fmax(qNaN, qNaN) = qNaN.  This specification does not define which of
-        the two arguments is stored.
-
-    Further details are available in the Skylake Programmer's Reference
-    Manuals available at
-    https://01.org/linuxgraphics/documentation/hardware-specification-prms.
-
-    4) What about atomicMin and atomicMax with (+0.0, -0.0) or (-0.0, +0.0)
-    arguments?
-
-    RESOLVED.  atomicMin should store -0.0, and atomicMax should store +0.0.
-    Due to a known issue in shipping Skylake GPUs, the incorrectly signed 0 is
-    stored.  This behavior may change in later GPUs.
-
-Revision History
-
-    Rev  Date        Author    Changes
-    ---  ----------  --------  ---------------------------------------------
-      1  04/19/2018  idr       Initial version
-      2  05/05/2018  idr       Describe interactions with the capabilities
-                               added by SPV_INTEL_shader_atomic_float_minmax.
-      3  05/29/2018  idr       Remove mention of 64-bit float support.
-      4  06/22/2018  idr       Resolve issue #2.
-                               Add issue #3 (regarding NaN behavior).
-                               Add issue #4 (regarding atomicMin(-0, +0).
--- a/docs/specs/MESA_framebuffer_flip_y.txt
+++ b/docs/specs/MESA_framebuffer_flip_y.txt
@@ -1,81 +0,0 @@
-Name
-
-    MESA_framebuffer_flip_y
-
-Name Strings
-
-    GL_MESA_framebuffer_flip_y
-
-Contact
-
-    Fritz Koenig <frkoenig@google.com>
-
-Contributors
-
-    Fritz Koenig, Google
-    Kristian Høgsberg, Google
-    Chad Versace, Google
-
-Status
-
-    Proposal
-
-Version
-
-    Version 1, June 7, 2018
-
-Number
-
-    302
-
-Dependencies
-
-    OpenGL ES 3.1 is required, for FramebufferParameteri.
-
-Overview
-
-    This extension defines a new framebuffer parameter,
-    GL_FRAMEBUFFER_FLIP_Y_MESA, that changes the behavior of the reads and
-    writes to the framebuffer attachment points. When GL_FRAMEBUFFER_FLIP_Y_MESA
-    is GL_TRUE, render commands and pixel transfer operations access the
-    backing store of each attachment point with an y-inverted coordinate
-    system. This y-inversion is relative to the coordinate system set when
-    GL_FRAMEBUFFER_FLIP_Y_MESA is GL_FALSE.
-
-    Access through TexSubImage2D and similar calls will notice the effect of
-    the flip when they are not attached to framebuffer objects because
-    GL_FRAMEBUFFER_FLIP_Y_MESA is associated with the framebuffer object and
-    not the attachment points.
-
-IP Status
-
-    None
-
-Issues
-
-    None
-
-New Procedures and Functions
-
-    None
-
-New Types
-
-    None
-
-New Tokens
-
-    Accepted by the <pname> argument of FramebufferParameteri and
-    GetFramebufferParameteriv:
-
-        GL_FRAMEBUFFER_FLIP_Y_MESA                      0x8BBB
-
-Errors
-
-    An INVALID_OPERATION error is generated by GetFramebufferParameteriv if the
-    default framebuffer is bound to <target> and <pname> is FRAMEBUFFER_FLIP_Y_MESA.
-
-Revision History
-
-    Version 1, June, 2018
-        Initial draft (Fritz Koenig)
--- a/docs/specs/MESA_query_renderer.spec
+++ b/docs/specs/MESA_query_renderer.spec
@@ -20,11 +20,11 @@ Status

 Version

-    Version 9, 09 November 2018
+    Version 8, 14-February-2014

 Number

-    OpenGL Extension #446
+    TBD.

 Dependencies

@@ -32,6 +32,9 @@ Dependencies

    GLX_ARB_create_context and GLX_ARB_create_context_profile are required.

+    This extension interacts with GLX_EXT_create_context_es2_profile and
+    GLX_EXT_create_context_es_profile.
+
 Overview

    In many situations, applications want to detect characteristics of a
@@ -92,13 +95,18 @@ New Tokens
        GLX_RENDERER_VENDOR_ID_MESA
        GLX_RENDERER_DEVICE_ID_MESA

+    Accepted as an attribute name in <*attrib_list> in
+    glXCreateContextAttribsARB:
+
+        GLX_RENDERER_ID_MESA                             0x818E
+
 Additions to the OpenGL / WGL Specifications

    None. This specification is written for GLX.

 Additions to the GLX 1.4 Specification

-    [Add to Section 3.3.2 "GLX Versioning" of the GLX Specification]
+    [Add the following to Section X.Y.Z of the GLX Specification]

    To obtain information about the available renderers for a particular
    display and screen,
@@ -198,6 +206,29 @@ Additions to the GLX 1.4 Specification
    format as the string that would be returned by glGetString of GL_RENDERER.
    It may, however, have a different value.

+
+    [Add to section section 3.3.7 "Rendering Contexts"]
+
+    The attribute name GLX_RENDERER_ID_MESA specified the index of the render
+    against which the context should be created.  The default value of
+    GLX_RENDERER_ID_MESA is 0.
+
+
+    [Add to list of errors for glXCreateContextAttribsARB in section section
+    3.3.7 "Rendering Contexts"]
+
+      * If the value of GLX_RENDERER_ID_MESA specifies a non-existent
+        renderer, BadMatch is generated.
+
+Dependencies on GLX_EXT_create_context_es_profile and
+GLX_EXT_create_context_es2_profile
+
+    If neither extension is supported, remove all mention of
+    GLX_RENDERER_OPENGL_ES2_PROFILE_VERSION_MESA from the spec.
+
+    If GLX_EXT_create_context_es_profile is not supported, remove all mention of
+    GLX_RENDERER_OPENGL_ES_PROFILE_VERSION_MESA from the spec.
+
 Issues

    1) How should the difference between on-card and GART memory be exposed?
@@ -377,9 +408,3 @@ Revision History
                            read GLX_RENDERER_ID_MESA. The VENDOR/DEVICE_ID
                            example given in issue #17 should be 0x5143 and
                            0xFFFFFFFF respectively.
-
-    Version 9, 2018/11/09 - Remove GLX_RENDERER_ID_MESA, which has never been
-                            implemented. Remove the unnecessary interactions
-                            with the GLX GLES profile extensions. Note the
-                            official GL extension number. Specify the section
-                            of the GLX spec to modify.
--- a/docs/specs/enums.txt
+++ b/docs/specs/enums.txt
@@ -71,9 +71,6 @@ GL_MESA_tile_raster_order
 	GL_TILE_RASTER_ORDER_INCREASING_X_MESA	0x8BB9
 	GL_TILE_RASTER_ORDER_INCREASING_Y_MESA	0x8BBA

-GL_MESA_framebuffer_flip_y
-	GL_FRAMEBUFFER_FLIP_Y_MESA           0x8BBB
-
 EGL_MESA_drm_image
        EGL_DRM_BUFFER_FORMAT_MESA		0x31D0
        EGL_DRM_BUFFER_USE_MESA			0x31D1
--- a/docs/submittingpatches.html
+++ b/docs/submittingpatches.html
@@ -21,7 +21,7 @@
 <li><a href="#guidelines">Basic guidelines</a>
 <li><a href="#formatting">Patch formatting</a>
 <li><a href="#testing">Testing Patches</a>
-<li><a href="#submit">Submitting Patches</a>
+<li><a href="#mailing">Mailing Patches</a>
 <li><a href="#reviewing">Reviewing Patches</a>
 <li><a href="#nominations">Nominating a commit for a stable branch</a>
 <li><a href="#criteria">Criteria for accepting patches to the stable branch</a>
@@ -36,16 +36,14 @@
 perhaps, in very trivial cases.)
 <li>Code patches should follow Mesa
 <a href="codingstyle.html" target="_parent">coding conventions</a>.
-<li>Whenever possible, patches should only affect individual Mesa/Gallium
+<li>Whenever possible, patches should only effect individual Mesa/Gallium
 components.
 <li>Patches should never introduce build breaks and should be bisectable (see
 <code>git bisect</code>.)
 <li>Patches should be properly <a href="#formatting">formatted</a>.
 <li>Patches should be sufficiently <a href="#testing">tested</a> before submitting.
-<li>Patches should be <a href="#submit">submitted</a>
-to <a href="#mailing">mesa-dev</a> or with
-a <a href="#merge-request">merge request</a>
-for <a href="#reviewing">review</a>.
+<li>Patches should be submitted to <a href="#mailing">mesa-dev</a>
+for <a href="#reviewing">review</a> using <code>git send-email</code>.

 </ul>

@@ -124,9 +122,9 @@ Please use common sense and do <strong>not</strong> blindly add everyone.
 <pre>
    $ scripts/get_reviewer.pl --help # to get the help screen
    $ scripts/get_reviewer.pl -f src/egl/drivers/dri2/platform_android.c
-    Rob Herring &lt;robh@kernel.org&gt; (reviewer:ANDROID EGL SUPPORT,added_lines:188/700=27%,removed_lines:58/283=20%)
-    Tomasz Figa &lt;tfiga@chromium.org&gt; (reviewer:ANDROID EGL SUPPORT,authored:12/41=29%,added_lines:308/700=44%,removed_lines:115/283=41%)
-    Emil Velikov &lt;emil.l.velikov@gmail.com&gt; (authored:13/41=32%,removed_lines:76/283=27%)
+    Rob Herring <robh@kernel.org> (reviewer:ANDROID EGL SUPPORT,added_lines:188/700=27%,removed_lines:58/283=20%)
+    Tomasz Figa <tfiga@chromium.org> (reviewer:ANDROID EGL SUPPORT,authored:12/41=29%,added_lines:308/700=44%,removed_lines:115/283=41%)
+    Emil Velikov <emil.l.velikov@gmail.com> (authored:13/41=32%,removed_lines:76/283=27%)
 </pre>
 </ul>

@@ -158,29 +156,18 @@ As mentioned at the begining, patches should be bisectable.
 A good way to test this is to make use of the `git rebase` command,
 to run your tests on each commit. Assuming your branch is based off
 <code>origin/master</code>, you can run:
-</p>
 <pre>
 $ git rebase --interactive --exec "make check" origin/master
 </pre>
-<p>
 replacing <code>"make check"</code> with whatever other test you want to
 run.
 </p>


-<h2 id="submit">Submitting Patches</h2>
+<h2 id="mailing">Mailing Patches</h2>

 <p>
-Patches may be submitted to the Mesa project by
-<a href="#mailing">email</a> or with a
-GitLab <a href="#merge-request">merge request</a>. To prevent
-duplicate code review, only use one method to submit your changes.
-</p>
-
-<h3 id="mailing">Mailing Patches</h3>
-
-<p>
-Patches may be sent to the mesa-dev mailing list for review:
+Patches should be sent to the mesa-dev mailing list for review:
 <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev">
 mesa-dev@lists.freedesktop.org</a>.
 When submitting a patch make sure to use
@@ -214,65 +201,8 @@ disabled before sending your patches. (Note that you may need to contact
 your email administrator for this.)
 </p>

-<h3 id="merge-request">GitLab Merge Requests</h3>
-
-<p>
-  <a href="https://gitlab.freedesktop.org/mesa/mesa">GitLab</a> Merge
-  Requests (MR) can also be used to submit patches for Mesa.
-</p>
-
-<p>
-  If the MR may have interest for most of the Mesa community, you can
-  send an email to the mesa-dev email list including a link to the MR.
-  Don't send the patch to mesa-dev, just the MR link.
-</p>
-<p>
-  Add labels to your MR to help reviewers find it. For example:
-  <ul>
-    <li>Mesa changes affecting all drivers: mesa
-    <li>Hardware vendor specific code: amd, intel, nvidia, ...
-    <li>Driver specific code: anvil, freedreno, i965, iris, radeonsi,
-      radv, vc4, ...
-    <li>Other tag examples: gallium, util
-  </ul>
-</p>
-<p>
-  If you revise your patches based on code review and push an update
-  to your branch, you should maintain a <strong>clean</strong> history
-  in your patches. There should not be "fixup" patches in the history.
-  The series should be buildable and functional after every commit
-  whenever you push the branch.
-</p>
-<p>
-  It is your responsibility to keep the MR alive and making progress,
-  as there are no guarantees that a Mesa dev will independently take
-  interest in it.
-</p>
-<p>
-  Some other notes:
-  <ul>
-    <li>Make changes and update your branch based on feedback
-    <li>Old, stale MR may be closed, but you can reopen it if you
-      still want to pursue the changes
-    <li>You should periodically check to see if your MR needs to be
-      rebased
-    <li>Make sure your MR is closed if your patches get pushed outside
-      of GitLab
-    <li>Please send MRs from a personal fork rather than from the main
-      Mesa repository, as it clutters it unnecessarily.
-  </ul>
-</p>
-
 <h2 id="reviewing">Reviewing Patches</h2>

-<p>
-  To participate in code review, you should monitor the
-  <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev">
-  mesa-dev</a> email list and the GitLab
-  Mesa <a href="https://gitlab.freedesktop.org/mesa/mesa/merge_requests">Merge
-  Requests</a> page.
-</p>
-
 <p>
 When you've reviewed a patch on the mailing list, please be unambiguous
 about your review.  That is, state either
@@ -299,29 +229,6 @@ which tells the patch author that the patch can be committed, as long
 as the issues are resolved first.
 </p>

-<p>
-These Reviewed-by, Acked-by, and Tested-by tags should also be amended
-into commits in a MR before it is merged.
-</p>
-
-<p>
-When providing a Reviewed-by, Acked-by, or Tested-by tag in a gitlab MR,
-enclose the tag in backticks:
-</p>
-<pre>
-  `Reviewed-by: Joe Hacker &lt;jhacker@example.com&gt;`</pre>
-<p>
-This is the markdown format for literal, and will prevent gitlab from hiding
-the &lt; and &gt; symbols.
-</p>
-
-<p>
-Review by non-experts is encouraged.  Understanding how someone else
-goes about solving a problem is a great way to learn your way around
-the project.  The submitter is expected to evaluate whether they have
-an appropriate amount of review feedback from people who also
-understand the code before merging their patches.
-</p>

 <h2 id="nominations">Nominating a commit for a stable branch</h2>

@@ -344,9 +251,6 @@ If you are not the author of the original patch, please Cc: them in your
 nomination request.
 </p>

-<p>
-The current patch status can be observed in the <a href="releasing.html#stagingbranch">staging branch</a>.
-</p>

 <h3 id="thetag">The stable tag</h3>

--- a/docs/utilities.html
+++ b/docs/utilities.html
@@ -17,7 +17,7 @@
 <h1>Development Utilities</h1>

 <dl>
-  <dt><a href="https://gitlab.freedesktop.org/mesa/demos">Mesa demos collection</a></dt>
+  <dt><a href="https://cgit.freedesktop.org/mesa/demos">Mesa demos collection</a></dt>
  <dd>includes several utility routines in the <code>src/util/</code>
  directory.</dd>

@@ -31,7 +31,7 @@
  <dd>is a very useful tool for tracking down
  memory-related problems in your code.</dd>

-  <dt><a href="https://scan.coverity.com/projects/mesa">Coverity</a></dt>
+  <dt><a href="https://scan.coverity.com/projects/mesa">Coverity</a><dt>
  <dd>provides static code analysis of Mesa.  If you create an account
  you can see the results and try to fix outstanding issues.</dd>
 </dl>
--- a/docs/viewperf.html
+++ b/docs/viewperf.html
@@ -18,8 +18,8 @@

 <p>
 This page lists known issues with
-<a href="https://www.spec.org/gwpg/gpc.static/vp11info.html">SPEC Viewperf 11</a>
-and <a href="https://www.spec.org/gwpg/gpc.static/vp12info.html">SPEC Viewperf 12</a>
+<a href="https://www.spec.org/gwpg/gpc.static/vp11info.html" target="_main">SPEC Viewperf 11</a>
+and <a href="https://www.spec.org/gwpg/gpc.static/vp12info.html" target="_main">SPEC Viewperf 12</a>
 when running on Mesa-based drivers.
 </p>

@@ -66,10 +66,13 @@ either in Viewperf or the Mesa driver.

 <p>
 These tests use features of the
-<a href="https://www.opengl.org/registry/specs/NV/fragment_program2.txt">GL_NV_fragment_program2</a>
-and
-<a href="https://www.opengl.org/registry/specs/NV/vertex_program3.txt">GL_NV_vertex_program3</a>
-extensions without checking if the driver supports them.
+<a href="https://www.opengl.org/registry/specs/NV/fragment_program2.txt"
+target="_main">
+GL_NV_fragment_program2</a> and
+<a href="https://www.opengl.org/registry/specs/NV/vertex_program3.txt"
+target="_main">
+GL_NV_vertex_program3</a> extensions without checking if the driver supports
+them.
 </p>
 <p>
 When Mesa tries to compile the vertex/fragment programs it generates errors
@@ -83,8 +86,8 @@ Subsequent drawing calls become no-ops and the rendering is incorrect.

 <p>
 These tests depend on the
-<a href="https://www.opengl.org/registry/specs/NV/primitive_restart.txt">GL_NV_primitive_restart</a>
-extension.
+<a href="https://www.opengl.org/registry/specs/NV/primitive_restart.txt"
+target="_main">GL_NV_primitive_restart</a> extension.
 </p>

 <p>
@@ -121,7 +124,7 @@ never specified.

 <p>
 A trace captured with
-<a href="https://github.com/apitrace/apitrace">API trace</a>
+<a href="https://github.com/apitrace/apitrace" target="_main">API trace</a>
 shows this sequences of calls like this:

 <pre>
--- a/docs/vmware-guest.html
+++ b/docs/vmware-guest.html
@@ -43,23 +43,6 @@ This requires:
 Otherwise, OpenGL 2.1 is supported.
 </p>

-<p>
-With the Fall 2018 Workstation 15 / Fusion 11 releases, additional
-features are supported in the driver:
-<ul>
-<li>Multisample antialiasing (2x, 4x)
-<li>GL_ARB/AMD_draw_buffers_blend
-<li>GL_ARB_sample_shading
-<li>GL_ARB_texture_cube_map_array
-<li>GL_ARB_texture_gather
-<li>GL_ARB_texture_query_lod
-<li>GL_EXT/OES_draw_buffers_indexed
-</ul>
-<p>
-This requires version 2.15.0 or later of the vmwgfx kernel module and
-the VM must be configured for hardware version 16 or later.
-</p>
-
 <p>
 OpenGL 3.3 support can be disabled by setting the environment variable
 SVGA_VGPU10=0.
@@ -143,7 +126,7 @@ Begin by saving your current directory location:
 <ul>
 <li>Mesa/Gallium master branch. This code is used to build libGL, and the direct rendering svga driver for libGL, vmwgfx_dri.so, and the X acceleration library libxatracker.so.x.x.x. 
  <pre>
-  git clone https://gitlab.freedesktop.org/mesa/mesa.git
+  git clone git://anongit.freedesktop.org/git/mesa/mesa
  </pre>
 <li>VMware Linux guest kernel module. Note that this repo contains the complete DRM and TTM code. The vmware-specific driver is really only the files prefixed with vmwgfx. 
  <pre>
@@ -153,7 +136,7 @@ Begin by saving your current directory location:
 Most distros ship with this but it's safest to install a newer version.
 To get the latest code from git:
  <pre>
-  git clone https://gitlab.freedesktop.org/mesa/drm.git
+  git clone git://anongit.freedesktop.org/git/mesa/drm
  </pre>
 <li>xf86-video-vmware. The chainloading driver, vmware_drv.so, the legacy driver vmwlegacy_drv.so, and the vmwgfx driver vmwgfx_drv.so. 
  <pre>
--- a/include/EGL/egl.h
+++ b/include/EGL/egl.h
@@ -28,17 +28,17 @@ extern "C" {
 ** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 */
 /*
-** This header is generated from the Khronos EGL XML API Registry.
-** The current version of the Registry, generator scripts
+** This header is generated from the Khronos OpenGL / OpenGL ES XML
+** API Registry. The current version of the Registry, generator scripts
 ** used to make the header, and the header can be found at
 **   http://www.khronos.org/registry/egl
 **
-** Khronos $Git commit SHA1: 9ed2ec4c67 $ on $Git commit date: 2019-01-09 17:54:35 -0800 $
+** Khronos $Git commit SHA1: a732b061e7 $ on $Git commit date: 2017-06-17 23:27:53 +0100 $
 */

 #include <EGL/eglplatform.h>

-/* Generated on date 20190124 */
+/* Generated on date 20170627 */

 /* Generated C header for:
 * API: egl
--- a/include/EGL/eglext.h
+++ b/include/EGL/eglext.h
@@ -28,17 +28,17 @@ extern "C" {
 ** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 */
 /*
-** This header is generated from the Khronos EGL XML API Registry.
-** The current version of the Registry, generator scripts
+** This header is generated from the Khronos OpenGL / OpenGL ES XML
+** API Registry. The current version of the Registry, generator scripts
 ** used to make the header, and the header can be found at
 **   http://www.khronos.org/registry/egl
 **
-** Khronos $Git commit SHA1: 9ed2ec4c67 $ on $Git commit date: 2019-01-09 17:54:35 -0800 $
+** Khronos $Git commit SHA1: a732b061e7 $ on $Git commit date: 2017-06-17 23:27:53 +0100 $
 */

 #include <EGL/eglplatform.h>

-#define EGL_EGLEXT_VERSION 20190124
+#define EGL_EGLEXT_VERSION 20170627

 /* Generated C header for:
 * API: egl
@@ -495,47 +495,6 @@ EGLAPI EGLClientBuffer EGLAPIENTRY eglCreateNativeClientBufferANDROID (const EGL
 #define EGL_FRONT_BUFFER_AUTO_REFRESH_ANDROID 0x314C
 #endif /* EGL_ANDROID_front_buffer_auto_refresh */

-#ifndef EGL_ANDROID_get_frame_timestamps
-#define EGL_ANDROID_get_frame_timestamps 1
-typedef khronos_stime_nanoseconds_t EGLnsecsANDROID;
-#define EGL_TIMESTAMP_PENDING_ANDROID     EGL_CAST(EGLnsecsANDROID,-2)
-#define EGL_TIMESTAMP_INVALID_ANDROID     EGL_CAST(EGLnsecsANDROID,-1)
-#define EGL_TIMESTAMPS_ANDROID            0x3430
-#define EGL_COMPOSITE_DEADLINE_ANDROID    0x3431
-#define EGL_COMPOSITE_INTERVAL_ANDROID    0x3432
-#define EGL_COMPOSITE_TO_PRESENT_LATENCY_ANDROID 0x3433
-#define EGL_REQUESTED_PRESENT_TIME_ANDROID 0x3434
-#define EGL_RENDERING_COMPLETE_TIME_ANDROID 0x3435
-#define EGL_COMPOSITION_LATCH_TIME_ANDROID 0x3436
-#define EGL_FIRST_COMPOSITION_START_TIME_ANDROID 0x3437
-#define EGL_LAST_COMPOSITION_START_TIME_ANDROID 0x3438
-#define EGL_FIRST_COMPOSITION_GPU_FINISHED_TIME_ANDROID 0x3439
-#define EGL_DISPLAY_PRESENT_TIME_ANDROID  0x343A
-#define EGL_DEQUEUE_READY_TIME_ANDROID    0x343B
-#define EGL_READS_DONE_TIME_ANDROID       0x343C
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETCOMPOSITORTIMINGSUPPORTEDANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLint name);
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETCOMPOSITORTIMINGANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLint numTimestamps,  const EGLint *names, EGLnsecsANDROID *values);
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETNEXTFRAMEIDANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLuint64KHR *frameId);
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETFRAMETIMESTAMPSUPPORTEDANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLint timestamp);
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETFRAMETIMESTAMPSANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLuint64KHR frameId, EGLint numTimestamps,  const EGLint *timestamps, EGLnsecsANDROID *values);
-#ifdef EGL_EGLEXT_PROTOTYPES
-EGLAPI EGLBoolean EGLAPIENTRY eglGetCompositorTimingSupportedANDROID (EGLDisplay dpy, EGLSurface surface, EGLint name);
-EGLAPI EGLBoolean EGLAPIENTRY eglGetCompositorTimingANDROID (EGLDisplay dpy, EGLSurface surface, EGLint numTimestamps,  const EGLint *names, EGLnsecsANDROID *values);
-EGLAPI EGLBoolean EGLAPIENTRY eglGetNextFrameIdANDROID (EGLDisplay dpy, EGLSurface surface, EGLuint64KHR *frameId);
-EGLAPI EGLBoolean EGLAPIENTRY eglGetFrameTimestampSupportedANDROID (EGLDisplay dpy, EGLSurface surface, EGLint timestamp);
-EGLAPI EGLBoolean EGLAPIENTRY eglGetFrameTimestampsANDROID (EGLDisplay dpy, EGLSurface surface, EGLuint64KHR frameId, EGLint numTimestamps,  const EGLint *timestamps, EGLnsecsANDROID *values);
-#endif
-#endif /* EGL_ANDROID_get_frame_timestamps */
-
-#ifndef EGL_ANDROID_get_native_client_buffer
-#define EGL_ANDROID_get_native_client_buffer 1
-struct AHardwareBuffer;
-typedef EGLClientBuffer (EGLAPIENTRYP PFNEGLGETNATIVECLIENTBUFFERANDROIDPROC) (const struct AHardwareBuffer *buffer);
-#ifdef EGL_EGLEXT_PROTOTYPES
-EGLAPI EGLClientBuffer EGLAPIENTRY eglGetNativeClientBufferANDROID (const struct AHardwareBuffer *buffer);
-#endif
-#endif /* EGL_ANDROID_get_native_client_buffer */
-
 #ifndef EGL_ANDROID_image_native_buffer
 #define EGL_ANDROID_image_native_buffer 1
 #define EGL_NATIVE_BUFFER_ANDROID         0x3140
@@ -555,6 +514,7 @@ EGLAPI EGLint EGLAPIENTRY eglDupNativeFenceFDANDROID (EGLDisplay dpy, EGLSyncKHR

 #ifndef EGL_ANDROID_presentation_time
 #define EGL_ANDROID_presentation_time 1
+typedef khronos_stime_nanoseconds_t EGLnsecsANDROID;
 typedef EGLBoolean (EGLAPIENTRYP PFNEGLPRESENTATIONTIMEANDROIDPROC) (EGLDisplay dpy, EGLSurface surface, EGLnsecsANDROID time);
 #ifdef EGL_EGLEXT_PROTOTYPES
 EGLAPI EGLBoolean EGLAPIENTRY eglPresentationTimeANDROID (EGLDisplay dpy, EGLSurface surface, EGLnsecsANDROID time);
@@ -618,16 +578,6 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurfacePointerANGLE (EGLDisplay dpy, EGLSu
 #define EGL_EXT_client_extensions 1
 #endif /* EGL_EXT_client_extensions */

-#ifndef EGL_EXT_client_sync
-#define EGL_EXT_client_sync 1
-#define EGL_SYNC_CLIENT_EXT               0x3364
-#define EGL_SYNC_CLIENT_SIGNAL_EXT        0x3365
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLCLIENTSIGNALSYNCEXTPROC) (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list);
-#ifdef EGL_EGLEXT_PROTOTYPES
-EGLAPI EGLBoolean EGLAPIENTRY eglClientSignalSyncEXT (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list);
-#endif
-#endif /* EGL_EXT_client_sync */
-
 #ifndef EGL_EXT_compositor
 #define EGL_EXT_compositor 1
 #define EGL_PRIMARY_COMPOSITOR_CONTEXT_EXT 0x3460
@@ -681,7 +631,6 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT (EGLDisplay dpy, EGLint a
 #ifndef EGL_EXT_device_drm
 #define EGL_EXT_device_drm 1
 #define EGL_DRM_DEVICE_FILE_EXT           0x3233
-#define EGL_DRM_MASTER_FD_EXT             0x333C
 #endif /* EGL_EXT_device_drm */

 #ifndef EGL_EXT_device_enumeration
@@ -717,11 +666,6 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT (EGLDisplay dpy, EGLint a
 #define EGL_GL_COLORSPACE_DISPLAY_P3_LINEAR_EXT 0x3362
 #endif /* EGL_EXT_gl_colorspace_display_p3_linear */

-#ifndef EGL_EXT_gl_colorspace_display_p3_passthrough
-#define EGL_EXT_gl_colorspace_display_p3_passthrough 1
-#define EGL_GL_COLORSPACE_DISPLAY_P3_PASSTHROUGH_EXT 0x3490
-#endif /* EGL_EXT_gl_colorspace_display_p3_passthrough */
-
 #ifndef EGL_EXT_gl_colorspace_scrgb
 #define EGL_EXT_gl_colorspace_scrgb 1
 #define EGL_GL_COLORSPACE_SCRGB_EXT       0x3351
@@ -779,11 +723,6 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryDmaBufModifiersEXT (EGLDisplay dpy, EGLint
 #endif
 #endif /* EGL_EXT_image_dma_buf_import_modifiers */

-#ifndef EGL_EXT_image_gl_colorspace
-#define EGL_EXT_image_gl_colorspace 1
-#define EGL_GL_COLORSPACE_DEFAULT_EXT     0x314D
-#endif /* EGL_EXT_image_gl_colorspace */
-
 #ifndef EGL_EXT_image_implicit_sync_control
 #define EGL_EXT_image_implicit_sync_control 1
 #define EGL_IMPORT_SYNC_TYPE_EXT          0x3470
@@ -919,14 +858,6 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageEXT (EGLDisplay dpy, EGLSu
 #endif
 #endif /* EGL_EXT_swap_buffers_with_damage */

-#ifndef EGL_EXT_sync_reuse
-#define EGL_EXT_sync_reuse 1
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNSIGNALSYNCEXTPROC) (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list);
-#ifdef EGL_EGLEXT_PROTOTYPES
-EGLAPI EGLBoolean EGLAPIENTRY eglUnsignalSyncEXT (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list);
-#endif
-#endif /* EGL_EXT_sync_reuse */
-
 #ifndef EGL_EXT_yuv_surface
 #define EGL_EXT_yuv_surface 1
 #define EGL_YUV_ORDER_EXT                 0x3301
@@ -1031,16 +962,6 @@ EGLAPI EGLBoolean EGLAPIENTRY eglExportDMABUFImageMESA (EGLDisplay dpy, EGLImage
 #define EGL_PLATFORM_SURFACELESS_MESA     0x31DD
 #endif /* EGL_MESA_platform_surfaceless */

-#ifndef EGL_MESA_query_driver
-#define EGL_MESA_query_driver 1
-typedef char *(EGLAPIENTRYP PFNEGLGETDISPLAYDRIVERCONFIGPROC) (EGLDisplay dpy);
-typedef const char *(EGLAPIENTRYP PFNEGLGETDISPLAYDRIVERNAMEPROC) (EGLDisplay dpy);
-#ifdef EGL_EGLEXT_PROTOTYPES
-EGLAPI char *EGLAPIENTRY eglGetDisplayDriverConfig (EGLDisplay dpy);
-EGLAPI const char *EGLAPIENTRY eglGetDisplayDriverName (EGLDisplay dpy);
-#endif
-#endif /* EGL_MESA_query_driver */
-
 #ifndef EGL_NOK_swap_region
 #define EGL_NOK_swap_region 1
 typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSREGIONNOKPROC) (EGLDisplay dpy, EGLSurface surface, EGLint numRects, const EGLint *rects);
@@ -1067,11 +988,6 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersRegion2NOK (EGLDisplay dpy, EGLSurfa
 #define EGL_AUTO_STEREO_NV                0x3136
 #endif /* EGL_NV_3dvision_surface */

-#ifndef EGL_NV_context_priority_realtime
-#define EGL_NV_context_priority_realtime 1
-#define EGL_CONTEXT_PRIORITY_REALTIME_NV  0x3357
-#endif /* EGL_NV_context_priority_realtime */
-
 #ifndef EGL_NV_coverage_sample
 #define EGL_NV_coverage_sample 1
 #define EGL_COVERAGE_BUFFERS_NV           0x30E0
@@ -1139,9 +1055,9 @@ EGLAPI EGLBoolean EGLAPIENTRY eglPostSubBufferNV (EGLDisplay dpy, EGLSurface sur
 #define EGL_YUV_PLANE0_TEXTURE_UNIT_NV    0x332C
 #define EGL_YUV_PLANE1_TEXTURE_UNIT_NV    0x332D
 #define EGL_YUV_PLANE2_TEXTURE_UNIT_NV    0x332E
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALATTRIBSNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALATTRIBSNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLAttrib *attrib_list);
 #ifdef EGL_EGLEXT_PROTOTYPES
-EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerGLTextureExternalAttribsNV (EGLDisplay dpy, EGLStreamKHR stream, const EGLAttrib *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerGLTextureExternalAttribsNV (EGLDisplay dpy, EGLStreamKHR stream, EGLAttrib *attrib_list);
 #endif
 #endif /* EGL_NV_stream_consumer_gltexture_yuv */

@@ -1181,14 +1097,6 @@ EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerGLTextureExternalAttribsNV (EGLDi
 #define EGL_STREAM_FIFO_SYNCHRONOUS_NV    0x3336
 #endif /* EGL_NV_stream_fifo_synchronous */

-#ifndef EGL_NV_stream_flush
-#define EGL_NV_stream_flush 1
-typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMFLUSHNVPROC) (EGLDisplay dpy, EGLStreamKHR stream);
-#ifdef EGL_EGLEXT_PROTOTYPES
-EGLAPI EGLBoolean EGLAPIENTRY eglStreamFlushNV (EGLDisplay dpy, EGLStreamKHR stream);
-#endif
-#endif /* EGL_NV_stream_flush */
-
 #ifndef EGL_NV_stream_frame_limits
 #define EGL_NV_stream_frame_limits 1
 #define EGL_PRODUCER_MAX_FRAME_HINT_NV    0x3337
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -2086,7 +2086,7 @@ typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEATIPROC) (GLenum modeRGB, GLen


 /* GL_OES_EGL_image */
-#if !defined(GL_OES_EGL_image) && !defined(GL_EXT_EGL_image_storage)
+#ifndef GL_OES_EGL_image
 typedef void* GLeglImageOES;
 #endif

--- a/include/GL/glcorearb.h
+++ b/include/GL/glcorearb.h
@@ -1,12 +1,12 @@
-#ifndef __gl_glcorearb_h_
-#define __gl_glcorearb_h_ 1
+#ifndef __glcorearb_h_
+#define __glcorearb_h_ 1

 #ifdef __cplusplus
 extern "C" {
 #endif

 /*
-** Copyright (c) 2013-2018 The Khronos Group Inc.
+** Copyright (c) 2013-2017 The Khronos Group Inc.
 **
 ** Permission is hereby granted, free of charge, to any person obtaining a
 ** copy of this software and/or associated documentation files (the
@@ -306,7 +306,7 @@ typedef void (APIENTRYP PFNGLGETTEXPARAMETERIVPROC) (GLenum target, GLenum pname
 typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERFVPROC) (GLenum target, GLint level, GLenum pname, GLfloat *params);
 typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERIVPROC) (GLenum target, GLint level, GLenum pname, GLint *params);
 typedef GLboolean (APIENTRYP PFNGLISENABLEDPROC) (GLenum cap);
-typedef void (APIENTRYP PFNGLDEPTHRANGEPROC) (GLdouble n, GLdouble f);
+typedef void (APIENTRYP PFNGLDEPTHRANGEPROC) (GLdouble near, GLdouble far);
 typedef void (APIENTRYP PFNGLVIEWPORTPROC) (GLint x, GLint y, GLsizei width, GLsizei height);
 #ifdef GL_GLEXT_PROTOTYPES
 GLAPI void APIENTRY glCullFace (GLenum mode);
@@ -355,7 +355,7 @@ GLAPI void APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint *par
 GLAPI void APIENTRY glGetTexLevelParameterfv (GLenum target, GLint level, GLenum pname, GLfloat *params);
 GLAPI void APIENTRY glGetTexLevelParameteriv (GLenum target, GLint level, GLenum pname, GLint *params);
 GLAPI GLboolean APIENTRY glIsEnabled (GLenum cap);
-GLAPI void APIENTRY glDepthRange (GLdouble n, GLdouble f);
+GLAPI void APIENTRY glDepthRange (GLdouble near, GLdouble far);
 GLAPI void APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
 #endif
 #endif /* GL_VERSION_1_0 */
@@ -613,9 +613,9 @@ GLAPI void APIENTRY glBlendEquation (GLenum mode);

 #ifndef GL_VERSION_1_5
 #define GL_VERSION_1_5 1
-#include <KHR/khrplatform.h>
-typedef khronos_ssize_t GLsizeiptr;
-typedef khronos_intptr_t GLintptr;
+#include <stddef.h>
+typedef ptrdiff_t GLsizeiptr;
+typedef ptrdiff_t GLintptr;
 #define GL_BUFFER_SIZE                    0x8764
 #define GL_BUFFER_USAGE                   0x8765
 #define GL_QUERY_COUNTER_BITS             0x8864
@@ -3958,22 +3958,6 @@ GLAPI void APIENTRY glMaxShaderCompilerThreadsKHR (GLuint count);
 #define GL_KHR_texture_compression_astc_sliced_3d 1
 #endif /* GL_KHR_texture_compression_astc_sliced_3d */

-#ifndef GL_AMD_framebuffer_multisample_advanced
-#define GL_AMD_framebuffer_multisample_advanced 1
-#define GL_RENDERBUFFER_STORAGE_SAMPLES_AMD 0x91B2
-#define GL_MAX_COLOR_FRAMEBUFFER_SAMPLES_AMD 0x91B3
-#define GL_MAX_COLOR_FRAMEBUFFER_STORAGE_SAMPLES_AMD 0x91B4
-#define GL_MAX_DEPTH_STENCIL_FRAMEBUFFER_SAMPLES_AMD 0x91B5
-#define GL_NUM_SUPPORTED_MULTISAMPLE_MODES_AMD 0x91B6
-#define GL_SUPPORTED_MULTISAMPLE_MODES_AMD 0x91B7
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEADVANCEDAMDPROC) (GLenum target, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEADVANCEDAMDPROC) (GLuint renderbuffer, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glRenderbufferStorageMultisampleAdvancedAMD (GLenum target, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleAdvancedAMD (GLuint renderbuffer, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
-#endif
-#endif /* GL_AMD_framebuffer_multisample_advanced */
-
 #ifndef GL_AMD_performance_monitor
 #define GL_AMD_performance_monitor 1
 #define GL_COUNTER_TYPE_AMD               0x8BC0
@@ -4017,17 +4001,6 @@ GLAPI void APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname
 #define GL_RGB_RAW_422_APPLE              0x8A51
 #endif /* GL_APPLE_rgb_422 */

-#ifndef GL_EXT_EGL_image_storage
-#define GL_EXT_EGL_image_storage 1
-typedef void *GLeglImageOES;
-typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXSTORAGEEXTPROC) (GLenum target, GLeglImageOES image, const GLint* attrib_list);
-typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXTURESTORAGEEXTPROC) (GLuint texture, GLeglImageOES image, const GLint* attrib_list);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glEGLImageTargetTexStorageEXT (GLenum target, GLeglImageOES image, const GLint* attrib_list);
-GLAPI void APIENTRY glEGLImageTargetTextureStorageEXT (GLuint texture, GLeglImageOES image, const GLint* attrib_list);
-#endif
-#endif /* GL_EXT_EGL_image_storage */
-
 #ifndef GL_EXT_debug_label
 #define GL_EXT_debug_label 1
 #define GL_PROGRAM_PIPELINE_OBJECT_EXT    0x8A4F
@@ -4625,19 +4598,6 @@ GLAPI GLuint APIENTRY glCreateShaderProgramEXT (GLenum type, const GLchar *strin
 #endif
 #endif /* GL_EXT_separate_shader_objects */

-#ifndef GL_EXT_shader_framebuffer_fetch
-#define GL_EXT_shader_framebuffer_fetch 1
-#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52
-#endif /* GL_EXT_shader_framebuffer_fetch */
-
-#ifndef GL_EXT_shader_framebuffer_fetch_non_coherent
-#define GL_EXT_shader_framebuffer_fetch_non_coherent 1
-typedef void (APIENTRYP PFNGLFRAMEBUFFERFETCHBARRIEREXTPROC) (void);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFramebufferFetchBarrierEXT (void);
-#endif
-#endif /* GL_EXT_shader_framebuffer_fetch_non_coherent */
-
 #ifndef GL_EXT_shader_integer_mix
 #define GL_EXT_shader_integer_mix 1
 #endif /* GL_EXT_shader_integer_mix */
@@ -4652,8 +4612,6 @@ GLAPI void APIENTRY glFramebufferFetchBarrierEXT (void);

 #ifndef GL_EXT_texture_filter_minmax
 #define GL_EXT_texture_filter_minmax 1
-#define GL_TEXTURE_REDUCTION_MODE_EXT     0x9366
-#define GL_WEIGHTED_AVERAGE_EXT           0x9367
 #endif /* GL_EXT_texture_filter_minmax */

 #ifndef GL_EXT_texture_sRGB_decode
@@ -4677,11 +4635,6 @@ GLAPI void APIENTRY glWindowRectanglesEXT (GLenum mode, GLsizei count, const GLi
 #endif
 #endif /* GL_EXT_window_rectangles */

-#ifndef GL_INTEL_blackhole_render
-#define GL_INTEL_blackhole_render 1
-#define GL_BLACKHOLE_RENDER_INTEL         0x83FC
-#endif /* GL_INTEL_blackhole_render */
-
 #ifndef GL_INTEL_conservative_rasterization
 #define GL_INTEL_conservative_rasterization 1
 #define GL_CONSERVATIVE_RASTERIZATION_INTEL 0x83FE
@@ -4724,7 +4677,7 @@ typedef void (APIENTRYP PFNGLENDPERFQUERYINTELPROC) (GLuint queryHandle);
 typedef void (APIENTRYP PFNGLGETFIRSTPERFQUERYIDINTELPROC) (GLuint *queryId);
 typedef void (APIENTRYP PFNGLGETNEXTPERFQUERYIDINTELPROC) (GLuint queryId, GLuint *nextQueryId);
 typedef void (APIENTRYP PFNGLGETPERFCOUNTERINFOINTELPROC) (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
-typedef void (APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten);
+typedef void (APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
 typedef void (APIENTRYP PFNGLGETPERFQUERYIDBYNAMEINTELPROC) (GLchar *queryName, GLuint *queryId);
 typedef void (APIENTRYP PFNGLGETPERFQUERYINFOINTELPROC) (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
 #ifdef GL_GLEXT_PROTOTYPES
@@ -4735,7 +4688,7 @@ GLAPI void APIENTRY glEndPerfQueryINTEL (GLuint queryHandle);
 GLAPI void APIENTRY glGetFirstPerfQueryIdINTEL (GLuint *queryId);
 GLAPI void APIENTRY glGetNextPerfQueryIdINTEL (GLuint queryId, GLuint *nextQueryId);
 GLAPI void APIENTRY glGetPerfCounterInfoINTEL (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
-GLAPI void APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten);
+GLAPI void APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
 GLAPI void APIENTRY glGetPerfQueryIdByNameINTEL (GLchar *queryName, GLuint *queryId);
 GLAPI void APIENTRY glGetPerfQueryInfoINTEL (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
 #endif
@@ -4970,11 +4923,6 @@ GLAPI void APIENTRY glConservativeRasterParameterfNV (GLenum pname, GLfloat valu
 #endif
 #endif /* GL_NV_conservative_raster_dilate */

-#ifndef GL_NV_conservative_raster_pre_snap
-#define GL_NV_conservative_raster_pre_snap 1
-#define GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_NV 0x9550
-#endif /* GL_NV_conservative_raster_pre_snap */
-
 #ifndef GL_NV_conservative_raster_pre_snap_triangles
 #define GL_NV_conservative_raster_pre_snap_triangles 1
 #define GL_CONSERVATIVE_RASTER_MODE_NV    0x954D
@@ -4986,10 +4934,6 @@ GLAPI void APIENTRY glConservativeRasterParameteriNV (GLenum pname, GLint param)
 #endif
 #endif /* GL_NV_conservative_raster_pre_snap_triangles */

-#ifndef GL_NV_conservative_raster_underestimation
-#define GL_NV_conservative_raster_underestimation 1
-#endif /* GL_NV_conservative_raster_underestimation */
-
 #ifndef GL_NV_draw_vulkan_image
 #define GL_NV_draw_vulkan_image 1
 typedef void (APIENTRY  *GLVULKANPROCNV)(void);
--- a/include/GL/glext.h
+++ b/include/GL/glext.h
@@ -1,12 +1,12 @@
-#ifndef __gl_glext_h_
-#define __gl_glext_h_ 1
+#ifndef __glext_h_
+#define __glext_h_ 1

 #ifdef __cplusplus
 extern "C" {
 #endif

 /*
-** Copyright (c) 2013-2018 The Khronos Group Inc.
+** Copyright (c) 2013-2017 The Khronos Group Inc.
 **
 ** Permission is hereby granted, free of charge, to any person obtaining a
 ** copy of this software and/or associated documentation files (the
@@ -51,7 +51,7 @@ extern "C" {
 #define GLAPI extern
 #endif

-#define GL_GLEXT_VERSION 20180725
+#define GL_GLEXT_VERSION 20171010

 /* Generated C header for:
 * API: gl
@@ -464,9 +464,9 @@ GLAPI void APIENTRY glBlendEquation (GLenum mode);

 #ifndef GL_VERSION_1_5
 #define GL_VERSION_1_5 1
-#include <KHR/khrplatform.h>
-typedef khronos_ssize_t GLsizeiptr;
-typedef khronos_intptr_t GLintptr;
+#include <stddef.h>
+typedef ptrdiff_t GLsizeiptr;
+typedef ptrdiff_t GLintptr;
 #define GL_BUFFER_SIZE                    0x8764
 #define GL_BUFFER_USAGE                   0x8765
 #define GL_QUERY_COUNTER_BITS             0x8864
@@ -4718,7 +4718,6 @@ GLAPI void APIENTRY glVertexBlendARB (GLint count);

 #ifndef GL_ARB_vertex_buffer_object
 #define GL_ARB_vertex_buffer_object 1
-#include <stddef.h>
 typedef ptrdiff_t GLsizeiptrARB;
 typedef ptrdiff_t GLintptrARB;
 #define GL_BUFFER_SIZE_ARB                0x8764
@@ -5446,22 +5445,6 @@ GLAPI void APIENTRY glBlendEquationSeparateIndexedAMD (GLuint buf, GLenum modeRG
 #endif
 #endif /* GL_AMD_draw_buffers_blend */

-#ifndef GL_AMD_framebuffer_multisample_advanced
-#define GL_AMD_framebuffer_multisample_advanced 1
-#define GL_RENDERBUFFER_STORAGE_SAMPLES_AMD 0x91B2
-#define GL_MAX_COLOR_FRAMEBUFFER_SAMPLES_AMD 0x91B3
-#define GL_MAX_COLOR_FRAMEBUFFER_STORAGE_SAMPLES_AMD 0x91B4
-#define GL_MAX_DEPTH_STENCIL_FRAMEBUFFER_SAMPLES_AMD 0x91B5
-#define GL_NUM_SUPPORTED_MULTISAMPLE_MODES_AMD 0x91B6
-#define GL_SUPPORTED_MULTISAMPLE_MODES_AMD 0x91B7
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEADVANCEDAMDPROC) (GLenum target, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEADVANCEDAMDPROC) (GLuint renderbuffer, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glRenderbufferStorageMultisampleAdvancedAMD (GLenum target, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
-GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleAdvancedAMD (GLuint renderbuffer, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
-#endif
-#endif /* GL_AMD_framebuffer_multisample_advanced */
-
 #ifndef GL_AMD_framebuffer_sample_positions
 #define GL_AMD_framebuffer_sample_positions 1
 #define GL_SUBSAMPLE_DISTANCE_AMD         0x883F
@@ -5726,10 +5709,6 @@ GLAPI void APIENTRY glSetMultisamplefvAMD (GLenum pname, GLuint index, const GLf
 #define GL_AMD_shader_explicit_vertex_parameter 1
 #endif /* GL_AMD_shader_explicit_vertex_parameter */

-#ifndef GL_AMD_shader_gpu_shader_half_float_fetch
-#define GL_AMD_shader_gpu_shader_half_float_fetch 1
-#endif /* GL_AMD_shader_gpu_shader_half_float_fetch */
-
 #ifndef GL_AMD_shader_image_load_store_lod
 #define GL_AMD_shader_image_load_store_lod 1
 #endif /* GL_AMD_shader_image_load_store_lod */
@@ -6477,17 +6456,6 @@ GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum pname, GLfloat param);
 #define GL_422_REV_AVERAGE_EXT            0x80CF
 #endif /* GL_EXT_422_pixels */

-#ifndef GL_EXT_EGL_image_storage
-#define GL_EXT_EGL_image_storage 1
-typedef void *GLeglImageOES;
-typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXSTORAGEEXTPROC) (GLenum target, GLeglImageOES image, const GLint* attrib_list);
-typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXTURESTORAGEEXTPROC) (GLuint texture, GLeglImageOES image, const GLint* attrib_list);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glEGLImageTargetTexStorageEXT (GLenum target, GLeglImageOES image, const GLint* attrib_list);
-GLAPI void APIENTRY glEGLImageTargetTextureStorageEXT (GLuint texture, GLeglImageOES image, const GLint* attrib_list);
-#endif
-#endif /* GL_EXT_EGL_image_storage */
-
 #ifndef GL_EXT_abgr
 #define GL_EXT_abgr 1
 #define GL_ABGR_EXT                       0x8000
@@ -8026,8 +7994,6 @@ GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint size, GLenum type, GLsizei
 #define GL_LAYOUT_SHADER_READ_ONLY_EXT    0x9591
 #define GL_LAYOUT_TRANSFER_SRC_EXT        0x9592
 #define GL_LAYOUT_TRANSFER_DST_EXT        0x9593
-#define GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT 0x9530
-#define GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT 0x9531
 typedef void (APIENTRYP PFNGLGENSEMAPHORESEXTPROC) (GLsizei n, GLuint *semaphores);
 typedef void (APIENTRYP PFNGLDELETESEMAPHORESEXTPROC) (GLsizei n, const GLuint *semaphores);
 typedef GLboolean (APIENTRYP PFNGLISSEMAPHOREEXTPROC) (GLuint semaphore);
@@ -8086,19 +8052,6 @@ GLAPI GLuint APIENTRY glCreateShaderProgramEXT (GLenum type, const GLchar *strin
 #define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
 #endif /* GL_EXT_separate_specular_color */

-#ifndef GL_EXT_shader_framebuffer_fetch
-#define GL_EXT_shader_framebuffer_fetch 1
-#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52
-#endif /* GL_EXT_shader_framebuffer_fetch */
-
-#ifndef GL_EXT_shader_framebuffer_fetch_non_coherent
-#define GL_EXT_shader_framebuffer_fetch_non_coherent 1
-typedef void (APIENTRYP PFNGLFRAMEBUFFERFETCHBARRIEREXTPROC) (void);
-#ifdef GL_GLEXT_PROTOTYPES
-GLAPI void APIENTRY glFramebufferFetchBarrierEXT (void);
-#endif
-#endif /* GL_EXT_shader_framebuffer_fetch_non_coherent */
-
 #ifndef GL_EXT_shader_image_load_formatted
 #define GL_EXT_shader_image_load_formatted 1
 #endif /* GL_EXT_shader_image_load_formatted */
@@ -8399,8 +8352,6 @@ GLAPI void APIENTRY glTexBufferEXT (GLenum target, GLenum internalformat, GLuint

 #ifndef GL_EXT_texture_filter_minmax
 #define GL_EXT_texture_filter_minmax 1
-#define GL_TEXTURE_REDUCTION_MODE_EXT     0x9366
-#define GL_WEIGHTED_AVERAGE_EXT           0x9367
 #endif /* GL_EXT_texture_filter_minmax */

 #ifndef GL_EXT_texture_integer
@@ -9148,11 +9099,6 @@ GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum sfactorRGB, GLenum dfactorRG
 #define GL_INTERLACE_READ_INGR            0x8568
 #endif /* GL_INGR_interlace_read */

-#ifndef GL_INTEL_blackhole_render
-#define GL_INTEL_blackhole_render 1
-#define GL_BLACKHOLE_RENDER_INTEL         0x83FC
-#endif /* GL_INTEL_blackhole_render */
-
 #ifndef GL_INTEL_conservative_rasterization
 #define GL_INTEL_conservative_rasterization 1
 #define GL_CONSERVATIVE_RASTERIZATION_INTEL 0x83FE
@@ -9234,7 +9180,7 @@ typedef void (APIENTRYP PFNGLENDPERFQUERYINTELPROC) (GLuint queryHandle);
 typedef void (APIENTRYP PFNGLGETFIRSTPERFQUERYIDINTELPROC) (GLuint *queryId);
 typedef void (APIENTRYP PFNGLGETNEXTPERFQUERYIDINTELPROC) (GLuint queryId, GLuint *nextQueryId);
 typedef void (APIENTRYP PFNGLGETPERFCOUNTERINFOINTELPROC) (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
-typedef void (APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten);
+typedef void (APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
 typedef void (APIENTRYP PFNGLGETPERFQUERYIDBYNAMEINTELPROC) (GLchar *queryName, GLuint *queryId);
 typedef void (APIENTRYP PFNGLGETPERFQUERYINFOINTELPROC) (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
 #ifdef GL_GLEXT_PROTOTYPES
@@ -9245,7 +9191,7 @@ GLAPI void APIENTRY glEndPerfQueryINTEL (GLuint queryHandle);
 GLAPI void APIENTRY glGetFirstPerfQueryIdINTEL (GLuint *queryId);
 GLAPI void APIENTRY glGetNextPerfQueryIdINTEL (GLuint queryId, GLuint *nextQueryId);
 GLAPI void APIENTRY glGetPerfCounterInfoINTEL (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
-GLAPI void APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten);
+GLAPI void APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
 GLAPI void APIENTRY glGetPerfQueryIdByNameINTEL (GLchar *queryName, GLuint *queryId);
 GLAPI void APIENTRY glGetPerfQueryInfoINTEL (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
 #endif
@@ -9637,11 +9583,6 @@ GLAPI void APIENTRY glConservativeRasterParameterfNV (GLenum pname, GLfloat valu
 #endif
 #endif /* GL_NV_conservative_raster_dilate */

-#ifndef GL_NV_conservative_raster_pre_snap
-#define GL_NV_conservative_raster_pre_snap 1
-#define GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_NV 0x9550
-#endif /* GL_NV_conservative_raster_pre_snap */
-
 #ifndef GL_NV_conservative_raster_pre_snap_triangles
 #define GL_NV_conservative_raster_pre_snap_triangles 1
 #define GL_CONSERVATIVE_RASTER_MODE_NV    0x954D
@@ -9653,10 +9594,6 @@ GLAPI void APIENTRY glConservativeRasterParameteriNV (GLenum pname, GLint param)
 #endif
 #endif /* GL_NV_conservative_raster_pre_snap_triangles */

-#ifndef GL_NV_conservative_raster_underestimation
-#define GL_NV_conservative_raster_underestimation 1
-#endif /* GL_NV_conservative_raster_underestimation */
-
 #ifndef GL_NV_copy_depth_to_color
 #define GL_NV_copy_depth_to_color 1
 #define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
@@ -9965,7 +9902,7 @@ GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum target, GLenum attachmen
 #define GL_PER_GPU_STORAGE_NV             0x9548
 #define GL_MULTICAST_PROGRAMMABLE_SAMPLE_LOCATION_NV 0x9549
 typedef void (APIENTRYP PFNGLRENDERGPUMASKNVPROC) (GLbitfield mask);
-typedef void (APIENTRYP PFNGLMULTICASTBUFFERSUBDATANVPROC) (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+typedef void (APIENTRYP PFNGLMULTICASTBUFFERSUBDATANVPROC) (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data);
 typedef void (APIENTRYP PFNGLMULTICASTCOPYBUFFERSUBDATANVPROC) (GLuint readGpu, GLbitfield writeGpuMask, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
 typedef void (APIENTRYP PFNGLMULTICASTCOPYIMAGESUBDATANVPROC) (GLuint srcGpu, GLbitfield dstGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
 typedef void (APIENTRYP PFNGLMULTICASTBLITFRAMEBUFFERNVPROC) (GLuint srcGpu, GLuint dstGpu, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
@@ -9978,7 +9915,7 @@ typedef void (APIENTRYP PFNGLMULTICASTGETQUERYOBJECTI64VNVPROC) (GLuint gpu, GLu
 typedef void (APIENTRYP PFNGLMULTICASTGETQUERYOBJECTUI64VNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLuint64 *params);
 #ifdef GL_GLEXT_PROTOTYPES
 GLAPI void APIENTRY glRenderGpuMaskNV (GLbitfield mask);
-GLAPI void APIENTRY glMulticastBufferSubDataNV (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+GLAPI void APIENTRY glMulticastBufferSubDataNV (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data);
 GLAPI void APIENTRY glMulticastCopyBufferSubDataNV (GLuint readGpu, GLbitfield writeGpuMask, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
 GLAPI void APIENTRY glMulticastCopyImageSubDataNV (GLuint srcGpu, GLbitfield dstGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
 GLAPI void APIENTRY glMulticastBlitFramebufferNV (GLuint srcGpu, GLuint dstGpu, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
--- a/include/GL/glxext.h
+++ b/include/GL/glxext.h
@@ -1,12 +1,12 @@
-#ifndef __glx_glxext_h_
-#define __glx_glxext_h_ 1
+#ifndef __glxext_h_
+#define __glxext_h_ 1

 #ifdef __cplusplus
 extern "C" {
 #endif

 /*
-** Copyright (c) 2013-2018 The Khronos Group Inc.
+** Copyright (c) 2013-2017 The Khronos Group Inc.
 **
 ** Permission is hereby granted, free of charge, to any person obtaining a
 ** copy of this software and/or associated documentation files (the
@@ -34,7 +34,7 @@ extern "C" {
 **   https://github.com/KhronosGroup/OpenGL-Registry
 */

-#define GLX_GLXEXT_VERSION 20180525
+#define GLX_GLXEXT_VERSION 20170728

 /* Generated C header for:
 * API: glx
@@ -325,10 +325,6 @@ void glXFreeContextEXT (Display *dpy, GLXContext context);
 #define GLX_VENDOR_NAMES_EXT              0x20F6
 #endif /* GLX_EXT_libglvnd */

-#ifndef GLX_EXT_no_config_context
-#define GLX_EXT_no_config_context 1
-#endif /* GLX_EXT_no_config_context */
-
 #ifndef GLX_EXT_stereo_tree
 #define GLX_EXT_stereo_tree 1
 typedef struct {
@@ -507,16 +503,6 @@ Bool glXSet3DfxModeMESA (int mode);
 #endif
 #endif /* GLX_MESA_set_3dfx_mode */

-#ifndef GLX_MESA_swap_control
-#define GLX_MESA_swap_control 1
-typedef int ( *PFNGLXGETSWAPINTERVALMESAPROC) (void);
-typedef int ( *PFNGLXSWAPINTERVALMESAPROC) (unsigned int interval);
-#ifdef GLX_GLXEXT_PROTOTYPES
-int glXGetSwapIntervalMESA (void);
-int glXSwapIntervalMESA (unsigned int interval);
-#endif
-#endif /* GLX_MESA_swap_control */
-
 #ifndef GLX_NV_copy_buffer
 #define GLX_NV_copy_buffer 1
 typedef void ( *PFNGLXCOPYBUFFERSUBDATANVPROC) (Display *dpy, GLXContext readCtx, GLXContext writeCtx, GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -589,7 +589,7 @@ struct __DRIdamageExtensionRec {
 * SWRast Loader extension.
 */
 #define __DRI_SWRAST_LOADER "DRI_SWRastLoader"
-#define __DRI_SWRAST_LOADER_VERSION 5
+#define __DRI_SWRAST_LOADER_VERSION 3
 struct __DRIswrastLoaderExtensionRec {
    __DRIextension base;

@@ -631,41 +631,6 @@ struct __DRIswrastLoaderExtensionRec {
   void (*getImage2)(__DRIdrawable *readable,
 		     int x, int y, int width, int height, int stride,
 		     char *data, void *loaderPrivate);
-
-    /**
-     * Put shm image to drawable
-     *
-     * \since 4
-     */
-    void (*putImageShm)(__DRIdrawable *drawable, int op,
-                        int x, int y, int width, int height, int stride,
-                        int shmid, char *shmaddr, unsigned offset,
-                        void *loaderPrivate);
-    /**
-     * Get shm image from readable
-     *
-     * \since 4
-     */
-    void (*getImageShm)(__DRIdrawable *readable,
-                        int x, int y, int width, int height,
-                        int shmid, void *loaderPrivate);
-
-   /**
-     * Put shm image to drawable (v2)
-     *
-     * The original version fixes srcx/y to 0, and expected
-     * the offset to be adjusted. This version allows src x,y
-     * to not be included in the offset. This is needed to
-     * avoid certain overflow checks in the X server, that
-     * result in lost rendering.
-     *
-     * \since 5
-     */
-    void (*putImageShm2)(__DRIdrawable *drawable, int op,
-                         int x, int y,
-                         int width, int height, int stride,
-                         int shmid, char *shmaddr, unsigned offset,
-                         void *loaderPrivate);
 };

 /**
@@ -763,8 +728,7 @@ struct __DRIuseInvalidateExtensionRec {
 #define __DRI_ATTRIB_BIND_TO_TEXTURE_TARGETS	46
 #define __DRI_ATTRIB_YINVERTED			47
 #define __DRI_ATTRIB_FRAMEBUFFER_SRGB_CAPABLE	48
-#define __DRI_ATTRIB_MUTABLE_RENDER_BUFFER	49 /* EGL_MUTABLE_RENDER_BUFFER_BIT_KHR */
-#define __DRI_ATTRIB_MAX			50
+#define __DRI_ATTRIB_MAX			(__DRI_ATTRIB_FRAMEBUFFER_SRGB_CAPABLE + 1)

 /* __DRI_ATTRIB_RENDER_TYPE */
 #define __DRI_ATTRIB_RGBA_BIT			0x01	
@@ -1289,7 +1253,6 @@ struct __DRIdri2ExtensionRec {
 #define __DRI_IMAGE_FORMAT_YUYV         0x100f
 #define __DRI_IMAGE_FORMAT_XBGR2101010  0x1010
 #define __DRI_IMAGE_FORMAT_ABGR2101010  0x1011
-#define __DRI_IMAGE_FORMAT_SABGR8       0x1012

 #define __DRI_IMAGE_USE_SHARE		0x0001
 #define __DRI_IMAGE_USE_SCANOUT		0x0002
@@ -1326,7 +1289,6 @@ struct __DRIdri2ExtensionRec {
 #define __DRI_IMAGE_FOURCC_ABGR8888	0x34324241
 #define __DRI_IMAGE_FOURCC_XBGR8888	0x34324258
 #define __DRI_IMAGE_FOURCC_SARGB8888	0x83324258
-#define __DRI_IMAGE_FOURCC_SABGR8888	0x84324258
 #define __DRI_IMAGE_FOURCC_ARGB2101010	0x30335241
 #define __DRI_IMAGE_FOURCC_XRGB2101010	0x30335258
 #define __DRI_IMAGE_FOURCC_ABGR2101010	0x30334241
@@ -1344,7 +1306,6 @@ struct __DRIdri2ExtensionRec {
 #define __DRI_IMAGE_FOURCC_NV16		0x3631564e
 #define __DRI_IMAGE_FOURCC_YUYV		0x56595559
 #define __DRI_IMAGE_FOURCC_UYVY		0x59565955
-#define __DRI_IMAGE_FOURCC_AYUV		0x56555941

 #define __DRI_IMAGE_FOURCC_YVU410	0x39555659
 #define __DRI_IMAGE_FOURCC_YVU411	0x31315659
@@ -1371,7 +1332,6 @@ struct __DRIdri2ExtensionRec {
 #define __DRI_IMAGE_COMPONENTS_Y_UV	0x3004
 #define __DRI_IMAGE_COMPONENTS_Y_XUXV	0x3005
 #define __DRI_IMAGE_COMPONENTS_Y_UXVX	0x3008
-#define __DRI_IMAGE_COMPONENTS_AYUV	0x3009
 #define __DRI_IMAGE_COMPONENTS_R	0x3006
 #define __DRI_IMAGE_COMPONENTS_RG	0x3007

@@ -1908,57 +1868,9 @@ struct __DRI2rendererQueryExtensionRec {
 * Image Loader extension. Drivers use this to allocate color buffers
 */

-/**
- * See __DRIimageLoaderExtensionRec::getBuffers::buffer_mask.
- */
 enum __DRIimageBufferMask {
   __DRI_IMAGE_BUFFER_BACK = (1 << 0),
-   __DRI_IMAGE_BUFFER_FRONT = (1 << 1),
-
-   /**
-    * A buffer shared between application and compositor. The buffer may be
-    * simultaneously accessed by each.
-    *
-    * A shared buffer is equivalent to an EGLSurface whose EGLConfig contains
-    * EGL_MUTABLE_RENDER_BUFFER_BIT_KHR and whose active EGL_RENDER_BUFFER (as
-    * opposed to any pending, requested change to EGL_RENDER_BUFFER) is
-    * EGL_SINGLE_BUFFER.
-    *
-    * If buffer_mask contains __DRI_IMAGE_BUFFER_SHARED, then must contains no
-    * other bits. As a corollary, a __DRIdrawable that has a "shared" buffer
-    * has no front nor back buffer.
-    *
-    * The loader returns __DRI_IMAGE_BUFFER_SHARED in buffer_mask if and only
-    * if:
-    *     - The loader supports __DRI_MUTABLE_RENDER_BUFFER_LOADER.
-    *     - The driver supports __DRI_MUTABLE_RENDER_BUFFER_DRIVER.
-    *     - The EGLConfig of the drawable EGLSurface contains
-    *       EGL_MUTABLE_RENDER_BUFFER_BIT_KHR.
-    *     - The EGLContext's EGL_RENDER_BUFFER is EGL_SINGLE_BUFFER.
-    *       Equivalently, the EGLSurface's active EGL_RENDER_BUFFER (as
-    *       opposed to any pending, requested change to EGL_RENDER_BUFFER) is
-    *       EGL_SINGLE_BUFFER. (See the EGL 1.5 and
-    *       EGL_KHR_mutable_render_buffer spec for details about "pending" vs
-    *       "active" EGL_RENDER_BUFFER state).
-    *
-    * A shared buffer is similar to a front buffer in that all rendering to the
-    * buffer should appear promptly on the screen. It is different from
-    * a front buffer in that its behavior is independent from the
-    * GL_DRAW_BUFFER state. Specifically, if GL_DRAW_FRAMEBUFFER is 0 and the
-    * __DRIdrawable's buffer_mask is __DRI_IMAGE_BUFFER_SHARED, then all
-    * rendering should appear promptly on the screen if GL_DRAW_BUFFER is not
-    * GL_NONE.
-    *
-    * The difference between a shared buffer and a front buffer is motivated
-    * by the constraints of Android and OpenGL ES. OpenGL ES does not support
-    * front-buffer rendering. Android's SurfaceFlinger protocol provides the
-    * EGL driver only a back buffer and no front buffer. The shared buffer
-    * mode introduced by EGL_KHR_mutable_render_buffer is a backdoor though
-    * EGL that allows Android OpenGL ES applications to render to what is
-    * effectively the front buffer, a backdoor that required no change to the
-    * OpenGL ES API and little change to the SurfaceFlinger API.
-    */
-   __DRI_IMAGE_BUFFER_SHARED = (1 << 2),
+   __DRI_IMAGE_BUFFER_FRONT = (1 << 1)
 };

 struct __DRIimageList {
@@ -1983,8 +1895,7 @@ struct __DRIimageLoaderExtensionRec {
    * \param stamp              Address of variable to be updated when
    *                           getBuffers must be called again
    * \param loaderPrivate      The loaderPrivate for driDrawable
-    * \param buffer_mask        Set of buffers to allocate. A bitmask of
-    *                           __DRIimageBufferMask.
+    * \param buffer_mask        Set of buffers to allocate
    * \param buffers            Returned buffers
    */
   int (*getBuffers)(__DRIdrawable *driDrawable,
@@ -2098,85 +2009,4 @@ struct __DRIbackgroundCallableExtensionRec {
   GLboolean (*isThreadSafe)(void *loaderPrivate);
 };

-/**
- * The driver portion of EGL_KHR_mutable_render_buffer.
- *
- * If the driver creates a __DRIconfig with
- * __DRI_ATTRIB_MUTABLE_RENDER_BUFFER, then it must support this extension.
- *
- * To support this extension:
- *
- *    - The driver should create at least one __DRIconfig with
- *      __DRI_ATTRIB_MUTABLE_RENDER_BUFFER. This is strongly recommended but
- *      not required.
- *
- *    - The driver must be able to handle __DRI_IMAGE_BUFFER_SHARED if
- *      returned by __DRIimageLoaderExtension:getBuffers().
- *
- *    - When rendering to __DRI_IMAGE_BUFFER_SHARED, it must call
- *      __DRImutableRenderBufferLoaderExtension::displaySharedBuffer() in
- *      response to glFlush and glFinish.  (This requirement is not documented
- *      in EGL_KHR_mutable_render_buffer, but is a de-facto requirement in the
- *      Android ecosystem. Android applications expect that glFlush will
- *      immediately display the buffer when in shared buffer mode, and Android
- *      drivers comply with this expectation).  It :may: call
- *      displaySharedBuffer() more often than required.
- *
- *    - When rendering to __DRI_IMAGE_BUFFER_SHARED, it must ensure that the
- *      buffer is always in a format compatible for display because the
- *      display engine (usually SurfaceFlinger or hwcomposer) may display the
- *      image at any time, even concurrently with 3D rendering. For example,
- *      display hardware and the GL hardware may be able to access the buffer
- *      simultaneously. In particular, if the buffer is compressed then take
- *      care that SurfaceFlinger and hwcomposer can consume the compression
- *      format.
- *
- * \see __DRI_IMAGE_BUFFER_SHARED
- * \see __DRI_ATTRIB_MUTABLE_RENDER_BUFFER
- * \see __DRI_MUTABLE_RENDER_BUFFER_LOADER
- */
-#define __DRI_MUTABLE_RENDER_BUFFER_DRIVER "DRI_MutableRenderBufferDriver"
-#define __DRI_MUTABLE_RENDER_BUFFER_DRIVER_VERSION 1
-
-typedef struct __DRImutableRenderBufferDriverExtensionRec __DRImutableRenderBufferDriverExtension;
-struct __DRImutableRenderBufferDriverExtensionRec {
-   __DRIextension base;
-};
-
-/**
- * The loader portion of EGL_KHR_mutable_render_buffer.
- *
- * Requires loader extension DRI_IMAGE_LOADER, through which the loader sends
- * __DRI_IMAGE_BUFFER_SHARED to the driver.
- *
- * \see __DRI_MUTABLE_RENDER_BUFFER_DRIVER
- */
-#define __DRI_MUTABLE_RENDER_BUFFER_LOADER "DRI_MutableRenderBufferLoader"
-#define __DRI_MUTABLE_RENDER_BUFFER_LOADER_VERSION 1
-
-typedef struct __DRImutableRenderBufferLoaderExtensionRec __DRImutableRenderBufferLoaderExtension;
-struct __DRImutableRenderBufferLoaderExtensionRec {
-   __DRIextension base;
-
-   /**
-    * Inform the display engine (that is, SurfaceFlinger and/or hwcomposer)
-    * that the __DRIdrawable has new content.
-    *
-    * The display engine may ignore this call, for example, if it continually
-    * refreshes and displays the buffer on every frame, as in
-    * EGL_ANDROID_front_buffer_auto_refresh. On the other extreme, the display
-    * engine may refresh and display the buffer only in frames in which the
-    * driver calls this.
-    *
-    * If the fence_fd is not -1, then the display engine will display the
-    * buffer only after the fence signals.
-    *
-    * The drawable's current __DRIimageBufferMask, as returned by
-    * __DRIimageLoaderExtension::getBuffers(), must be
-    * __DRI_IMAGE_BUFFER_SHARED.
-    */
-   void (*displaySharedBuffer)(__DRIdrawable *drawable, int fence_fd,
-                               void *loaderPrivate);
-};
-
 #endif
--- a/include/GLES2/gl2.h
+++ b/include/GLES2/gl2.h
@@ -1,12 +1,12 @@
-#ifndef __gles2_gl2_h_
-#define __gles2_gl2_h_ 1
+#ifndef __gl2_h_
+#define __gl2_h_ 1

 #ifdef __cplusplus
 extern "C" {
 #endif

 /*
-** Copyright (c) 2013-2018 The Khronos Group Inc.
+** Copyright (c) 2013-2017 The Khronos Group Inc.
 **
 ** Permission is hereby granted, free of charge, to any person obtaining a
 ** copy of this software and/or associated documentation files (the
@@ -44,7 +44,7 @@ extern "C" {
 #define GL_GLES_PROTOTYPES 1
 #endif

-/* Generated on date 20180725 */
+/* Generated on date 20170606 */

 /* Generated C header for:
 * API: gles2
--- a/include/GLES2/gl2ext.h
+++ b/include/GLES2/gl2ext.h
@@ -1,12 +1,12 @@
-#ifndef __gles2_gl2ext_h_
-#define __gles2_gl2ext_h_ 1
+#ifndef __gl2ext_h_
+#define __gl2ext_h_ 1

 #ifdef __cplusplus
 extern "C" {
 #endif

 /*
-** Copyright (c) 2013-2018 The Khronos Group Inc.
+** Copyright (c) 2013-2017 The Khronos Group Inc.
 **
 ** Permission is hereby granted, free of charge, to any person obtaining a
 ** copy of this software and/or associated documentation files (the
@@ -38,7 +38,7 @@ extern "C" {
 #define GL_APIENTRYP GL_APIENTRY*
 #endif

-/* Generated on date 20180725 */
+/* Generated on date 20170804 */

 /* Generated C header for:
 * API: gles2
@@ -159,16 +159,6 @@ GL_APICALL void GL_APIENTRY glGetPointervKHR (GLenum pname, void **params);
 #define GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR  0x00000008
 #endif /* GL_KHR_no_error */

-#ifndef GL_KHR_parallel_shader_compile
-#define GL_KHR_parallel_shader_compile 1
-#define GL_MAX_SHADER_COMPILER_THREADS_KHR 0x91B0
-#define GL_COMPLETION_STATUS_KHR          0x91B1
-typedef void (GL_APIENTRYP PFNGLMAXSHADERCOMPILERTHREADSKHRPROC) (GLuint count);
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glMaxShaderCompilerThreadsKHR (GLuint count);
-#endif
-#endif /* GL_KHR_parallel_shader_compile */
-
 #ifndef GL_KHR_robust_buffer_access_behavior
 #define GL_KHR_robust_buffer_access_behavior 1
 #endif /* GL_KHR_robust_buffer_access_behavior */
@@ -801,22 +791,6 @@ GL_APICALL void GL_APIENTRY glGetFloati_vOES (GLenum target, GLuint index, GLflo
 #define GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD 0x87EE
 #endif /* GL_AMD_compressed_ATC_texture */

-#ifndef GL_AMD_framebuffer_multisample_advanced
-#define GL_AMD_framebuffer_multisample_advanced 1
-#define GL_RENDERBUFFER_STORAGE_SAMPLES_AMD 0x91B2
-#define GL_MAX_COLOR_FRAMEBUFFER_SAMPLES_AMD 0x91B3
-#define GL_MAX_COLOR_FRAMEBUFFER_STORAGE_SAMPLES_AMD 0x91B4
-#define GL_MAX_DEPTH_STENCIL_FRAMEBUFFER_SAMPLES_AMD 0x91B5
-#define GL_NUM_SUPPORTED_MULTISAMPLE_MODES_AMD 0x91B6
-#define GL_SUPPORTED_MULTISAMPLE_MODES_AMD 0x91B7
-typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEADVANCEDAMDPROC) (GLenum target, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
-typedef void (GL_APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEADVANCEDAMDPROC) (GLuint renderbuffer, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleAdvancedAMD (GLenum target, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
-GL_APICALL void GL_APIENTRY glNamedRenderbufferStorageMultisampleAdvancedAMD (GLuint renderbuffer, GLsizei samples, GLsizei storageSamples, GLenum internalformat, GLsizei width, GLsizei height);
-#endif
-#endif /* GL_AMD_framebuffer_multisample_advanced */
-
 #ifndef GL_AMD_performance_monitor
 #define GL_AMD_performance_monitor 1
 #define GL_COUNTER_TYPE_AMD               0x8BC0
@@ -1081,16 +1055,6 @@ GL_APICALL void GL_APIENTRY glGetSyncivAPPLE (GLsync sync, GLenum pname, GLsizei
 #define GL_EXT_EGL_image_array 1
 #endif /* GL_EXT_EGL_image_array */

-#ifndef GL_EXT_EGL_image_storage
-#define GL_EXT_EGL_image_storage 1
-typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXSTORAGEEXTPROC) (GLenum target, GLeglImageOES image, const GLint* attrib_list);
-typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURESTORAGEEXTPROC) (GLuint texture, GLeglImageOES image, const GLint* attrib_list);
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glEGLImageTargetTexStorageEXT (GLenum target, GLeglImageOES image, const GLint* attrib_list);
-GL_APICALL void GL_APIENTRY glEGLImageTargetTextureStorageEXT (GLuint texture, GLeglImageOES image, const GLint* attrib_list);
-#endif
-#endif /* GL_EXT_EGL_image_storage */
-
 #ifndef GL_EXT_YUV_target
 #define GL_EXT_YUV_target 1
 #define GL_SAMPLER_EXTERNAL_2D_Y2Y_EXT    0x8BE7
@@ -1162,20 +1126,6 @@ GL_APICALL void GL_APIENTRY glClearTexSubImageEXT (GLuint texture, GLint level,
 #endif
 #endif /* GL_EXT_clear_texture */

-#ifndef GL_EXT_clip_control
-#define GL_EXT_clip_control 1
-#define GL_LOWER_LEFT_EXT                 0x8CA1
-#define GL_UPPER_LEFT_EXT                 0x8CA2
-#define GL_NEGATIVE_ONE_TO_ONE_EXT        0x935E
-#define GL_ZERO_TO_ONE_EXT                0x935F
-#define GL_CLIP_ORIGIN_EXT                0x935C
-#define GL_CLIP_DEPTH_MODE_EXT            0x935D
-typedef void (GL_APIENTRYP PFNGLCLIPCONTROLEXTPROC) (GLenum origin, GLenum depth);
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glClipControlEXT (GLenum origin, GLenum depth);
-#endif
-#endif /* GL_EXT_clip_control */
-
 #ifndef GL_EXT_clip_cull_distance
 #define GL_EXT_clip_cull_distance 1
 #define GL_MAX_CLIP_DISTANCES_EXT         0x0D32
@@ -1730,8 +1680,6 @@ GL_APICALL void GL_APIENTRY glGetnUniformivEXT (GLuint program, GLint location,
 #define GL_LAYOUT_SHADER_READ_ONLY_EXT    0x9591
 #define GL_LAYOUT_TRANSFER_SRC_EXT        0x9592
 #define GL_LAYOUT_TRANSFER_DST_EXT        0x9593
-#define GL_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_EXT 0x9530
-#define GL_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_EXT 0x9531
 typedef void (GL_APIENTRYP PFNGLGENSEMAPHORESEXTPROC) (GLsizei n, GLuint *semaphores);
 typedef void (GL_APIENTRYP PFNGLDELETESEMAPHORESEXTPROC) (GLsizei n, const GLuint *semaphores);
 typedef GLboolean (GL_APIENTRYP PFNGLISSEMAPHOREEXTPROC) (GLuint semaphore);
@@ -1875,14 +1823,6 @@ GL_APICALL void GL_APIENTRY glProgramUniformMatrix4x3fvEXT (GLuint program, GLin
 #define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52
 #endif /* GL_EXT_shader_framebuffer_fetch */

-#ifndef GL_EXT_shader_framebuffer_fetch_non_coherent
-#define GL_EXT_shader_framebuffer_fetch_non_coherent 1
-typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERFETCHBARRIEREXTPROC) (void);
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glFramebufferFetchBarrierEXT (void);
-#endif
-#endif /* GL_EXT_shader_framebuffer_fetch_non_coherent */
-
 #ifndef GL_EXT_shader_group_vote
 #define GL_EXT_shader_group_vote 1
 #endif /* GL_EXT_shader_group_vote */
@@ -2127,24 +2067,12 @@ GL_APICALL void GL_APIENTRY glTexBufferRangeEXT (GLenum target, GLenum internalf

 #ifndef GL_EXT_texture_filter_minmax
 #define GL_EXT_texture_filter_minmax 1
-#define GL_TEXTURE_REDUCTION_MODE_EXT     0x9366
-#define GL_WEIGHTED_AVERAGE_EXT           0x9367
 #endif /* GL_EXT_texture_filter_minmax */

 #ifndef GL_EXT_texture_format_BGRA8888
 #define GL_EXT_texture_format_BGRA8888 1
 #endif /* GL_EXT_texture_format_BGRA8888 */

-#ifndef GL_EXT_texture_format_sRGB_override
-#define GL_EXT_texture_format_sRGB_override 1
-#define GL_TEXTURE_FORMAT_SRGB_OVERRIDE_EXT 0x8FBF
-#endif /* GL_EXT_texture_format_sRGB_override */
-
-#ifndef GL_EXT_texture_mirror_clamp_to_edge
-#define GL_EXT_texture_mirror_clamp_to_edge 1
-#define GL_MIRROR_CLAMP_TO_EDGE_EXT       0x8743
-#endif /* GL_EXT_texture_mirror_clamp_to_edge */
-
 #ifndef GL_EXT_texture_norm16
 #define GL_EXT_texture_norm16 1
 #define GL_R16_EXT                        0x822A
@@ -2347,11 +2275,6 @@ GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleIMG (GLenum target,
 #define GL_CUBIC_MIPMAP_LINEAR_IMG        0x913B
 #endif /* GL_IMG_texture_filter_cubic */

-#ifndef GL_INTEL_blackhole_render
-#define GL_INTEL_blackhole_render 1
-#define GL_BLACKHOLE_RENDER_INTEL         0x83FC
-#endif /* GL_INTEL_blackhole_render */
-
 #ifndef GL_INTEL_conservative_rasterization
 #define GL_INTEL_conservative_rasterization 1
 #define GL_CONSERVATIVE_RASTERIZATION_INTEL 0x83FE
@@ -2394,7 +2317,7 @@ typedef void (GL_APIENTRYP PFNGLENDPERFQUERYINTELPROC) (GLuint queryHandle);
 typedef void (GL_APIENTRYP PFNGLGETFIRSTPERFQUERYIDINTELPROC) (GLuint *queryId);
 typedef void (GL_APIENTRYP PFNGLGETNEXTPERFQUERYIDINTELPROC) (GLuint queryId, GLuint *nextQueryId);
 typedef void (GL_APIENTRYP PFNGLGETPERFCOUNTERINFOINTELPROC) (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
-typedef void (GL_APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten);
+typedef void (GL_APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
 typedef void (GL_APIENTRYP PFNGLGETPERFQUERYIDBYNAMEINTELPROC) (GLchar *queryName, GLuint *queryId);
 typedef void (GL_APIENTRYP PFNGLGETPERFQUERYINFOINTELPROC) (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
 #ifdef GL_GLEXT_PROTOTYPES
@@ -2405,17 +2328,12 @@ GL_APICALL void GL_APIENTRY glEndPerfQueryINTEL (GLuint queryHandle);
 GL_APICALL void GL_APIENTRY glGetFirstPerfQueryIdINTEL (GLuint *queryId);
 GL_APICALL void GL_APIENTRY glGetNextPerfQueryIdINTEL (GLuint queryId, GLuint *nextQueryId);
 GL_APICALL void GL_APIENTRY glGetPerfCounterInfoINTEL (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
-GL_APICALL void GL_APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten);
+GL_APICALL void GL_APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
 GL_APICALL void GL_APIENTRY glGetPerfQueryIdByNameINTEL (GLchar *queryName, GLuint *queryId);
 GL_APICALL void GL_APIENTRY glGetPerfQueryInfoINTEL (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
 #endif
 #endif /* GL_INTEL_performance_query */

-#ifndef GL_MESA_framebuffer_flip_y
-#define GL_MESA_framebuffer_flip_y 1
-#define GL_FRAMEBUFFER_FLIP_Y_MESA        0x8BBB
-#endif /* GL_MESA_framebuffer_flip_y */
-
 #ifndef GL_MESA_program_binary_formats
 #define GL_MESA_program_binary_formats 1
 #define GL_PROGRAM_BINARY_FORMAT_MESA     0x875F
@@ -2531,17 +2449,6 @@ GL_APICALL void GL_APIENTRY glBlendBarrierNV (void);
 #define GL_FACTOR_MAX_AMD                 0x901D
 #endif /* GL_NV_blend_minmax_factor */

-#ifndef GL_NV_clip_space_w_scaling
-#define GL_NV_clip_space_w_scaling 1
-#define GL_VIEWPORT_POSITION_W_SCALE_NV   0x937C
-#define GL_VIEWPORT_POSITION_W_SCALE_X_COEFF_NV 0x937D
-#define GL_VIEWPORT_POSITION_W_SCALE_Y_COEFF_NV 0x937E
-typedef void (GL_APIENTRYP PFNGLVIEWPORTPOSITIONWSCALENVPROC) (GLuint index, GLfloat xcoeff, GLfloat ycoeff);
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glViewportPositionWScaleNV (GLuint index, GLfloat xcoeff, GLfloat ycoeff);
-#endif
-#endif /* GL_NV_clip_space_w_scaling */
-
 #ifndef GL_NV_conditional_render
 #define GL_NV_conditional_render 1
 #define GL_QUERY_WAIT_NV                  0x8E13
@@ -2568,11 +2475,6 @@ GL_APICALL void GL_APIENTRY glSubpixelPrecisionBiasNV (GLuint xbits, GLuint ybit
 #endif
 #endif /* GL_NV_conservative_raster */

-#ifndef GL_NV_conservative_raster_pre_snap
-#define GL_NV_conservative_raster_pre_snap 1
-#define GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_NV 0x9550
-#endif /* GL_NV_conservative_raster_pre_snap */
-
 #ifndef GL_NV_conservative_raster_pre_snap_triangles
 #define GL_NV_conservative_raster_pre_snap_triangles 1
 #define GL_CONSERVATIVE_RASTER_MODE_NV    0x954D
@@ -2944,7 +2846,6 @@ GL_APICALL void GL_APIENTRY glUniformMatrix4x3fvNV (GLint location, GLsizei coun

 #ifndef GL_NV_path_rendering
 #define GL_NV_path_rendering 1
-typedef double GLdouble;
 #define GL_PATH_FORMAT_SVG_NV             0x9070
 #define GL_PATH_FORMAT_PS_NV              0x9071
 #define GL_STANDARD_FONT_NAME_NV          0x9072
@@ -3155,25 +3056,6 @@ typedef GLenum (GL_APIENTRYP PFNGLPATHGLYPHINDEXARRAYNVPROC) (GLuint firstPathNa
 typedef GLenum (GL_APIENTRYP PFNGLPATHMEMORYGLYPHINDEXARRAYNVPROC) (GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
 typedef void (GL_APIENTRYP PFNGLPROGRAMPATHFRAGMENTINPUTGENNVPROC) (GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat *coeffs);
 typedef void (GL_APIENTRYP PFNGLGETPROGRAMRESOURCEFVNVPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLfloat *params);
-typedef void (GL_APIENTRYP PFNGLMATRIXFRUSTUMEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-typedef void (GL_APIENTRYP PFNGLMATRIXLOADIDENTITYEXTPROC) (GLenum mode);
-typedef void (GL_APIENTRYP PFNGLMATRIXLOADTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
-typedef void (GL_APIENTRYP PFNGLMATRIXLOADTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
-typedef void (GL_APIENTRYP PFNGLMATRIXLOADFEXTPROC) (GLenum mode, const GLfloat *m);
-typedef void (GL_APIENTRYP PFNGLMATRIXLOADDEXTPROC) (GLenum mode, const GLdouble *m);
-typedef void (GL_APIENTRYP PFNGLMATRIXMULTTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
-typedef void (GL_APIENTRYP PFNGLMATRIXMULTTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
-typedef void (GL_APIENTRYP PFNGLMATRIXMULTFEXTPROC) (GLenum mode, const GLfloat *m);
-typedef void (GL_APIENTRYP PFNGLMATRIXMULTDEXTPROC) (GLenum mode, const GLdouble *m);
-typedef void (GL_APIENTRYP PFNGLMATRIXORTHOEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-typedef void (GL_APIENTRYP PFNGLMATRIXPOPEXTPROC) (GLenum mode);
-typedef void (GL_APIENTRYP PFNGLMATRIXPUSHEXTPROC) (GLenum mode);
-typedef void (GL_APIENTRYP PFNGLMATRIXROTATEFEXTPROC) (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GL_APIENTRYP PFNGLMATRIXROTATEDEXTPROC) (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
-typedef void (GL_APIENTRYP PFNGLMATRIXSCALEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GL_APIENTRYP PFNGLMATRIXSCALEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
-typedef void (GL_APIENTRYP PFNGLMATRIXTRANSLATEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
-typedef void (GL_APIENTRYP PFNGLMATRIXTRANSLATEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
 #ifdef GL_GLEXT_PROTOTYPES
 GL_APICALL GLuint GL_APIENTRY glGenPathsNV (GLsizei range);
 GL_APICALL void GL_APIENTRY glDeletePathsNV (GLuint path, GLsizei range);
@@ -3232,25 +3114,6 @@ GL_APICALL GLenum GL_APIENTRY glPathGlyphIndexArrayNV (GLuint firstPathName, GLe
 GL_APICALL GLenum GL_APIENTRY glPathMemoryGlyphIndexArrayNV (GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
 GL_APICALL void GL_APIENTRY glProgramPathFragmentInputGenNV (GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat *coeffs);
 GL_APICALL void GL_APIENTRY glGetProgramResourcefvNV (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLfloat *params);
-GL_APICALL void GL_APIENTRY glMatrixFrustumEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-GL_APICALL void GL_APIENTRY glMatrixLoadIdentityEXT (GLenum mode);
-GL_APICALL void GL_APIENTRY glMatrixLoadTransposefEXT (GLenum mode, const GLfloat *m);
-GL_APICALL void GL_APIENTRY glMatrixLoadTransposedEXT (GLenum mode, const GLdouble *m);
-GL_APICALL void GL_APIENTRY glMatrixLoadfEXT (GLenum mode, const GLfloat *m);
-GL_APICALL void GL_APIENTRY glMatrixLoaddEXT (GLenum mode, const GLdouble *m);
-GL_APICALL void GL_APIENTRY glMatrixMultTransposefEXT (GLenum mode, const GLfloat *m);
-GL_APICALL void GL_APIENTRY glMatrixMultTransposedEXT (GLenum mode, const GLdouble *m);
-GL_APICALL void GL_APIENTRY glMatrixMultfEXT (GLenum mode, const GLfloat *m);
-GL_APICALL void GL_APIENTRY glMatrixMultdEXT (GLenum mode, const GLdouble *m);
-GL_APICALL void GL_APIENTRY glMatrixOrthoEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
-GL_APICALL void GL_APIENTRY glMatrixPopEXT (GLenum mode);
-GL_APICALL void GL_APIENTRY glMatrixPushEXT (GLenum mode);
-GL_APICALL void GL_APIENTRY glMatrixRotatefEXT (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
-GL_APICALL void GL_APIENTRY glMatrixRotatedEXT (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
-GL_APICALL void GL_APIENTRY glMatrixScalefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
-GL_APICALL void GL_APIENTRY glMatrixScaledEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
-GL_APICALL void GL_APIENTRY glMatrixTranslatefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
-GL_APICALL void GL_APIENTRY glMatrixTranslatedEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
 #endif
 #endif /* GL_NV_path_rendering */

@@ -3362,10 +3225,6 @@ GL_APICALL void GL_APIENTRY glResolveDepthValuesNV (void);
 #define GL_SAMPLER_CUBE_SHADOW_NV         0x8DC5
 #endif /* GL_NV_shadow_samplers_cube */

-#ifndef GL_NV_stereo_view_rendering
-#define GL_NV_stereo_view_rendering 1
-#endif /* GL_NV_stereo_view_rendering */
-
 #ifndef GL_NV_texture_border_clamp
 #define GL_NV_texture_border_clamp 1
 #define GL_TEXTURE_BORDER_COLOR_NV        0x1004
@@ -3568,19 +3427,6 @@ GL_APICALL void GL_APIENTRY glFramebufferFetchBarrierQCOM (void);
 #endif
 #endif /* GL_QCOM_shader_framebuffer_fetch_noncoherent */

-#ifndef GL_QCOM_texture_foveated
-#define GL_QCOM_texture_foveated 1
-#define GL_TEXTURE_FOVEATED_FEATURE_BITS_QCOM 0x8BFB
-#define GL_TEXTURE_FOVEATED_MIN_PIXEL_DENSITY_QCOM 0x8BFC
-#define GL_TEXTURE_FOVEATED_FEATURE_QUERY_QCOM 0x8BFD
-#define GL_TEXTURE_FOVEATED_NUM_FOCAL_POINTS_QUERY_QCOM 0x8BFE
-#define GL_FRAMEBUFFER_INCOMPLETE_FOVEATION_QCOM 0x8BFF
-typedef void (GL_APIENTRYP PFNGLTEXTUREFOVEATIONPARAMETERSQCOMPROC) (GLuint texture, GLuint layer, GLuint focalPoint, GLfloat focalX, GLfloat focalY, GLfloat gainX, GLfloat gainY, GLfloat foveaArea);
-#ifdef GL_GLEXT_PROTOTYPES
-GL_APICALL void GL_APIENTRY glTextureFoveationParametersQCOM (GLuint texture, GLuint layer, GLuint focalPoint, GLfloat focalX, GLfloat focalY, GLfloat gainX, GLfloat gainY, GLfloat foveaArea);
-#endif
-#endif /* GL_QCOM_texture_foveated */
-
 #ifndef GL_QCOM_tiled_rendering
 #define GL_QCOM_tiled_rendering 1
 #define GL_COLOR_BUFFER_BIT0_QCOM         0x00000001
--- a/include/GLES3/gl3.h
+++ b/include/GLES3/gl3.h
@@ -1,12 +1,12 @@
-#ifndef __gles2_gl3_h_
-#define __gles2_gl3_h_ 1
+#ifndef __gl3_h_
+#define __gl3_h_ 1

 #ifdef __cplusplus
 extern "C" {
 #endif

 /*
-** Copyright (c) 2013-2018 The Khronos Group Inc.
+** Copyright (c) 2013-2017 The Khronos Group Inc.
 **
 ** Permission is hereby granted, free of charge, to any person obtaining a
 ** copy of this software and/or associated documentation files (the
@@ -44,7 +44,7 @@ extern "C" {
 #define GL_GLES_PROTOTYPES 1
 #endif

-/* Generated on date 20180725 */
+/* Generated on date 20170606 */

 /* Generated C header for:
 * API: gles2
--- a/include/c11/threads_win32.h
+++ b/include/c11/threads_win32.h
@@ -76,8 +76,18 @@ Configuration macro:
 #endif

 /* Visual Studio 2015 and later */
-#ifdef _MSC_VER
+#if _MSC_VER >= 1900
+#define HAVE_TIMESPEC
 #define HAVE_TIMESPEC_GET
+#elif defined(__MINGW32__)
+#define HAVE_TIMESPEC
+#endif
+
+#ifndef HAVE_TIMESPEC
+struct timespec {
+    time_t tv_sec;
+    long tv_nsec;
+};
 #endif

 /*---------------------------- macros ----------------------------*/
--- a/include/c99_compat.h
+++ b/include/c99_compat.h
@@ -36,8 +36,8 @@
 */
 #if defined(_MSC_VER)

-#  if _MSC_VER < 1900
-#    error "Microsoft Visual Studio 2015 or higher required"
+#  if _MSC_VER < 1800 || (_MSC_FULL_VER < 180031101 && !defined(__clang__))
+#    error "Microsoft Visual Studio 2013 Update 4 or higher required"
 #  endif

   /*
--- a/include/d3dadapter/present.h
+++ b/include/d3dadapter/present.h
@@ -125,7 +125,7 @@ struct ID3DPresent
 #define ID3DPresent_SetCursorPos(p,a) (p)->lpVtbl->SetCursorPos(p,a)
 #define ID3DPresent_SetCursor(p,a,b,c) (p)->lpVtbl->SetCursor(p,a,b,c)
 #define ID3DPresent_SetGammaRamp(p,a,b) (p)->lpVtbl->SetGammaRamp(p,a,b)
-#define ID3DPresent_GetWindowInfo(p,a,b,c,d) (p)->lpVtbl->GetWindowInfo(p,a,b,c,d)
+#define ID3DPresent_GetWindowInfo(p,a,b,c,d) (p)->lpVtbl->GetWindowSize(p,a,b,c,d)
 #define ID3DPresent_GetWindowOccluded(p) (p)->lpVtbl->GetWindowOccluded(p)
 #define ID3DPresent_ResolutionMismatch(p) (p)->lpVtbl->ResolutionMismatch(p)
 #define ID3DPresent_CreateThread(p,a,b) (p)->lpVtbl->CreateThread(p,a,b)
--- a/include/drm-uapi/drm_fourcc.h
+++ b/include/drm-uapi/drm_fourcc.h
@@ -298,19 +298,6 @@ extern "C" {
 */
 #define DRM_FORMAT_MOD_SAMSUNG_64_32_TILE	fourcc_mod_code(SAMSUNG, 1)

-/*
- * Qualcomm Compressed Format
- *
- * Refers to a compressed variant of the base format that is compressed.
- * Implementation may be platform and base-format specific.
- *
- * Each macrotile consists of m x n (mostly 4 x 4) tiles.
- * Pixel data pitch/stride is aligned with macrotile width.
- * Pixel data height is aligned with macrotile height.
- * Entire pixel data buffer is aligned with 4k(bytes).
- */
-#define DRM_FORMAT_MOD_QCOM_COMPRESSED  fourcc_mod_code(QCOM, 1)
-
 /* Vivante framebuffer modifiers */

 /*
@@ -397,23 +384,6 @@ extern "C" {
 #define DRM_FORMAT_MOD_NVIDIA_16BX2_BLOCK_THIRTYTWO_GOB \
 	fourcc_mod_code(NVIDIA, 0x15)

-/*
- * Some Broadcom modifiers take parameters, for example the number of
- * vertical lines in the image. Reserve the lower 32 bits for modifier
- * type, and the next 24 bits for parameters. Top 8 bits are the
- * vendor code.
- */
-#define __fourcc_mod_broadcom_param_shift 8
-#define __fourcc_mod_broadcom_param_bits 48
-#define fourcc_mod_broadcom_code(val, params) \
-	fourcc_mod_code(BROADCOM, ((((__u64)params) << __fourcc_mod_broadcom_param_shift) | val))
-#define fourcc_mod_broadcom_param(m) \
-	((int)(((m) >> __fourcc_mod_broadcom_param_shift) &	\
-	       ((1ULL << __fourcc_mod_broadcom_param_bits) - 1)))
-#define fourcc_mod_broadcom_mod(m) \
-	((m) & ~(((1ULL << __fourcc_mod_broadcom_param_bits) - 1) <<	\
-		 __fourcc_mod_broadcom_param_shift))
-
 /*
 * Broadcom VC4 "T" format
 *
@@ -435,69 +405,6 @@ extern "C" {
 */
 #define DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED fourcc_mod_code(BROADCOM, 1)

-/*
- * Broadcom SAND format
- *
- * This is the native format that the H.264 codec block uses.  For VC4
- * HVS, it is only valid for H.264 (NV12/21) and RGBA modes.
- *
- * The image can be considered to be split into columns, and the
- * columns are placed consecutively into memory.  The width of those
- * columns can be either 32, 64, 128, or 256 pixels, but in practice
- * only 128 pixel columns are used.
- *
- * The pitch between the start of each column is set to optimally
- * switch between SDRAM banks. This is passed as the number of lines
- * of column width in the modifier (we can't use the stride value due
- * to various core checks that look at it , so you should set the
- * stride to width*cpp).
- *
- * Note that the column height for this format modifier is the same
- * for all of the planes, assuming that each column contains both Y
- * and UV.  Some SAND-using hardware stores UV in a separate tiled
- * image from Y to reduce the column height, which is not supported
- * with these modifiers.
- */
-
-#define DRM_FORMAT_MOD_BROADCOM_SAND32_COL_HEIGHT(v) \
-	fourcc_mod_broadcom_code(2, v)
-#define DRM_FORMAT_MOD_BROADCOM_SAND64_COL_HEIGHT(v) \
-	fourcc_mod_broadcom_code(3, v)
-#define DRM_FORMAT_MOD_BROADCOM_SAND128_COL_HEIGHT(v) \
-	fourcc_mod_broadcom_code(4, v)
-#define DRM_FORMAT_MOD_BROADCOM_SAND256_COL_HEIGHT(v) \
-	fourcc_mod_broadcom_code(5, v)
-
-#define DRM_FORMAT_MOD_BROADCOM_SAND32 \
-	DRM_FORMAT_MOD_BROADCOM_SAND32_COL_HEIGHT(0)
-#define DRM_FORMAT_MOD_BROADCOM_SAND64 \
-	DRM_FORMAT_MOD_BROADCOM_SAND64_COL_HEIGHT(0)
-#define DRM_FORMAT_MOD_BROADCOM_SAND128 \
-	DRM_FORMAT_MOD_BROADCOM_SAND128_COL_HEIGHT(0)
-#define DRM_FORMAT_MOD_BROADCOM_SAND256 \
-	DRM_FORMAT_MOD_BROADCOM_SAND256_COL_HEIGHT(0)
-
-/* Broadcom UIF format
- *
- * This is the common format for the current Broadcom multimedia
- * blocks, including V3D 3.x and newer, newer video codecs, and
- * displays.
- *
- * The image consists of utiles (64b blocks), UIF blocks (2x2 utiles),
- * and macroblocks (4x4 UIF blocks).  Those 4x4 UIF block groups are
- * stored in columns, with padding between the columns to ensure that
- * moving from one column to the next doesn't hit the same SDRAM page
- * bank.
- *
- * To calculate the padding, it is assumed that each hardware block
- * and the software driving it knows the platform's SDRAM page size,
- * number of banks, and XOR address, and that it's identical between
- * all blocks using the format.  This tiling modifier will use XOR as
- * necessary to reduce the padding.  If a hardware block can't do XOR,
- * the assumption is that a no-XOR tiling modifier will be created.
- */
-#define DRM_FORMAT_MOD_BROADCOM_UIF fourcc_mod_code(BROADCOM, 6)
-
 #if defined(__cplusplus)
 }
 #endif
--- a/include/drm-uapi/vc4_drm.h
+++ b/include/drm-uapi/vc4_drm.h
@@ -183,17 +183,10 @@ struct drm_vc4_submit_cl {
 	/* ID of the perfmon to attach to this job. 0 means no perfmon. */
 	__u32 perfmonid;

-	/* Syncobj handle to wait on. If set, processing of this render job
-	 * will not start until the syncobj is signaled. 0 means ignore.
+	/* Unused field to align this struct on 64 bits. Must be set to 0.
+	 * If one ever needs to add an u32 field to this struct, this field
+	 * can be used.
 	 */
-	__u32 in_sync;
-
-	/* Syncobj handle to export fence to. If set, the fence in the syncobj
-	 * will be replaced with a fence that signals upon completion of this
-	 * render job. 0 means ignore.
-	 */
-	__u32 out_sync;
-
 	__u32 pad2;
 };

--- a/include/meson.build
+++ b/include/meson.build
@@ -43,7 +43,7 @@ if with_gles2
  )
 endif

-if with_gles1 or with_gles2 or with_opengl or with_egl
+if with_gles1 or with_gles2 or with_egl
  install_headers('KHR/khrplatform.h', subdir : 'KHR')
 endif

--- a/include/pci_ids/i965_pci_ids.h
+++ b/include/pci_ids/i965_pci_ids.h
@@ -163,32 +163,27 @@ CHIPSET(0x5923, kbl_gt3, "Intel(R) Kabylake GT3")
 CHIPSET(0x5926, kbl_gt3, "Intel(R) Iris Plus Graphics 640 (Kaby Lake GT3e)")
 CHIPSET(0x5927, kbl_gt3, "Intel(R) Iris Plus Graphics 650 (Kaby Lake GT3e)")
 CHIPSET(0x593B, kbl_gt4, "Intel(R) Kabylake GT4")
-CHIPSET(0x591C, kbl_gt2, "Intel(R) Amber Lake (Kabylake) GT2")
-CHIPSET(0x87C0, kbl_gt2, "Intel(R) Amber Lake (Kabylake) GT2")
-CHIPSET(0x87CA, cfl_gt2, "Intel(R) Amber Lake (Coffeelake) GT2")
 CHIPSET(0x3184, glk,     "Intel(R) UHD Graphics 605 (Geminilake)")
 CHIPSET(0x3185, glk_2x6, "Intel(R) UHD Graphics 600 (Geminilake 2x6)")
 CHIPSET(0x3E90, cfl_gt1, "Intel(R) UHD Graphics 610 (Coffeelake 2x6 GT1)")
 CHIPSET(0x3E93, cfl_gt1, "Intel(R) UHD Graphics 610 (Coffeelake 2x6 GT1)")
 CHIPSET(0x3E99, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)")
-CHIPSET(0x3E9C, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)")
+CHIPSET(0x3EA1, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)")
+CHIPSET(0x3EA4, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)")
 CHIPSET(0x3E91, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)")
 CHIPSET(0x3E92, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)")
 CHIPSET(0x3E96, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
-CHIPSET(0x3E98, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
 CHIPSET(0x3E9A, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
 CHIPSET(0x3E9B, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)")
 CHIPSET(0x3E94, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
+CHIPSET(0x3EA0, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
+CHIPSET(0x3EA3, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
 CHIPSET(0x3EA9, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)")
+CHIPSET(0x3EA2, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)")
 CHIPSET(0x3EA5, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)")
 CHIPSET(0x3EA6, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)")
 CHIPSET(0x3EA7, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)")
 CHIPSET(0x3EA8, cfl_gt3, "Intel(R) HD Graphics (Coffeelake 3x8 GT3)")
-CHIPSET(0x3EA1, cfl_gt1, "Intel(R) HD Graphics (Whiskey Lake 2x6 GT1)")
-CHIPSET(0x3EA4, cfl_gt1, "Intel(R) HD Graphics (Whiskey Lake 3x8 GT1)")
-CHIPSET(0x3EA0, cfl_gt2, "Intel(R) HD Graphics (Whiskey Lake 3x8 GT2)")
-CHIPSET(0x3EA3, cfl_gt2, "Intel(R) HD Graphics (Whiskey Lake 3x8 GT2)")
-CHIPSET(0x3EA2, cfl_gt3, "Intel(R) HD Graphics (Whiskey Lake 3x8 GT3)")
 CHIPSET(0x5A49, cnl_2x8, "Intel(R) HD Graphics (Cannonlake 2x8 GT0.5)")
 CHIPSET(0x5A4A, cnl_2x8, "Intel(R) HD Graphics (Cannonlake 2x8 GT0.5)")
 CHIPSET(0x5A41, cnl_3x8, "Intel(R) HD Graphics (Cannonlake 3x8 GT1)")
@@ -204,10 +199,6 @@ CHIPSET(0x5A54, cnl_5x8, "Intel(R) HD Graphics (Cannonlake 5x8 GT2)")
 CHIPSET(0x8A50, icl_8x8, "Intel(R) HD Graphics (Ice Lake 8x8 GT2)")
 CHIPSET(0x8A51, icl_8x8, "Intel(R) HD Graphics (Ice Lake 8x8 GT2)")
 CHIPSET(0x8A52, icl_8x8, "Intel(R) HD Graphics (Ice Lake 8x8 GT2)")
-CHIPSET(0x8A56, icl_4x8, "Intel(R) HD Graphics (Ice Lake 4x8 GT1)")
-CHIPSET(0x8A57, icl_6x8, "Intel(R) HD Graphics (Ice Lake 6x8 GT1.5)")
-CHIPSET(0x8A58, icl_4x8, "Intel(R) HD Graphics (Ice Lake 4x8 GT1)")
-CHIPSET(0x8A59, icl_6x8, "Intel(R) HD Graphics (Ice Lake 6x8 GT1.5)")
 CHIPSET(0x8A5A, icl_6x8, "Intel(R) HD Graphics (Ice Lake 6x8 GT1.5)")
 CHIPSET(0x8A5B, icl_4x8, "Intel(R) HD Graphics (Ice Lake 4x8 GT1)")
 CHIPSET(0x8A5C, icl_6x8, "Intel(R) HD Graphics (Ice Lake 6x8 GT1.5)")
--- a/include/pci_ids/radeonsi_pci_ids.h
+++ b/include/pci_ids/radeonsi_pci_ids.h
@@ -204,7 +204,6 @@ CHIPSET(0x67CC, POLARIS10)
 CHIPSET(0x67CF, POLARIS10)
 CHIPSET(0x67D0, POLARIS10)
 CHIPSET(0x67DF, POLARIS10)
-CHIPSET(0x6FDF, POLARIS10)

 CHIPSET(0x98E4, STONEY)

@@ -219,7 +218,6 @@ CHIPSET(0x699F, POLARIS12)

 CHIPSET(0x694C, VEGAM)
 CHIPSET(0x694E, VEGAM)
-CHIPSET(0x694F, VEGAM)

 CHIPSET(0x6860, VEGA10)
 CHIPSET(0x6861, VEGA10)
@@ -228,14 +226,8 @@ CHIPSET(0x6863, VEGA10)
 CHIPSET(0x6864, VEGA10)
 CHIPSET(0x6867, VEGA10)
 CHIPSET(0x6868, VEGA10)
-CHIPSET(0x6869, VEGA10)
-CHIPSET(0x686A, VEGA10)
-CHIPSET(0x686B, VEGA10)
-CHIPSET(0x686C, VEGA10)
-CHIPSET(0x686D, VEGA10)
-CHIPSET(0x686E, VEGA10)
-CHIPSET(0x686F, VEGA10)
 CHIPSET(0x687F, VEGA10)
+CHIPSET(0x686C, VEGA10)

 CHIPSET(0x69A0, VEGA12)
 CHIPSET(0x69A1, VEGA12)
@@ -243,13 +235,4 @@ CHIPSET(0x69A2, VEGA12)
 CHIPSET(0x69A3, VEGA12)
 CHIPSET(0x69AF, VEGA12)

-CHIPSET(0x66A0, VEGA20)
-CHIPSET(0x66A1, VEGA20)
-CHIPSET(0x66A2, VEGA20)
-CHIPSET(0x66A3, VEGA20)
-CHIPSET(0x66A4, VEGA20)
-CHIPSET(0x66A7, VEGA20)
-CHIPSET(0x66AF, VEGA20)
-
 CHIPSET(0x15DD, RAVEN)
-CHIPSET(0x15D8, RAVEN)
--- a/include/vulkan/vk_icd.h
+++ b/include/vulkan/vk_icd.h
@@ -24,34 +24,13 @@
 #define VKICD_H

 #include "vulkan.h"
-#include <stdbool.h>

-// Loader-ICD version negotiation API.  Versions add the following features:
-//   Version 0 - Initial.  Doesn't support vk_icdGetInstanceProcAddr
-//               or vk_icdNegotiateLoaderICDInterfaceVersion.
-//   Version 1 - Add support for vk_icdGetInstanceProcAddr.
-//   Version 2 - Add Loader/ICD Interface version negotiation
-//               via vk_icdNegotiateLoaderICDInterfaceVersion.
-//   Version 3 - Add ICD creation/destruction of KHR_surface objects.
-//   Version 4 - Add unknown physical device extension qyering via
-//               vk_icdGetPhysicalDeviceProcAddr.
-//   Version 5 - Tells ICDs that the loader is now paying attention to the
-//               application version of Vulkan passed into the ApplicationInfo
-//               structure during vkCreateInstance.  This will tell the ICD
-//               that if the loader is older, it should automatically fail a
-//               call for any API version > 1.0.  Otherwise, the loader will
-//               manually determine if it can support the expected version.
-#define CURRENT_LOADER_ICD_INTERFACE_VERSION 5
+/*
+ * Loader-ICD version negotiation API
+ */
+#define CURRENT_LOADER_ICD_INTERFACE_VERSION 3
 #define MIN_SUPPORTED_LOADER_ICD_INTERFACE_VERSION 0
-#define MIN_PHYS_DEV_EXTENSION_ICD_INTERFACE_VERSION 4
-typedef VkResult(VKAPI_PTR *PFN_vkNegotiateLoaderICDInterfaceVersion)(uint32_t *pVersion);
-
-// This is defined in vk_layer.h which will be found by the loader, but if an ICD is building against this
-// file directly, it won't be found.
-#ifndef PFN_GetPhysicalDeviceProcAddr
-typedef PFN_vkVoidFunction(VKAPI_PTR *PFN_GetPhysicalDeviceProcAddr)(VkInstance instance, const char *pName);
-#endif
-
+typedef VkResult (VKAPI_PTR *PFN_vkNegotiateLoaderICDInterfaceVersion)(uint32_t *pVersion);
 /*
 * The ICD must reserve space for a pointer for the loader's dispatch
 * table, at the start of <each object>.
@@ -85,9 +64,6 @@ typedef enum {
    VK_ICD_WSI_PLATFORM_WIN32,
    VK_ICD_WSI_PLATFORM_XCB,
    VK_ICD_WSI_PLATFORM_XLIB,
-    VK_ICD_WSI_PLATFORM_ANDROID,
-    VK_ICD_WSI_PLATFORM_MACOS,
-    VK_ICD_WSI_PLATFORM_IOS,
    VK_ICD_WSI_PLATFORM_DISPLAY
 } VkIcdWsiPlatform;

@@ -101,7 +77,7 @@ typedef struct {
    MirConnection *connection;
    MirSurface *mirSurface;
 } VkIcdSurfaceMir;
-#endif  // VK_USE_PLATFORM_MIR_KHR
+#endif // VK_USE_PLATFORM_MIR_KHR

 #ifdef VK_USE_PLATFORM_WAYLAND_KHR
 typedef struct {
@@ -109,7 +85,7 @@ typedef struct {
    struct wl_display *display;
    struct wl_surface *surface;
 } VkIcdSurfaceWayland;
-#endif  // VK_USE_PLATFORM_WAYLAND_KHR
+#endif // VK_USE_PLATFORM_WAYLAND_KHR

 #ifdef VK_USE_PLATFORM_WIN32_KHR
 typedef struct {
@@ -117,7 +93,7 @@ typedef struct {
    HINSTANCE hinstance;
    HWND hwnd;
 } VkIcdSurfaceWin32;
-#endif  // VK_USE_PLATFORM_WIN32_KHR
+#endif // VK_USE_PLATFORM_WIN32_KHR

 #ifdef VK_USE_PLATFORM_XCB_KHR
 typedef struct {
@@ -125,7 +101,7 @@ typedef struct {
    xcb_connection_t *connection;
    xcb_window_t window;
 } VkIcdSurfaceXcb;
-#endif  // VK_USE_PLATFORM_XCB_KHR
+#endif // VK_USE_PLATFORM_XCB_KHR

 #ifdef VK_USE_PLATFORM_XLIB_KHR
 typedef struct {
@@ -133,28 +109,13 @@ typedef struct {
    Display *dpy;
    Window window;
 } VkIcdSurfaceXlib;
-#endif  // VK_USE_PLATFORM_XLIB_KHR
+#endif // VK_USE_PLATFORM_XLIB_KHR

 #ifdef VK_USE_PLATFORM_ANDROID_KHR
 typedef struct {
-    VkIcdSurfaceBase base;
-    struct ANativeWindow *window;
+    ANativeWindow* window;
 } VkIcdSurfaceAndroid;
-#endif  // VK_USE_PLATFORM_ANDROID_KHR
-
-#ifdef VK_USE_PLATFORM_MACOS_MVK
-typedef struct {
-    VkIcdSurfaceBase base;
-    const void *pView;
-} VkIcdSurfaceMacOS;
-#endif  // VK_USE_PLATFORM_MACOS_MVK
-
-#ifdef VK_USE_PLATFORM_IOS_MVK
-typedef struct {
-    VkIcdSurfaceBase base;
-    const void *pView;
-} VkIcdSurfaceIOS;
-#endif  // VK_USE_PLATFORM_IOS_MVK
+#endif //VK_USE_PLATFORM_ANDROID_KHR

 typedef struct {
    VkIcdSurfaceBase base;
@@ -167,4 +128,4 @@ typedef struct {
    VkExtent2D imageExtent;
 } VkIcdSurfaceDisplay;

-#endif  // VKICD_H
+#endif // VKICD_H
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .0.1
 .1.2