summaryrefslogtreecommitdiff
path: root/vulkan/libvulkan/api.cpp
diff options
context:
space:
mode:
author Chris Forbes <chrisforbes@google.com> 2024-11-25 23:39:49 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-11-25 23:39:49 +0000
commitd3ca472da613f281eb09b0ca07b44ce85a35ecfb (patch)
tree8339c5a2457859bee7fd55e928d44a19e9d77036 /vulkan/libvulkan/api.cpp
parent3a57dcd789d1531443398617342586cadae0ac6a (diff)
parent4d74653b0e9b4cc04015294a92e2511da01ed0dc (diff)
Merge changes from topic "vulkan-1.4" into main
* changes: Update libvulkan linker map for 1.4 Add feature xml for Vulkan version 1.4 Add support for Vulkan 1.4 core entrypoints to nulldrv Allow vkjson to report on 1.4 instances Add support for vulkan api level 1.4 in loader Regenerate vulkan-loader for 1.4
Diffstat (limited to 'vulkan/libvulkan/api.cpp')
-rw-r--r--vulkan/libvulkan/api.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/vulkan/libvulkan/api.cpp b/vulkan/libvulkan/api.cpp
index c335e2a952..8451ad1c9e 100644
--- a/vulkan/libvulkan/api.cpp
+++ b/vulkan/libvulkan/api.cpp
@@ -45,6 +45,9 @@
#include "driver.h"
#include "layers_extensions.h"
+#include <com_android_graphics_libvulkan_flags.h>
+
+using namespace com::android::graphics::libvulkan;
namespace vulkan {
namespace api {
@@ -1473,7 +1476,7 @@ VkResult EnumerateInstanceVersion(uint32_t* pApiVersion) {
if (!EnsureInitialized())
return VK_ERROR_OUT_OF_HOST_MEMORY;
- *pApiVersion = VK_API_VERSION_1_3;
+ *pApiVersion = flags::vulkan_1_4_instance_api() ? VK_API_VERSION_1_4 : VK_API_VERSION_1_3;
return VK_SUCCESS;
}