Vulkan loader 1.2.131

Updated along changes for 1.1.127 made in the MINGW-packages repo on the
mingw-w64-vulkan-loader package, and updated it for 1.2.131.

4 files changed, 64 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 44781ac13b9c..a618b9a79ba8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-vulkan-icd-loader
 	pkgdesc = Vulkan Installable Client Driver (ICD) Loader (mingw-w64)
-	pkgver = 1.1.114
+	pkgver = 1.2.131
 	pkgrel = 1
 	url = https://www.khronos.org/vulkan/
 	arch = any
@@ -14,13 +14,13 @@ pkgbase = mingw-w64-vulkan-icd-loader
 	options = staticlibs
 	options = !strip
 	options = !emptydirs
-	source = Vulkan-Loader-1.1.114.tar.gz::https://github.com/KhronosGroup/Vulkan-Loader/archive/v1.1.114.tar.gz
+	source = Vulkan-Loader-1.2.131.tar.gz::https://github.com/KhronosGroup/Vulkan-Loader/archive/v1.2.131.tar.gz
 	source = 001-build-fix.patch
 	source = 002-proper-def-files-for-32bit.patch
 	source = 003-generate-pkgconfig-files.patch
-	sha256sums = b5dd14f51f80de38d93dbf25b6a0232e3621507b97122a30534d39a82d89fa6f
-	sha256sums = 64ef57d8551a0b33f63aa98a06c276d5e8e24d9b4ff27347baa8fcb2a39c1295
-	sha256sums = 0182a4c25214fd63290396a23d162dd1e523232a5746e77bec2de1616de31c59
+	sha256sums = c20976afc31337b7e97aab3b9f94a87d1e8a5bcfccb633af35aaf077463809e3
+	sha256sums = e1d765334a6582e2df41986d876a578e1c978a73a741f204332f073ce20f23a7
+	sha256sums = 71819784f64244b3d51666877e4437fe30786bc82db165b921a3ac029a885a9b
 	sha256sums = 5c189b3f76fa53ad12077cd8932423a0cf385f9464cdde60ba711589ccde19ad
 
 pkgname = mingw-w64-vulkan-icd-loader
diff --git a/001-build-fix.patch b/001-build-fix.patch
index 4d185e5cbc31..944e7500cbc1 100644
--- a/001-build-fix.patch
+++ b/001-build-fix.patch
@@ -11,7 +11,7 @@
          endif()
 --- a/loader/loader.c	2018-05-16 14:03:52.750814700 +0300
 +++ b/loader/loader.c	2018-05-16 14:04:08.631642600 +0300
-@@ -613,6 +613,10 @@
+@@ -672,6 +672,10 @@
  //
  // *reg_data contains a string list of filenames as pointer.
  // When done using the returned string list, the caller should free the pointer.
@@ -19,9 +19,9 @@
 +#define CM_GETIDLIST_FILTER_PRESENT            0x00000100
 +#define CM_GETIDLIST_FILTER_CLASS              0x00000200
 +#endif
