Hello community,
here is the log from the commit of package vulkan-tools for openSUSE:Factory checked in at 2019-07-02 15:18:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vulkan-tools (Old)
and /work/SRC/openSUSE:Factory/.vulkan-tools.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vulkan-tools"
Tue Jul 2 15:18:15 2019 rev:7 rq:712365 version:1.1.112
Changes:
--------
--- /work/SRC/openSUSE:Factory/vulkan-tools/vulkan-tools.changes 2019-06-19 21:04:58.754323962 +0200
+++ /work/SRC/openSUSE:Factory/.vulkan-tools.new.4615/vulkan-tools.changes 2019-07-02 15:18:17.090729361 +0200
@@ -1,0 +2,8 @@
+Fri Jun 28 07:32:59 UTC 2019 - Jan Engelhardt
+
+- Update to new upstream release 1.1.112
+ * vulkaninfo: Fix issues 195, 202
+ * cube: Add subpass dependencies
+ * vulkaninfo: Fix HTML format for multi-GPU computer
+
+-------------------------------------------------------------------
Old:
----
Vulkan-Tools-1.1.108.tar.xz
New:
----
Vulkan-Tools-1.1.112.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vulkan-tools.spec ++++++
--- /var/tmp/diff_new_pack.LRuA1E/_old 2019-07-02 15:18:20.954736056 +0200
+++ /var/tmp/diff_new_pack.LRuA1E/_new 2019-07-02 15:18:20.958736061 +0200
@@ -16,10 +16,10 @@
#
-%define version_unconverted 1.1.108
+%define version_unconverted 1.1.112
Name: vulkan-tools
-Version: 1.1.108
+Version: 1.1.112
Release: 0
Summary: Reference ICD loader for Vulkan
License: Apache-2.0
@@ -29,10 +29,10 @@
Source: Vulkan-Tools-%version.tar.xz
BuildRequires: cmake >= 3.4
BuildRequires: gcc-c++ >= 4.8
-BuildRequires: glslang-devel >= 7.11.3188
+BuildRequires: glslang-devel >= 7.11.3226
BuildRequires: pkg-config
BuildRequires: python3-base
-BuildRequires: pkgconfig(vulkan) >= 1.1.108
+BuildRequires: pkgconfig(vulkan) >= %version
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcb)
Obsoletes: vulkan < %version-%release
++++++ Vulkan-Tools-1.1.108.tar.xz -> Vulkan-Tools-1.1.112.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-1.1.108/.appveyor.yml new/Vulkan-Tools-1.1.112/.appveyor.yml
--- old/Vulkan-Tools-1.1.108/.appveyor.yml 2019-05-29 18:22:32.000000000 +0200
+++ new/Vulkan-Tools-1.1.112/.appveyor.yml 2019-06-25 21:08:41.000000000 +0200
@@ -17,15 +17,22 @@
environment:
PYTHON_PATH: "C:/Python35"
PYTHON_PACKAGE_PATH: "C:/Python35/Scripts"
+ CMAKE_URL: "http://cmake.org/files/v3.10/cmake-3.10.2-win64-x64.zip"
branches:
only:
- master
+# Install desired CMake version 3.10.2 before any other building
+install:
+ - appveyor DownloadFile %CMAKE_URL% -FileName cmake.zip
+ - 7z x cmake.zip -oC:\cmake > nul
+ - set path=C:\cmake\bin;%path%
+ - cmake --version
+
before_build:
- "SET PATH=C:\\Python35;C:\\Python35\\Scripts;%PATH%"
- echo Starting build for %APPVEYOR_REPO_NAME% in %APPVEYOR_BUILD_FOLDER%
- - cmake --version
# Generate build files using CMake for the build step.
- echo Generating Vulkan-Tools CMake files for %PLATFORM% %CONFIGURATION%
- cd %APPVEYOR_BUILD_FOLDER%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-1.1.108/.travis.yml new/Vulkan-Tools-1.1.112/.travis.yml
--- old/Vulkan-Tools-1.1.108/.travis.yml 2019-05-29 18:22:32.000000000 +0200
+++ new/Vulkan-Tools-1.1.112/.travis.yml 2019-06-25 21:08:41.000000000 +0200
@@ -45,6 +45,17 @@
before_install:
- set -e
+ - CMAKE_VERSION=3.10.2
+ - |
+ if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
+ CMAKE_URL="https://cmake.org/files/v${CMAKE_VERSION%.*}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz"
+ echo CMAKE_URL=${CMAKE_URL}
+ mkdir cmake-${CMAKE_VERSION} && travis_retry wget --no-check-certificate -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake-${CMAKE_VERSION}
+ export PATH=${PWD}/cmake-${CMAKE_VERSION}/bin:${PATH}
+ else
+ brew install cmake || brew upgrade cmake
+ fi
+ cmake --version
- |
if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]] || [[ "$VULKAN_BUILD_TARGET" == "GN" ]]; then
# Install the appropriate Linux packages.
@@ -73,7 +84,6 @@
script:
- set -e
- - cmake --version
- |
if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]]; then
# Build Vulkan-Tools
@@ -134,7 +144,6 @@
notifications:
email:
recipients:
- - karl@lunarg.com
- cnorthrop@google.com
- tobine@google.com
- chrisforbes@google.com
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-1.1.108/build-android/vulkan-headers_revision_android new/Vulkan-Tools-1.1.112/build-android/vulkan-headers_revision_android
--- old/Vulkan-Tools-1.1.108/build-android/vulkan-headers_revision_android 2019-05-29 18:22:32.000000000 +0200
+++ new/Vulkan-Tools-1.1.112/build-android/vulkan-headers_revision_android 2019-06-25 21:08:41.000000000 +0200
@@ -1 +1 @@
-v1.1.108
+v1.1.112
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-1.1.108/cube/cube.c new/Vulkan-Tools-1.1.112/cube/cube.c
--- old/Vulkan-Tools-1.1.108/cube/cube.c 2019-05-29 18:22:32.000000000 +0200
+++ new/Vulkan-Tools-1.1.112/cube/cube.c 2019-06-25 21:08:41.000000000 +0200
@@ -1,7 +1,7 @@
/*
- * Copyright (c) 2015-2016 The Khronos Group Inc.
- * Copyright (c) 2015-2016 Valve Corporation
- * Copyright (c) 2015-2016 LunarG, Inc.
+ * Copyright (c) 2015-2019 The Khronos Group Inc.
+ * Copyright (c) 2015-2019 Valve Corporation
+ * Copyright (c) 2015-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.
@@ -1892,6 +1892,32 @@
.preserveAttachmentCount = 0,
.pPreserveAttachments = NULL,
};
+
+ VkSubpassDependency attachmentDependencies[2] = {
+ [0] =
+ {
+ // Depth buffer is shared between swapchain images
+ .srcSubpass = VK_SUBPASS_EXTERNAL,
+ .dstSubpass = 0,
+ .srcStageMask = VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT,
+ .dstStageMask = VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT,
+ .srcAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,
+ .dstAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT,
+ .dependencyFlags = 0,
+ },
+ [1] =
+ {
+ // Image Layout Transition
+ .srcSubpass = VK_SUBPASS_EXTERNAL,
+ .dstSubpass = 0,
+ .srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
+ .dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
+ .srcAccessMask = 0,
+ .dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT,
+ .dependencyFlags = 0,
+ },
+ };
+
const VkRenderPassCreateInfo rp_info = {
.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO,
.pNext = NULL,
@@ -1900,8 +1926,8 @@
.pAttachments = attachments,
.subpassCount = 1,
.pSubpasses = &subpass,
- .dependencyCount = 0,
- .pDependencies = NULL,
+ .dependencyCount = 2,
+ .pDependencies = attachmentDependencies,
};
VkResult U_ASSERT_ONLY err;
@@ -3711,17 +3737,31 @@
#if defined(ANDROID)
ERR_EXIT("Usage: vkcube [--validate]\n", "Usage");
#else
- fprintf(stderr,
- "Usage:\n %s\t[--use_staging] [--validate] [--validate-checks-disabled] [--break]\n"
- "\t[--c <framecount>] [--suppress_popups] [--incremental_present] [--display_timing]\n"
- "\t[--present_mode <present mode enum>]\n"
- "\t \tVK_PRESENT_MODE_IMMEDIATE_KHR = %d\n"
- "\t\t\t\tVK_PRESENT_MODE_MAILBOX_KHR = %d\n"
- "\t\t\t\tVK_PRESENT_MODE_FIFO_KHR = %d\n"
- "\t\t\t\tVK_PRESENT_MODE_FIFO_RELAXED_KHR = %d\n",
- APP_SHORT_NAME, VK_PRESENT_MODE_IMMEDIATE_KHR, VK_PRESENT_MODE_MAILBOX_KHR, VK_PRESENT_MODE_FIFO_KHR,
- VK_PRESENT_MODE_FIFO_RELAXED_KHR);
+ char *message =
+ "Usage:\n %s\t[--use_staging] [--validate] [--validate-checks-disabled]\n"
+ "\t[--break] [--c <framecount>] [--suppress_popups]\n"
+ "\t[--incremental_present] [--display_timing]\n"
+ "\t[--present_mode <present mode enum>]\n"
+ "\t\n"
+ "\t\tVK_PRESENT_MODE_IMMEDIATE_KHR = %d\n"
+ "\t\tVK_PRESENT_MODE_MAILBOX_KHR = %d\n"
+ "\t\tVK_PRESENT_MODE_FIFO_KHR = %d\n"
+ "\t\tVK_PRESENT_MODE_FIFO_RELAXED_KHR = %d\n";
+ int length = snprintf(NULL, 0, message, APP_SHORT_NAME, VK_PRESENT_MODE_IMMEDIATE_KHR, VK_PRESENT_MODE_MAILBOX_KHR,
+ VK_PRESENT_MODE_FIFO_KHR, VK_PRESENT_MODE_FIFO_RELAXED_KHR);
+ char *usage = (char *)malloc(length + 1);
+ if (!usage) {
+ exit(1);
+ }
+ snprintf(usage, length + 1, message, APP_SHORT_NAME, VK_PRESENT_MODE_IMMEDIATE_KHR, VK_PRESENT_MODE_MAILBOX_KHR,
+ VK_PRESENT_MODE_FIFO_KHR, VK_PRESENT_MODE_FIFO_RELAXED_KHR);
+#if defined(_WIN32)
+ if (!demo->suppress_popups) MessageBox(NULL, usage, "Usage Error", MB_OK);
+#else
+ fprintf(stderr, "%s", usage);
fflush(stderr);
+#endif
+ free(usage);
exit(1);
#endif
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-1.1.108/cube/cube.cpp new/Vulkan-Tools-1.1.112/cube/cube.cpp
--- old/Vulkan-Tools-1.1.108/cube/cube.cpp 2019-05-29 18:22:32.000000000 +0200
+++ new/Vulkan-Tools-1.1.112/cube/cube.cpp 2019-06-25 21:08:41.000000000 +0200
@@ -1,7 +1,7 @@
/*
- * Copyright (c) 2015-2016 The Khronos Group Inc.
- * Copyright (c) 2015-2016 Valve Corporation
- * Copyright (c) 2015-2016 LunarG, Inc.
+ * Copyright (c) 2015-2019 The Khronos Group Inc.
+ * Copyright (c) 2015-2019 Valve Corporation
+ * Copyright (c) 2015-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.
@@ -30,6 +30,8 @@
#include <cstdlib>
#include <cstring>
#include <csignal>
+#include <iostream>
+#include <sstream>
#include <memory>
#define VULKAN_HPP_NO_SMART_HANDLE
@@ -930,18 +932,22 @@
continue;
}
- fprintf(stderr,
- "Usage:\n %s [--use_staging] [--validate] [--break] [--c <framecount>] \n"
- " [--suppress_popups] [--present_mode {0,1,2,3}]\n"
- "\n"
- "Options for --present_mode:\n"
- " %d: VK_PRESENT_MODE_IMMEDIATE_KHR\n"
- " %d: VK_PRESENT_MODE_MAILBOX_KHR\n"
- " %d: VK_PRESENT_MODE_FIFO_KHR (default)\n"
- " %d: VK_PRESENT_MODE_FIFO_RELAXED_KHR\n",
- APP_SHORT_NAME, VK_PRESENT_MODE_IMMEDIATE_KHR, VK_PRESENT_MODE_MAILBOX_KHR, VK_PRESENT_MODE_FIFO_KHR,
- VK_PRESENT_MODE_FIFO_RELAXED_KHR);
- fflush(stderr);
+ std::stringstream usage;
+ usage << "Usage:\n " << APP_SHORT_NAME << "\t[--use_staging] [--validate]\n"
+ << "\t[--break] [--c <framecount>] [--suppress_popups]\n"
+ << "\t[--present_mode <present mode enum>]\n"
+ << "\t\n"
+ << "\t\tVK_PRESENT_MODE_IMMEDIATE_KHR = " << VK_PRESENT_MODE_IMMEDIATE_KHR << "\n"
+ << "\t\tVK_PRESENT_MODE_MAILBOX_KHR = " << VK_PRESENT_MODE_MAILBOX_KHR << "\n"
+ << "\t\tVK_PRESENT_MODE_FIFO_KHR = " << VK_PRESENT_MODE_FIFO_KHR << "\n"
+ << "\t\tVK_PRESENT_MODE_FIFO_RELAXED_KHR = " << VK_PRESENT_MODE_FIFO_RELAXED_KHR;
+
+#if defined(_WIN32)
+ if (!suppress_popups) MessageBox(NULL, usage.str().c_str(), "Usage Error", MB_OK);
+#else
+ std::cerr << usage.str();
+ std::cerr.flush();
+#endif
exit(1);
}
@@ -1969,13 +1975,33 @@
.setPreserveAttachmentCount(0)
.setPPreserveAttachments(nullptr);
+ vk::PipelineStageFlags stages = vk::PipelineStageFlagBits::eEarlyFragmentTests | vk::PipelineStageFlagBits::eLateFragmentTests;
+ vk::SubpassDependency const dependencies[2] = {
+ vk::SubpassDependency() // Depth buffer is shared between swapchain images
+ .setSrcSubpass(VK_SUBPASS_EXTERNAL)
+ .setDstSubpass(0)
+ .setSrcStageMask(stages)
+ .setDstStageMask(stages)
+ .setSrcAccessMask(vk::AccessFlagBits::eDepthStencilAttachmentWrite)
+ .setDstAccessMask(vk::AccessFlagBits::eDepthStencilAttachmentRead | vk::AccessFlagBits::eDepthStencilAttachmentWrite)
+ .setDependencyFlags(vk::DependencyFlags()),
+ vk::SubpassDependency() // Image layout transition
+ .setSrcSubpass(VK_SUBPASS_EXTERNAL)
+ .setDstSubpass(0)
+ .setSrcStageMask(vk::PipelineStageFlagBits::eColorAttachmentOutput)
+ .setDstStageMask(vk::PipelineStageFlagBits::eColorAttachmentOutput)
+ .setSrcAccessMask(vk::AccessFlagBits())
+ .setDstAccessMask(vk::AccessFlagBits::eColorAttachmentWrite | vk::AccessFlagBits::eColorAttachmentRead)
+ .setDependencyFlags(vk::DependencyFlags()),
+ };
+
auto const rp_info = vk::RenderPassCreateInfo()
.setAttachmentCount(2)
.setPAttachments(attachments)
.setSubpassCount(1)
.setPSubpasses(&subpass)
- .setDependencyCount(0)
- .setPDependencies(nullptr);
+ .setDependencyCount(2)
+ .setPDependencies(dependencies);
auto result = device.createRenderPass(&rp_info, nullptr, &render_pass);
VERIFY(result == vk::Result::eSuccess);
@@ -3008,7 +3034,6 @@
// Global function invoked from NS or UI views and controllers to create demo
static void demo_main(struct Demo &demo, void *view, int argc, const char *argv[]) {
-
demo.init(argc, (char **)argv);
demo.window = view;
demo.init_vk_swapchain();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-1.1.108/scripts/known_good.json new/Vulkan-Tools-1.1.112/scripts/known_good.json
--- old/Vulkan-Tools-1.1.108/scripts/known_good.json 2019-05-29 18:22:32.000000000 +0200
+++ new/Vulkan-Tools-1.1.112/scripts/known_good.json 2019-06-25 21:08:41.000000000 +0200
@@ -6,7 +6,7 @@
"sub_dir" : "glslang",
"build_dir" : "glslang/build",
"install_dir" : "glslang/build/install",
- "commit" : "e06c7e9a515b716c731bda13f507546f107775d1",
+ "commit" : "21eebe74214488264bbf0d19323a03c13a9e53a7",
"prebuild" : [
"python update_glslang_sources.py"
]
@@ -17,7 +17,7 @@
"sub_dir" : "Vulkan-Headers",
"build_dir" : "Vulkan-Headers/build",
"install_dir" : "Vulkan-Headers/build/install",
- "commit" : "v1.1.108"
+ "commit" : "v1.1.112"
},
{
"name" : "MoltenVK",
@@ -25,7 +25,7 @@
"sub_dir" : "MoltenVK",
"build_dir" : "MoltenVK",
"install_dir" : "MoltenVK",
- "commit" : "v1.0.34",
+ "commit" : "v1.0.35",
"custom_build" : [
"./fetchDependencies --v-headers-root {0[Vulkan-Headers][repo_dir]} --glslang-root {0[glslang][repo_dir]}",
"xcodebuild -project MoltenVKPackaging.xcodeproj GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS MVK_LOGGING_ENABLED=0' -scheme \"MoltenVK Package\" build"
@@ -41,7 +41,7 @@
"sub_dir" : "Vulkan-Loader",
"build_dir" : "Vulkan-Loader/build",
"install_dir" : "Vulkan-Loader/build/install",
- "commit" : "v1.1.108",
+ "commit" : "v1.1.112",
"deps" : [
{
"var_name" : "VULKAN_HEADERS_INSTALL_DIR",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Vulkan-Tools-1.1.108/vulkaninfo/vulkaninfo.c new/Vulkan-Tools-1.1.112/vulkaninfo/vulkaninfo.c
--- old/Vulkan-Tools-1.1.108/vulkaninfo/vulkaninfo.c 2019-05-29 18:22:32.000000000 +0200
+++ new/Vulkan-Tools-1.1.112/vulkaninfo/vulkaninfo.c 2019-06-25 21:08:41.000000000 +0200
@@ -58,7 +58,6 @@
#ifdef _WIN32
-#define snprintf _snprintf
#define strdup _strdup
// Returns nonzero if the console is used only for this process. Will return
@@ -3511,7 +3510,7 @@
"class='val'>%u</span></summary></details>\n",
limits->maxFragmentCombinedOutputResources);
fprintf(out,
- "\t\t\t\t\t\t<details><summary>maxComputeSharedMemorySize = <span class='val'>0x%" PRIxLEAST32
+ "\t\t\t\t\t\t<details><summary>maxComputeSharedMemorySize = <span class='val'>%" PRIuLEAST32
"</span></summary></details>\n",
limits->maxComputeSharedMemorySize);
fprintf(out,
@@ -3820,7 +3819,7 @@
printf("\t\tmaxFragmentOutputAttachments = %u\n", limits->maxFragmentOutputAttachments);
printf("\t\tmaxFragmentDualSrcAttachments = %u\n", limits->maxFragmentDualSrcAttachments);
printf("\t\tmaxFragmentCombinedOutputResources = %u\n", limits->maxFragmentCombinedOutputResources);
- printf("\t\tmaxComputeSharedMemorySize = 0x%" PRIxLEAST32 "\n", limits->maxComputeSharedMemorySize);
+ printf("\t\tmaxComputeSharedMemorySize = %" PRIuLEAST32 "\n", limits->maxComputeSharedMemorySize);
printf("\t\tmaxComputeWorkGroupCount[0] = %u\n", limits->maxComputeWorkGroupCount[0]);
printf("\t\tmaxComputeWorkGroupCount[1] = %u\n", limits->maxComputeWorkGroupCount[1]);
printf("\t\tmaxComputeWorkGroupCount[2] = %u\n", limits->maxComputeWorkGroupCount[2]);
@@ -4565,6 +4564,7 @@
"\t\t\t\t\t\t<details><summary>transformFeedbackDraw = <span class='val'>%" PRIuLEAST32
"</span></summary></details>\n",
transform_feedback_properties->transformFeedbackDraw);
+ fprintf(out, "\t\t\t\t\t</details>\n");
} else if (human_readable_output) {
printf("\nVkPhysicalDeviceTransformFeedbackProperties\n");
printf("===========================================\n");
@@ -4618,6 +4618,7 @@
"\t\t\t\t\t\t<details><summary>fragmentDensityInvocations = <span class='val'>%" PRIuLEAST32
"</span></summary></details>\n",
fragment_density_map_properties->fragmentDensityInvocations);
+ fprintf(out, "\t\t\t\t\t</details>\n");
} else if (human_readable_output) {
printf("\nVkPhysicalDeviceFragmentDensityMapProperties\n");
printf("============================================\n");
@@ -4691,6 +4692,7 @@
"\t\t\t\t\t\t<details><summary>independentResolve = <span class='val'>%" PRIuLEAST32
"</span></summary></details>\n",
depth_stencil_resolve_properties->independentResolve);
+ fprintf(out, "\t\t\t\t\t</details>\n");
} else if (human_readable_output) {
printf("\nVkPhysicalDeviceDepthStencilResolveProperties\n");
printf("============================================\n");
@@ -4947,7 +4949,11 @@
if (which >= 0) {
unit[0] = prefixes[which];
}
+#ifdef _WIN32
+ _snprintf_s(buf, kBufferSize * sizeof(char), kBufferSize, "%.2f %sB", result, unit);
+#else
snprintf(buf, kBufferSize, "%.2f %sB", result, unit);
+#endif
return strndup(buf, kBufferSize);
}
@@ -5558,7 +5564,11 @@
AppCreateInstance(&inst);
if (html_output) {
+#ifdef _WIN32
+ if (fopen_s(&out, "vulkaninfo.html", "w") != 0) out = NULL;
+#else
out = fopen("vulkaninfo.html", "w");
+#endif
if (!out) {
printf("Unable to open vulkaninfo.html for writing\n");
return 1;
@@ -5645,8 +5655,13 @@
VkLayerProperties const *layer_prop = &inst.global_layers[i].layer_properties;
ExtractVersion(layer_prop->specVersion, &layer_major, &layer_minor, &layer_patch);
+#ifdef _WIN32
+ _snprintf_s(spec_version, sizeof(spec_version), 64, "%d.%d.%d", layer_major, layer_minor, layer_patch);
+ _snprintf_s(layer_version, sizeof(layer_version), 64, "%d", layer_prop->implementationVersion);
+#else
snprintf(spec_version, sizeof(spec_version), "%d.%d.%d", layer_major, layer_minor, layer_patch);
snprintf(layer_version, sizeof(layer_version), "%d", layer_prop->implementationVersion);
+#endif
if (html_output) {
fprintf(out, "\t\t\t\t<details><summary>");
++++++ _service ++++++
--- /var/tmp/diff_new_pack.LRuA1E/_old 2019-07-02 15:18:21.190736417 +0200
+++ /var/tmp/diff_new_pack.LRuA1E/_new 2019-07-02 15:18:21.190736417 +0200
@@ -2,9 +2,9 @@
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">https://github.com/KhronosGroup/Vulkan-Tools</param>
- <param name="revision">d2de4ac0</param>
- <param name="parent-tag">v1.1.107</param>
- <param name="versionformat">1.1.108</param>
+ <param name="revision">v1.1.112</param>
+ <param name="parent-tag">v1.1.112</param>
+ <param name="versionformat">1.1.112</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
