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.

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

Update Vulkan and related libraries to 1.3.250.0 #77898

Merged
merged 1 commit into from
Jun 7, 2023

Conversation

DeeJayLSP
Copy link
Contributor

@DeeJayLSP DeeJayLSP commented Jun 6, 2023

Updates glslang, spirv-reflect, volk and vulkan to 1.3.250.0.

Some patches might need some changes (one was implemented, so I deleted).

Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

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

Looks great, thanks for working on this!

Some further copyright statements to update to match what upstream projects did:

diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index 446f833eb9..497b4a535c 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -425,7 +425,7 @@ License: Apache-2.0
 
 Files: ./thirdparty/spirv-reflect/
 Comment: SPIRV-Reflect
-Copyright: 2017-2018, Google Inc.
+Copyright: 2017-2022, Google Inc.
 License: Apache-2.0
 
 Files: ./thirdparty/squish/
@@ -452,15 +452,15 @@ License: BSD-3-clause
 
 Files: ./thirdparty/volk/
 Comment: volk
-Copyright: 2018-2019, Arseny Kapoulkine
+Copyright: 2018-2023, Arseny Kapoulkine
 License: Expat
 
 Files: ./thirdparty/vulkan/
 Comment: Vulkan Headers
-Copyright: 2014-2021, The Khronos Group Inc.
-  2014-2021, Valve Corporation
-  2014-2021, LunarG, Inc.
-  2015-2021, Google Inc.
+Copyright: 2015-2023, The Khronos Group Inc.
+  2015-2023, Valve Corporation
+  2015-2023, LunarG, Inc.
+  2015-2023, Google Inc.
 License: Apache-2.0
 
 Files: ./thirdparty/vulkan/vk_mem_alloc.h
diff --git a/thirdparty/volk/LICENSE.md b/thirdparty/volk/LICENSE.md
index e5e847ad25..7315252211 100644
--- a/thirdparty/volk/LICENSE.md
+++ b/thirdparty/volk/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2018-2022 Arseny Kapoulkine
+Copyright (c) 2018-2023 Arseny Kapoulkine
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

@YuriSizov YuriSizov modified the milestones: 4.x, 4.1 Jun 6, 2023
@DeeJayLSP
Copy link
Contributor Author

All fixed I guess

Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

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

Looks good to me. We'll merge after beta 1 is released as that build is imminent, and Vulkan updates can sometimes cause regressions / expose platform specific issues.

@akien-mga akien-mga merged commit 1d6b28f into godotengine:master Jun 7, 2023
@akien-mga
Copy link
Member

Thanks!

@DeeJayLSP DeeJayLSP deleted the vulkan-250 branch June 7, 2023 15:03
@DeeJayLSP
Copy link
Contributor Author

DeeJayLSP commented Jun 15, 2023

@akien-mga Running any project still says the Vulkan version is 1.3.236 at output. Is this right or something I forgot?

@akien-mga
Copy link
Member

That's probably the Vulkan version installed on your OS which is reported.

Updating our version gives us access to more APIs but at the end it's the installed driver version which matters.

@DeeJayLSP
Copy link
Contributor Author

DeeJayLSP commented Jun 15, 2023

Weird because my OS's Vulkan is actually older than that.

@akien-mga
Copy link
Member

It should report the api_version from the icd file it's using. For me on Linux with Mesa 23.1.2:

$ grep api_version /usr/share/vulkan/icd.d/radeon_icd.x86_64.json 
        "api_version": "1.3.246",

So that seems to be the version Mesa 23.1.2 compiles for, despite my distro Vulkan-Loader being a bit older too (1.3.231.1).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants