Additional changes to Vulkan 1.1 API updates
This commit includes the following:
- Make new/Vulkan 1.1 core commands be optional in codegen. Before this
change, the loader crashed when starting with a 1.0 app, and using a 1.0 ICD.
That's because the loader couldn't find "required" 1.1 entrypoints. This
change makes those entrypoints "optional" with a new annotation in the api
file.
- Changes from internal reviews, including a fix for the algorithm of
EnumeratePhysicalDeviceGroups.
Test: Run with a 1.0 app with a 1.0 driver and make sure the loader works
Change-Id: I55914b680a1601cb9f3f2cc0257091a0a34ae7f2
diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
index d5e7c43..03e6ee0 100644
--- a/vulkan/libvulkan/swapchain.cpp
+++ b/vulkan/libvulkan/swapchain.cpp
@@ -775,13 +775,8 @@
VKAPI_ATTR
VkResult GetDeviceGroupPresentCapabilitiesKHR(
- VkDevice device,
+ VkDevice,
VkDeviceGroupPresentCapabilitiesKHR* pDeviceGroupPresentCapabilities) {
- ALOGV("vkGetDeviceGroupPresentCapabilitiesKHR: device=0x%" PRIx64
- "pDeviceGroupPresentCapabilities=0x%" PRIx64,
- reinterpret_cast<uint64_t>(device),
- reinterpret_cast<uint64_t>(pDeviceGroupPresentCapabilities));
-
ALOGV_IF(pDeviceGroupPresentCapabilities->sType !=
VK_STRUCTURE_TYPE_DEVICE_GROUP_PRESENT_CAPABILITIES_KHR,
"vkGetDeviceGroupPresentCapabilitiesKHR: invalid "
@@ -801,30 +796,18 @@
VKAPI_ATTR
VkResult GetDeviceGroupSurfacePresentModesKHR(
- VkDevice device,
- VkSurfaceKHR surface,
+ VkDevice,
+ VkSurfaceKHR,
VkDeviceGroupPresentModeFlagsKHR* pModes) {
- ALOGV("vkGetDeviceGroupSurfacePresentModesKHR: device=0x%" PRIx64
- "surface=0x%" PRIx64 "pModes=0x%" PRIx64,
- reinterpret_cast<uint64_t>(device),
- reinterpret_cast<uint64_t>(surface),
- reinterpret_cast<uint64_t>(pModes));
-
*pModes = VK_DEVICE_GROUP_PRESENT_MODE_LOCAL_BIT_KHR;
return VK_SUCCESS;
}
VKAPI_ATTR
-VkResult GetPhysicalDevicePresentRectanglesKHR(VkPhysicalDevice physicalDevice,
+VkResult GetPhysicalDevicePresentRectanglesKHR(VkPhysicalDevice,
VkSurfaceKHR surface,
uint32_t* pRectCount,
VkRect2D* pRects) {
- ALOGV("GetPhysicalDevicePresentRectanglesKHR: physicalDevice=0x%" PRIx64
- "surface=0x%" PRIx64 "pRectCount=%d pRects=0x%" PRIx64,
- reinterpret_cast<uint64_t>(physicalDevice),
- reinterpret_cast<uint64_t>(surface), *pRectCount,
- reinterpret_cast<uint64_t>(pRects));
-
if (!pRects) {
*pRectCount = 1;
} else {