- VkResult loaderGetDeviceRegistryFiles(const struct loader_instance *inst, char **reg_data, PDWORD reg_data_size, LPCTSTR value_name) {
+ VkResult loaderGetDeviceRegistryFiles(const struct loader_instance *inst, char **reg_data, PDWORD reg_data_size,
+                                       LPCSTR value_name) {
      static const wchar_t *softwareComponentGUID = L"{5c4c3332-344d-483c-8739-259e934c9cc8}";
-     static const wchar_t *displayGUID = L"{4d36e968-e325-11ce-bfc1-08002be10318}";
 --- a/loader/loader.rc
 +++ b/loader/loader.rc
 @@ -43,8 +43,6 @@
diff --git a/002-proper-def-files-for-32bit.patch b/002-proper-def-files-for-32bit.patch
index 72158a248eb3..96dde079f7c3 100644
--- a/002-proper-def-files-for-32bit.patch
+++ b/002-proper-def-files-for-32bit.patch
@@ -1,7 +1,7 @@
 diff -Naur Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/CMakeLists.txt Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/CMakeLists.txt
 --- Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/CMakeLists.txt	2017-04-05 00:36:39.000000000 +0300
 +++ Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/CMakeLists.txt	2017-06-29 08:34:52.393725000 +0300
-@@ -61,6 +61,16 @@
+@@ -153,6 +153,16 @@
      endif()
  endif()
  
@@ -15,21 +15,21 @@ diff -Naur Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/CMakeLists.txt Vul
 +  endif()
 +endif()
 +
- if(WIN32)
-     # Treat warnings as errors
-     add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/WX>")
-diff -Naur Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/loader/CMakeLists.txt Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/loader/CMakeLists.txt
---- Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/loader/CMakeLists.txt	2017-06-29 08:19:36.448133100 +0300
-+++ Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/loader/CMakeLists.txt	2017-06-29 08:42:41.322355600 +0300
-@@ -137,6 +137,7 @@
- set_target_properties(loader_gen_files PROPERTIES FOLDER ${LOADER_HELPER_FOLDER})
+ if(MSVC)
+     # /WX: Treat warnings as errors
+     # /GR-: Disable RTTI
+diff -Naur Vulkan-Loader-1.2.131.orig/loader/CMakeLists.txt Vulkan-Loader-1.2.131/loader/CMakeLists.txt
+--- Vulkan-Loader-1.2.131.orig/loader/CMakeLists.txt	2020-01-15 18:55:51.000000000 +0000
++++ Vulkan-Loader-1.2.131/loader/CMakeLists.txt	2020-01-29 14:46:24.000000000 +0000
+@@ -62,6 +62,7 @@
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
  
  if(WIN32)
 +    if(MSVC)
      # Use static MSVCRT libraries
      foreach(configuration
              in
-@@ -156,6 +157,7 @@
+@@ -81,6 +82,7 @@
                             "${${configuration}}")
          endif()
      endforeach()
@@ -37,51 +37,43 @@ diff -Naur Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/loader/CMakeLists.
  
      if(ENABLE_WIN10_ONECORE)
          # Note: When linking your app or driver to OneCore.lib, be sure to remove any links to non-umbrella libs (such as
-@@ -190,24 +192,32 @@
-                     $<TARGET_OBJECTS:loader-opt>
-                     $<TARGET_OBJECTS:loader-norm>
-                     $<TARGET_OBJECTS:loader-unknown-chain>
--                    ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-1.def
-+                    ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-1${DEFFILE_SUFFIX}.def
-                     ${CMAKE_CURRENT_SOURCE_DIR}/loader.rc)
-+        if(MSVC)
-         set_target_properties(vulkan
-                               PROPERTIES LINK_FLAGS_DEBUG
-                                          "/ignore:4098"
-                                          OUTPUT_NAME
-                                          vulkan-1)
-+        else()
-+        set_target_properties(vulkan
-+                              PROPERTIES
-+                              LIBRARY_OUTPUT_NAME vulkan
-+                              RUNTIME_OUTPUT_NAME vulkan-1
-+                              ARCHIVE_OUTPUT_NAME vulkan)
-+        endif()
-         target_link_libraries(vulkan Vulkan::Headers)
-     else()
-         add_library(vulkan
-                     STATIC
-                     $<TARGET_OBJECTS:loader-opt>
-                     $<TARGET_OBJECTS:loader-norm>
-                     $<TARGET_OBJECTS:loader-unknown-chain>)
-         set_target_properties(vulkan PROPERTIES OUTPUT_NAME VKstatic.1)
-     endif()
+@@ -194,16 +196,24 @@
+                 $<TARGET_OBJECTS:loader-opt>
+                 $<TARGET_OBJECTS:loader-norm>
+                 $<TARGET_OBJECTS:loader-unknown-chain>
+-                ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-1.def
++                ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-1${DEFFILE_SUFFIX}.def
+                 ${CMAKE_CURRENT_SOURCE_DIR}/loader.rc)
++    if(MSVC)
+     set_target_properties(vulkan
+                           PROPERTIES LINK_FLAGS_DEBUG
+                                      "/ignore:4098"
+                                      OUTPUT_NAME
+                                      vulkan-1)
++    else()
++    set_target_properties(vulkan
++                          PROPERTIES
++                          LIBRARY_OUTPUT_NAME vulkan
++                          RUNTIME_OUTPUT_NAME vulkan-1
++                          ARCHIVE_OUTPUT_NAME vulkan)
++    endif()
+     target_link_libraries(vulkan Vulkan::Headers)
  
 -    if(ENABLE_WIN10_ONECORE)
 +    if(ENABLE_WIN10_ONECORE AND MSVC)
          target_link_libraries(vulkan OneCoreUAP.lib LIBCMT.LIB LIBCMTD.LIB LIBVCRUNTIME.LIB LIBUCRT.LIB)
          set_target_properties(vulkan PROPERTIES LINK_FLAGS "/NODEFAULTLIB")
      else()
-diff -Naur Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/loader/vulkan-1-x86.def Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/loader/vulkan-1-x86.def
---- Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/loader/vulkan-1-x86.def	1970-01-01 03:00:00.000000000 +0300
-+++ Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/loader/vulkan-1-x86.def	2017-04-05 00:36:39.000000000 +0300
-@@ -0,0 +1,221 @@
+diff -Naur Vulkan-Loader-1.2.131.orig/loader/vulkan-1-x86.def Vulkan-Loader-1.2.131/loader/vulkan-1-x86.def
+--- Vulkan-Loader-1.2.131.orig/loader/vulkan-1-x86.def	1970-01-01 00:00:00.000000000 +0000
++++ Vulkan-Loader-1.2.131/loader/vulkan-1-x86.def	2020-01-29 14:57:46.000000000 +0000
+@@ -0,0 +1,235 @@
 +
 +;;;; Begin Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;
