Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

profiles: Update to header 264 #496

Merged
merged 2 commits into from
Sep 12, 2023
Merged

profiles: Update to header 264 #496

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38979bb
profiles: Update to header 264
ziga-lunarg Sep 11, 2023
47d5529
cmake: Fix warning as error issues
christophe-lunarg Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion layer/vk_layer_table.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <sstream>
#include <iomanip>
#include <unordered_map>
#include <vulkan/utility/vul_dispatch_table.h>
#include <vulkan/utility/vk_dispatch_table.h>
#include "vulkan/vk_layer.h"
#include "vk_layer_table.h"
static device_table_map tableMap;
Expand Down
2 changes: 1 addition & 1 deletion layer/vk_layer_table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#pragma once

#include "vulkan/utility/vul_dispatch_table.h"
#include "vulkan/utility/vk_dispatch_table.h"
#include "vulkan/vk_layer.h"
#include "vulkan/vulkan.h"
#include <memory>
Expand Down
6 changes: 3 additions & 3 deletions scripts/known_good.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
"sub_dir": "Vulkan-Headers",
"build_dir": "Vulkan-Headers/build",
"install_dir": "Vulkan-Headers/build/install",
"commit": "v1.3.263"
"commit": "v1.3.264"
},
{
"name": "Vulkan-Utility-Libraries",
"url": "https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git",
"sub_dir": "Vulkan-Utility-Libraries",
"build_dir": "Vulkan-Utility-Libraries/build",
"install_dir": "Vulkan-Utility-Libraries/build/install",
"commit": "v1.3.263",
"commit": "v1.3.264",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to use ba0d57a51424de68a86326e393a65b26373e1c1f to pass the test I believe but I don't understand why and what's going on @juan-lunarg might know.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TLDR: Utility libraries was exporting compiler options it shouldn't have been. ba0d57a51424de68a86326e393a65b26373e1c1f addresses that.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's how I resolved this PR ^_^

"deps": [
{
"var_name": "VULKAN_HEADERS_INSTALL_DIR",
Expand All @@ -28,7 +28,7 @@
"sub_dir": "Vulkan-Loader",
"build_dir": "Vulkan-Loader/build",
"install_dir": "Vulkan-Loader/build/install",
"commit": "v1.3.263",
"commit": "v1.3.264",
"deps": [
{
"var_name": "VULKAN_HEADERS_INSTALL_DIR",
Expand Down
Loading