Hello community, here is the log from the commit of package vulkan-loader for openSUSE:Factory checked in at 2019-11-11 13:00:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vulkan-loader (Old) and /work/SRC/openSUSE:Factory/.vulkan-loader.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vulkan-loader" Mon Nov 11 13:00:04 2019 rev:14 rq:746192 version:1.1.127 Changes: -------- --- /work/SRC/openSUSE:Factory/vulkan-loader/vulkan-loader.changes 2019-10-27 13:35:23.396842940 +0100 +++ /work/SRC/openSUSE:Factory/.vulkan-loader.new.2990/vulkan-loader.changes 2019-11-11 13:00:07.985673971 +0100 @@ -1,0 +2,6 @@ +Thu Nov 7 07:50:58 UTC 2019 - Jan Engelhardt <[email protected]> + +- Update to release 1.1.127 + * Build system changes only + +------------------------------------------------------------------- Old: ---- v1.1.126.tar.gz New: ---- v1.1.127.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vulkan-loader.spec ++++++ --- /var/tmp/diff_new_pack.3tAkrd/_old 2019-11-11 13:00:09.081675132 +0100 +++ /var/tmp/diff_new_pack.3tAkrd/_new 2019-11-11 13:00:09.085675136 +0100 @@ -18,7 +18,7 @@ Name: vulkan-loader %define lname libvulkan1 -Version: 1.1.126 +Version: 1.1.127 Release: 0 Summary: Reference ICD loader for Vulkan License: Apache-2.0 ++++++ v1.1.126.tar.gz -> v1.1.127.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Loader-1.1.126/.appveyor.yml new/Vulkan-Loader-1.1.127/.appveyor.yml --- old/Vulkan-Loader-1.1.126/.appveyor.yml 2019-10-21 23:08:13.000000000 +0200 +++ new/Vulkan-Loader-1.1.127/.appveyor.yml 2019-11-04 18:48:06.000000000 +0100 @@ -12,7 +12,7 @@ max_jobs: 4 os: - - Visual Studio 2017 + - Visual Studio 2015 init: - git config --global core.autocrlf true @@ -34,11 +34,6 @@ before_build: - "SET PATH=C:\\Python35;C:\\Python35\\Scripts;%PATH%" - # vcvars32.bat will override the platform ennvar, so we need to reset it or else appveyor dies - - "SET APPVEYOR_PLATFORM=%PLATFORM%" - - if %APPVEYOR_PLATFORM% == x64 (call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat") - - if %APPVEYOR_PLATFORM% == Win32 (call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat") - - "SET PLATFORM=%APPVEYOR_PLATFORM%" - echo. - echo Starting build for %APPVEYOR_REPO_NAME% # Install dependencies @@ -55,7 +50,7 @@ - echo Generating CMake files for %PLATFORM% - mkdir build - cd build - - cmake -A %PLATFORM% -C../external/helper.cmake -DWDK_VERSION=10.0.17763.0 .. + - cmake -A %PLATFORM% -C../external/helper.cmake .. - echo Building platform=%PLATFORM% configuration=%CONFIGURATION% platform: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Loader-1.1.126/BUILD.gn new/Vulkan-Loader-1.1.127/BUILD.gn --- old/Vulkan-Loader-1.1.126/BUILD.gn 2019-10-21 23:08:13.000000000 +0200 +++ new/Vulkan-Loader-1.1.127/BUILD.gn 2019-11-04 18:48:06.000000000 +0100 @@ -34,7 +34,7 @@ if (is_clang || !is_win) { cflags = [ "-Wno-unused-function" ] } - if (is_linux) { + if (is_linux || is_mac) { defines += [ "SYSCONFDIR=\"/etc\"", "FALLBACK_CONFIG_DIRS=\"/etc/xdg\"", @@ -113,6 +113,9 @@ ] } } + if (is_mac) { + libs = [ "CoreFoundation.framework" ] + } public_deps = [ "$vulkan_headers_dir:vulkan_headers", ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Loader-1.1.126/CMakeLists.txt new/Vulkan-Loader-1.1.127/CMakeLists.txt --- old/Vulkan-Loader-1.1.126/CMakeLists.txt 2019-10-21 23:08:13.000000000 +0200 +++ new/Vulkan-Loader-1.1.127/CMakeLists.txt 2019-11-04 18:48:06.000000000 +0100 @@ -119,7 +119,6 @@ endif() if(WIN32) - find_package(WDK REQUIRED) option(ENABLE_WIN10_ONECORE "Link the loader with OneCore umbrella libraries" OFF) option(ENABLE_STATIC_LOADER "Build the loader as a static library" OFF) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Loader-1.1.126/cmake/FindWDK.cmake new/Vulkan-Loader-1.1.127/cmake/FindWDK.cmake --- old/Vulkan-Loader-1.1.126/cmake/FindWDK.cmake 2019-10-21 23:08:13.000000000 +0200 +++ new/Vulkan-Loader-1.1.127/cmake/FindWDK.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,77 +0,0 @@ - -#.rst: -# FindWDK -# ----------------- -# -# Try to find headers in the Windows Driver Kit -# -# This module is intended to be used by the Vulkan loader to locate -# the required headers from the Windows Driver Kit. This should not -# be considered feature complete for other uses, as it is only -# intended for the Vulkan loader. -# -# By default, this module uses environment variables to try to find an -# installed WDK. These environment variables are present in a developer -# command prompt, or can be set by running vcvarsall.bat (which comes -# with a Visual Studio installation. -# -# If a user wants to override the default behavior, or not set the -# needed environment variables, they may also specify one or more of -# the following CMake variables: -# -# WDK_FULL_PATH - Attempts to find a WDK in the given path. No -# other environment or CMake variable will have -# any effect if this is set. -# WDK_BASE - Sets the base path for the Windows Kit to use. -# This should be the path one level up from the -# "Include" directory. -# WDK_VERSION - Sets the version of the Windows Kit to use. -# -# IMPORTED Targets -# ^^^^^^^^^^^^^^^^ -# -# This module defines no IMPORTED targets -# -# Result Variables -# ^^^^^^^^^^^^^^^^ -# -# This module defines the following variables:: -# -# WDK_FOUND - True if the WDK was found -# WDK_INCLUDE_DIRS - include directories for the WDK -# - -if(DEFINED WDK_FULL_PATH) - find_path(WDK_VERSION_INCLUDE_DIR - NAMES km/d3dkmthk.h shared/d3dkmdt.h - PATHS "${WDK_FULL_PATH}" - ) -else() - if(NOT DEFINED WDK_BASE AND DEFINED "$ENV{UniversalCRTSdkDir}") - set(WDK_BASE "$ENV{UniversalCRTSdkDir}") - elseif(NOT DEFINED WDK_BASE) - set(WDK_BASE "C:/Program Files (x86)/Windows Kits/10/") - endif() - - if(DEFINED WDK_VERSION) - set(SUBDIRS "Include/${WDK_VERSION}") - else() - file(GLOB DIR_LIST RELATIVE "C:/Program Files (x86)/Windows Kits/10/" "C:/Program Files (x86)/Windows Kits/10/Include/*") - list(REVERSE DIR_LIST) - foreach(DIR IN ITEMS "${DIR_LIST}") - set(SUBDIRS "${SUBDIRS}" "${DIR}") - endforeach() - endif() - find_path(WDK_VERSION_INCLUDE_DIR - NAMES km/d3dkmthk.h shared/d3dkmdt.h - PATHS "${WDK_BASE}" - PATH_SUFFIXES ${SUBDIRS} - ) -endif() - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(WDK DEFAULT_MSG WDK_VERSION_INCLUDE_DIR) - -if(WDK_FOUND) - set(WDK_INCLUDE_DIRS "${WDK_VERSION_INCLUDE_DIR}/km" "${WDK_VERSION_INCLUDE_DIR}/shared") -endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Loader-1.1.126/loader/CMakeLists.txt new/Vulkan-Loader-1.1.127/loader/CMakeLists.txt --- old/Vulkan-Loader-1.1.126/loader/CMakeLists.txt 2019-10-21 23:08:13.000000000 +0200 +++ new/Vulkan-Loader-1.1.127/loader/CMakeLists.txt 2019-11-04 18:48:06.000000000 +0100 @@ -114,6 +114,10 @@ murmurhash.c murmurhash.h) +if(WIN32) + set(NORMAL_LOADER_SRCS ${NORMAL_LOADER_SRCS} adapters.h) +endif() + set(OPT_LOADER_SRCS dev_ext_trampoline.c phys_dev_ext.c) # Check for assembler support @@ -175,7 +179,6 @@ target_compile_options(loader-norm PUBLIC "$<$<CONFIG:DEBUG>:${LOCAL_C_FLAGS_DBG}>") target_compile_options(loader-norm PUBLIC ${MSVC_LOADER_COMPILE_OPTIONS}) target_include_directories(loader-norm PRIVATE "$<TARGET_PROPERTY:Vulkan::Headers,INTERFACE_INCLUDE_DIRECTORIES>") - target_include_directories(loader-norm PRIVATE "${WDK_INCLUDE_DIRS}") add_library(loader-opt OBJECT ${OPT_LOADER_SRCS}) add_dependencies(loader-opt loader_asm_gen_files) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Loader-1.1.126/loader/adapters.h new/Vulkan-Loader-1.1.127/loader/adapters.h --- old/Vulkan-Loader-1.1.126/loader/adapters.h 1970-01-01 01:00:00.000000000 +0100 +++ new/Vulkan-Loader-1.1.127/loader/adapters.h 2019-11-04 18:48:06.000000000 +0100 @@ -0,0 +1,80 @@ +/* +* Copyright (c) 2019 The Khronos Group Inc. +* Copyright (c) 2019 Valve Corporation +* Copyright (c) 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. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +* Author: Lenny Komow <[email protected]> +*/ + +typedef struct LoaderEnumAdapters2 { + ULONG adapter_count; + struct { + UINT handle; + LUID luid; + ULONG source_count; + BOOL present_move_regions_preferred; + } * adapters; +} LoaderEnumAdapters2; + +typedef _Check_return_ NTSTATUS(APIENTRY *PFN_LoaderEnumAdapters2)(const LoaderEnumAdapters2 *); + +typedef enum AdapterInfoType { + LOADER_QUERY_TYPE_REGISTRY = 48, +} AdapterInfoType; + +typedef struct LoaderQueryAdapterInfo { + UINT handle; + AdapterInfoType type; + VOID *private_data; + UINT private_data_size; +} LoaderQueryAdapterInfo; + +typedef _Check_return_ NTSTATUS(APIENTRY *PFN_LoaderQueryAdapterInfo)(const LoaderQueryAdapterInfo *); + +typedef enum LoaderQueryRegistryType { + LOADER_QUERY_REGISTRY_ADAPTER_KEY = 1, +} LoaderQueryRegistryType; + +typedef enum LoaderQueryRegistryStatus { + LOADER_QUERY_REGISTRY_STATUS_SUCCESS = 0, + LOADER_QUERY_REGISTRY_STATUS_BUFFER_OVERFLOW = 1, +} LoaderQueryRegistryStatus; + +typedef struct LoaderQueryRegistryFlags { + union { + struct { + UINT translate_path : 1; + UINT mutable_value : 1; + UINT reserved : 30; + }; + UINT value; + }; +} LoaderQueryRegistryFlags; + +typedef struct LoaderQueryRegistryInfo { + LoaderQueryRegistryType query_type; + LoaderQueryRegistryFlags query_flags; + WCHAR value_name[MAX_PATH]; + ULONG value_type; + ULONG physical_adapter_index; + ULONG output_value_size; + LoaderQueryRegistryStatus status; + union { + DWORD output_dword; + UINT64 output_qword; + WCHAR output_string[1]; + BYTE output_binary[1]; + }; +} LoaderQueryRegistryInfo; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Loader-1.1.126/loader/loader.c new/Vulkan-Loader-1.1.127/loader/loader.c --- old/Vulkan-Loader-1.1.126/loader/loader.c 2019-10-21 23:08:13.000000000 +0200 +++ new/Vulkan-Loader-1.1.127/loader/loader.c 2019-11-04 18:48:06.000000000 +0100 @@ -70,11 +70,8 @@ #include <initguid.h> #include <devpkey.h> #include <winternl.h> -#include <d3dkmthk.h> +#include "adapters.h" #include "dxgi_loader.h" - -typedef _Check_return_ NTSTATUS (APIENTRY *PFN_D3DKMTEnumAdapters2)(const D3DKMT_ENUMADAPTERS2*); -typedef _Check_return_ NTSTATUS (APIENTRY *PFN_D3DKMTQueryAdapterInfo)(const D3DKMT_QUERYADAPTERINFO*); #endif // This is a CMake generated file with #defines for any functions/includes @@ -932,41 +929,40 @@ } if (i == sizeof(known_drivers) / sizeof(known_drivers[0])) { loader_log(inst, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, 0, - "Dropping driver %s as it was not recognized as a known driver", name); - continue; - } - - bool found_gpu = false; - for (int j = 0;; ++j) { - IDXGIAdapter1 *adapter; - HRESULT hres = dxgi_factory->lpVtbl->EnumAdapters1(dxgi_factory, j, &adapter); - if (hres == DXGI_ERROR_NOT_FOUND) { - break; - } else if (hres != S_OK) { - loader_log(inst, VK_DEBUG_REPORT_WARNING_BIT_EXT, 0, - "Failed to enumerate DXGI adapters at index %d. As a result, drivers may be skipped", j); - continue; + "Driver %s is not recognized as a known driver. It will be assumed to be active", name); + } else { + bool found_gpu = false; + for (int j = 0;; ++j) { + IDXGIAdapter1 *adapter; + HRESULT hres = dxgi_factory->lpVtbl->EnumAdapters1(dxgi_factory, j, &adapter); + if (hres == DXGI_ERROR_NOT_FOUND) { + break; + } else if (hres != S_OK) { + loader_log(inst, VK_DEBUG_REPORT_WARNING_BIT_EXT, 0, + "Failed to enumerate DXGI adapters at index %d. As a result, drivers may be skipped", j); + continue; + } + + DXGI_ADAPTER_DESC1 description; + hres = adapter->lpVtbl->GetDesc1(adapter, &description); + if (hres != S_OK) { + loader_log( + inst, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, 0, + "Failed to get DXGI adapter information at index %d. As a result, drivers may be skipped", j); + continue; + } + + if (description.VendorId == known_drivers[i].vendor_id) { + found_gpu = true; + break; + } } - DXGI_ADAPTER_DESC1 description; - hres = adapter->lpVtbl->GetDesc1(adapter, &description); - if (hres != S_OK) { - loader_log( - inst, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, 0, - "Failed to get DXGI adapter information at index %d. As a result, drivers may be skipped", j); + if (!found_gpu) { + loader_log(inst, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, 0, + "Dropping driver %s as no corresponduing DXGI adapter was found", name); continue; } - - if (description.VendorId == known_drivers[i].vendor_id) { - found_gpu = true; - break; - } - } - - if (!found_gpu) { - loader_log(inst, VK_DEBUG_REPORT_INFORMATION_BIT_EXT, 0, - "Dropping driver %s as no corresponduing DXGI adapter was found", name); - continue; } } @@ -1003,7 +999,8 @@ } } } - name_size = 2048; + name_size = sizeof(name); + value_size = sizeof(value); } RegCloseKey(key); } @@ -1785,7 +1782,7 @@ enable = true; } else { // Otherwise, only enable this layer if the enable environment variable is defined - env_value = loader_secure_getenv(prop->enable_env_var.name, inst); + env_value = loader_getenv(prop->enable_env_var.name, inst); if (env_value && !strcmp(prop->enable_env_var.value, env_value)) { enable = true; } @@ -1794,7 +1791,7 @@ // The disable_environment has priority over everything else. If it is defined, the layer is always // disabled. - env_value = loader_secure_getenv(prop->disable_env_var.name, inst); + env_value = loader_getenv(prop->disable_env_var.name, inst); if (env_value) { enable = false; } @@ -3956,70 +3953,70 @@ static VkResult ReadManifestsFromD3DAdapters(const struct loader_instance *inst, char **reg_data, PDWORD reg_data_size, const wchar_t *value_name) { VkResult result = VK_INCOMPLETE; - D3DKMT_ENUMADAPTERS2 adapters = {.NumAdapters = 0, .pAdapters = NULL}; - D3DDDI_QUERYREGISTRY_INFO *full_info = NULL; + LoaderEnumAdapters2 adapters = {.adapter_count = 0, .adapters = NULL}; + LoaderQueryRegistryInfo *full_info = NULL; size_t full_info_size = 0; char *json_path = NULL; size_t json_path_size = 0; - PFN_D3DKMTEnumAdapters2 fpD3DKMTEnumAdapters2 = - (PFN_D3DKMTEnumAdapters2)GetProcAddress(GetModuleHandle("gdi32.dll"), "D3DKMTEnumAdapters2"); - PFN_D3DKMTQueryAdapterInfo fpD3DKMTQueryAdapterInfo = - (PFN_D3DKMTQueryAdapterInfo)GetProcAddress(GetModuleHandle("gdi32.dll"), "D3DKMTQueryAdapterInfo"); - if (fpD3DKMTEnumAdapters2 == NULL || fpD3DKMTQueryAdapterInfo == NULL) { + PFN_LoaderEnumAdapters2 fpLoaderEnumAdapters2 = + (PFN_LoaderEnumAdapters2)GetProcAddress(GetModuleHandle("gdi32.dll"), "D3DKMTEnumAdapters2"); + PFN_LoaderQueryAdapterInfo fpLoaderQueryAdapterInfo = + (PFN_LoaderQueryAdapterInfo)GetProcAddress(GetModuleHandle("gdi32.dll"), "D3DKMTQueryAdapterInfo"); + if (fpLoaderEnumAdapters2 == NULL || fpLoaderQueryAdapterInfo == NULL) { result = VK_ERROR_OUT_OF_HOST_MEMORY; goto out; } // Get all of the adapters - NTSTATUS status = fpD3DKMTEnumAdapters2(&adapters); - if (status == STATUS_SUCCESS && adapters.NumAdapters > 0) { - adapters.pAdapters = - loader_instance_heap_alloc(inst, sizeof(D3DKMT_ADAPTERINFO) * adapters.NumAdapters, VK_SYSTEM_ALLOCATION_SCOPE_COMMAND); - if (adapters.pAdapters == NULL) { + NTSTATUS status = fpLoaderEnumAdapters2(&adapters); + if (status == STATUS_SUCCESS && adapters.adapter_count > 0) { + adapters.adapters = loader_instance_heap_alloc(inst, sizeof(*adapters.adapters) * adapters.adapter_count, + VK_SYSTEM_ALLOCATION_SCOPE_COMMAND); + if (adapters.adapters == NULL) { goto out; } - status = fpD3DKMTEnumAdapters2(&adapters); + status = fpLoaderEnumAdapters2(&adapters); } if (status != STATUS_SUCCESS) { goto out; } // If that worked, we need to get the manifest file(s) for each adapter - for (ULONG i = 0; i < adapters.NumAdapters; ++i) { + for (ULONG i = 0; i < adapters.adapter_count; ++i) { // The first query should just check if the field exists and how big it is - D3DDDI_QUERYREGISTRY_INFO filename_info = { - .QueryType = D3DDDI_QUERYREGISTRY_ADAPTERKEY, - .QueryFlags = + LoaderQueryRegistryInfo filename_info = { + .query_type = LOADER_QUERY_REGISTRY_ADAPTER_KEY, + .query_flags = { - .TranslatePath = true, + .translate_path = true, }, - .ValueType = REG_MULTI_SZ, - .PhysicalAdapterIndex = 0, + .value_type = REG_MULTI_SZ, + .physical_adapter_index = 0, }; - wcsncpy(filename_info.ValueName, value_name, sizeof(filename_info.ValueName) / sizeof(DWORD)); - D3DKMT_QUERYADAPTERINFO query_info = { - .hAdapter = adapters.pAdapters[i].hAdapter, - .Type = KMTQAITYPE_QUERYREGISTRY, - .pPrivateDriverData = &filename_info, - .PrivateDriverDataSize = sizeof(filename_info), + wcsncpy(filename_info.value_name, value_name, sizeof(filename_info.value_name) / sizeof(DWORD)); + LoaderQueryAdapterInfo query_info = { + .handle = adapters.adapters[i].handle, + .type = LOADER_QUERY_TYPE_REGISTRY, + .private_data = &filename_info, + .private_data_size = sizeof(filename_info), }; - status = fpD3DKMTQueryAdapterInfo(&query_info); + status = fpLoaderQueryAdapterInfo(&query_info); // This error indicates that the type didn't match, so we'll try a REG_SZ if (status != STATUS_SUCCESS) { - filename_info.ValueType = REG_SZ; - status = fpD3DKMTQueryAdapterInfo(&query_info); + filename_info.value_type = REG_SZ; + status = fpLoaderQueryAdapterInfo(&query_info); } - if (status != STATUS_SUCCESS || filename_info.Status != D3DDDI_QUERYREGISTRY_STATUS_BUFFER_OVERFLOW) { + if (status != STATUS_SUCCESS || filename_info.status != LOADER_QUERY_REGISTRY_STATUS_BUFFER_OVERFLOW) { continue; } - while (status == STATUS_SUCCESS && ((D3DDDI_QUERYREGISTRY_INFO *)query_info.pPrivateDriverData)->Status == - D3DDDI_QUERYREGISTRY_STATUS_BUFFER_OVERFLOW) { + while (status == STATUS_SUCCESS && + ((LoaderQueryRegistryInfo *)query_info.private_data)->status == LOADER_QUERY_REGISTRY_STATUS_BUFFER_OVERFLOW) { bool needs_copy = (full_info == NULL); - size_t full_size = sizeof(D3DDDI_QUERYREGISTRY_INFO) + filename_info.OutputValueSize; + size_t full_size = sizeof(LoaderQueryRegistryInfo) + filename_info.output_value_size; void *buffer = loader_instance_heap_realloc(inst, full_info, full_info_size, full_size, VK_SYSTEM_ALLOCATION_SCOPE_COMMAND); if (buffer == NULL) { @@ -4030,29 +4027,29 @@ full_info_size = full_size; if (needs_copy) { - memcpy(full_info, &filename_info, sizeof(D3DDDI_QUERYREGISTRY_INFO)); + memcpy(full_info, &filename_info, sizeof(LoaderQueryRegistryInfo)); } - query_info.pPrivateDriverData = full_info; - query_info.PrivateDriverDataSize = (UINT)full_info_size; - status = fpD3DKMTQueryAdapterInfo(&query_info); + query_info.private_data = full_info; + query_info.private_data_size = (UINT)full_info_size; + status = fpLoaderQueryAdapterInfo(&query_info); } - if (status != STATUS_SUCCESS || full_info->Status != D3DDDI_QUERYREGISTRY_STATUS_SUCCESS) { + if (status != STATUS_SUCCESS || full_info->status != LOADER_QUERY_REGISTRY_STATUS_SUCCESS) { goto out; } // Convert the wide string to a narrow string - void *buffer = loader_instance_heap_realloc(inst, json_path, json_path_size, full_info->OutputValueSize, + void *buffer = loader_instance_heap_realloc(inst, json_path, json_path_size, full_info->output_value_size, VK_SYSTEM_ALLOCATION_SCOPE_COMMAND); if (buffer == NULL) { result = VK_ERROR_OUT_OF_HOST_MEMORY; goto out; } json_path = buffer; - json_path_size = full_info->OutputValueSize; + json_path_size = full_info->output_value_size; // Iterate over each component string - for (const wchar_t *curr_path = full_info->OutputString; curr_path[0] != '\0'; curr_path += wcslen(curr_path) + 1) { + for (const wchar_t *curr_path = full_info->output_string; curr_path[0] != '\0'; curr_path += wcslen(curr_path) + 1) { WideCharToMultiByte(CP_UTF8, 0, curr_path, -1, json_path, (int)json_path_size, NULL, NULL); // Add the string to the output list @@ -4064,7 +4061,7 @@ } // If this is a string and not a multi-string, we don't want to go throught the loop more than once - if (full_info->ValueType == REG_SZ) { + if (full_info->value_type == REG_SZ) { break; } } @@ -4077,8 +4074,8 @@ if (full_info != NULL) { loader_instance_heap_free(inst, full_info); } - if (adapters.pAdapters != NULL) { - loader_instance_heap_free(inst, adapters.pAdapters); + if (adapters.adapters != NULL) { + loader_instance_heap_free(inst, adapters.adapters); } return result; @@ -5397,7 +5394,7 @@ struct loader_layer_list *target_list, struct loader_layer_list *expanded_target_list, const struct loader_layer_list *source_list) { char *next, *name; - char *layer_env = loader_secure_getenv(env_name, inst); + char *layer_env = loader_getenv(env_name, inst); if (layer_env == NULL) { goto out; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Loader-1.1.126/scripts/known_good.json new/Vulkan-Loader-1.1.127/scripts/known_good.json --- old/Vulkan-Loader-1.1.126/scripts/known_good.json 2019-10-21 23:08:13.000000000 +0200 +++ new/Vulkan-Loader-1.1.127/scripts/known_good.json 2019-11-04 18:48:06.000000000 +0100 @@ -6,7 +6,7 @@ "sub_dir" : "Vulkan-Headers", "build_dir" : "Vulkan-Headers/build", "install_dir" : "Vulkan-Headers/build/install", - "commit" : "v1.1.126" + "commit" : "v1.1.127" } ], "install_names" : {