-+; Copyright (c) 2015-2017 The Khronos Group Inc.
-+; Copyright (c) 2015-2017 Valve Corporation
-+; Copyright (c) 2015-2017 LunarG, Inc.
++; Copyright (c) 2015-2017, 2019 The Khronos Group Inc.
++; Copyright (c) 2015-2017, 2019 Valve Corporation
++; Copyright (c) 2015-2017, 2019 LunarG, Inc.
 +;
 +; Licensed under the Apache License, Version 2.0 (the "License");
 +; you may not use this file except in compliance with the License.
@@ -297,6 +289,20 @@ diff -Naur Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/loader/vulkan-1-x8
 +
 +   vkGetImageSparseMemoryRequirements2@16
 +   vkGetPhysicalDeviceImageFormatProperties2@12
++
++   vkCreateRenderPass2@16
++   vkCmdBeginRenderPass2@12
++   vkCmdNextSubpass2@12
++   vkCmdEndRenderPass2@8
++   vkCmdDrawIndirectCount@44
++   vkCmdDrawIndexedIndirectCount@44
++   vkGetSemaphoreCounterValue@16
++   vkWaitSemaphores@16
++   vkSignalSemaphore@8
++   vkGetBufferDeviceAddress@8
++   vkGetBufferOpaqueCaptureAddress@8
++   vkGetDeviceMemoryOpaqueCaptureAddress@8
++   vkResetQueryPool@20
 diff -Naur Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/tests/layers/CMakeLists.txt Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/tests/layers/CMakeLists.txt
 --- Vulkan-LoaderAndValidationLayers-sdk-1.1.73.0-orig/tests/layers/CMakeLists.txt	2017-04-05 00:36:39.000000000 +0300
 +++ Vulkan-LoaderAndValidationLayers-sdk-1.1.73.0/tests/layers/CMakeLists.txt	2017-06-29 08:39:07.115088000 +0300
diff --git a/PKGBUILD b/PKGBUILD
index 2d5fe4fd09a0..c90a6b43999a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=mingw-w64-vulkan-icd-loader
 _pkgname=Vulkan-Loader
-pkgver=1.1.114
+pkgver=1.2.131
 pkgrel=1
 pkgdesc="Vulkan Installable Client Driver (ICD) Loader (mingw-w64)"
 arch=(any)
@@ -20,9 +20,9 @@ source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/${_pkgnam
         "001-build-fix.patch"
         "002-proper-def-files-for-32bit.patch"
         "003-generate-pkgconfig-files.patch")
-sha256sums=('b5dd14f51f80de38d93dbf25b6a0232e3621507b97122a30534d39a82d89fa6f'
-            '64ef57d8551a0b33f63aa98a06c276d5e8e24d9b4ff27347baa8fcb2a39c1295'
-            '0182a4c25214fd63290396a23d162dd1e523232a5746e77bec2de1616de31c59'
+sha256sums=('c20976afc31337b7e97aab3b9f94a87d1e8a5bcfccb633af35aaf077463809e3'
+            'e1d765334a6582e2df41986d876a578e1c978a73a741f204332f073ce20f23a7'
+            '71819784f64244b3d51666877e4437fe30786bc82db165b921a3ac029a885a9b'
             '5c189b3f76fa53ad12077cd8932423a0cf385f9464cdde60ba711589ccde19ad')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
@@ -40,13 +40,6 @@ prepare() {
   sed -i'' -E 's/target_link_libraries\(([^\)]+)\)/target_link_libraries\(\L\1\)/g' CMakeLists.txt
   # revert back just the vulkan::headers caused by previous sed
   sed -i'' -E 's/vulkan::headers/Vulkan::Headers/g' CMakeLists.txt
-
-  # Added also this because __declspec(thread) was being ultimately ignored,
-  # making a non-tls variable of a tls variable.
-  # Replaced with __thread instead, of which at least works mingw-w64-gcc with thread model of "posix".
-  # Links libwinpthread in this case as effect but doesn't lose the tls properties of the variable.
-  # Untested on gcc compiled with a thread model of "win32".
-  sed -i'' -E 's/#define THREAD_LOCAL_DECL __declspec\(thread\)/#define THREAD_LOCAL_DECL __thread/g' vk_loader_platform.h
 }
 
 build() {