Skip to content

Commit

Permalink
Profiles roadmap 2024 (#207)
Browse files Browse the repository at this point in the history
* Updated profiles library to include new profiles incl. the roadmap 2024 profile

* Use C++17

Required for new profiles library to compile with Qt/Android

* Updated to Vulkan headers 1.3.279

Adds support for:
- VK_NV_raw_access_chains

* Update profiles library

* Updated profiles library

* Updated profiles library

Fixes warnings

* Updated to Vulkan headers 1.3.280

Adds support for:
- VK_NV_ray_tracing_validation

* Version bump to 3.34

* Fix for recent profiles library update

Add define to disable profiles

* Update profiles library

* Fix defines

* Update platform toolset

* Revert back to profiles library from latest SDK
  • Loading branch information
SaschaWillems authored Apr 12, 2024
1 parent 3fbd60d commit 0079c2c
Show file tree
Hide file tree
Showing 6 changed files with 3,902 additions and 3,816 deletions.
4 changes: 2 additions & 2 deletions vulkanCapsViewer.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<OutputDirectory>Win32\Release\</OutputDirectory>
<ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
<CharacterSet>NotSet</CharacterSet>
Expand All @@ -29,7 +29,7 @@
<PrimaryOutput>vulkanCapsViewer</PrimaryOutput>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<OutputDirectory>Win32\Release\</OutputDirectory>
<ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
<CharacterSet>NotSet</CharacterSet>
Expand Down
4 changes: 4 additions & 0 deletions vulkanDeviceInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -783,6 +783,7 @@ void VulkanDeviceInfo::readPlatformDetails()

void VulkanDeviceInfo::readProfiles()
{
#if !defined(DISABLE_PROFILES)
qInfo() << "Reading profiles";

std::vector<VpProfileProperties> availableProfiles{};
Expand All @@ -803,6 +804,9 @@ void VulkanDeviceInfo::readProfiles()
profileInfo.supported = supported;
profiles.push_back(profileInfo);
}
#else
qInfo() << "Profiles disabled at build time";
#endif
}

QJsonObject VulkanDeviceInfo::toJson(QString submitter, QString comment)
Expand Down
4 changes: 3 additions & 1 deletion vulkanDeviceInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
#include "vulkansurfaceinfo.hpp"
#include "VulkanDeviceInfoExtensions.h"
#include "VulkanContext.h"
#include "vulkan_profiles.hpp"

#ifdef __ANDROID__
#include <sys/system_properties.h>
Expand All @@ -57,6 +56,9 @@
#endif

#include "vulkanandroid.h"
#if !defined(DISABLE_PROFILES)
#include "vulkan_profiles.hpp"
#endif

struct OSInfo
{
Expand Down
Loading

0 comments on commit 0079c2c

Please sign in to comment.