Bug 14621: Change vkGet* functions to not return VkResult
diff --git a/icd/intel/gpu.c b/icd/intel/gpu.c
index 0525d9d..3d179d0 100644
--- a/icd/intel/gpu.c
+++ b/icd/intel/gpu.c
@@ -443,17 +443,16 @@
return type;
}
-ICD_EXPORT VkResult VKAPI vkGetPhysicalDeviceProperties(
+ICD_EXPORT void VKAPI vkGetPhysicalDeviceProperties(
VkPhysicalDevice gpu_,
VkPhysicalDeviceProperties* pProperties)
{
struct intel_gpu *gpu = intel_gpu(gpu_);
intel_gpu_get_props(gpu, pProperties);
- return VK_SUCCESS;
}
-ICD_EXPORT VkResult VKAPI vkGetPhysicalDeviceQueueFamilyProperties(
+ICD_EXPORT void VKAPI vkGetPhysicalDeviceQueueFamilyProperties(
VkPhysicalDevice gpu_,
uint32_t* pCount,
VkQueueFamilyProperties* pProperties)
@@ -463,36 +462,30 @@
if (pProperties == NULL) {
*pCount = INTEL_GPU_ENGINE_COUNT;
- return VK_SUCCESS;
+ return;
}
for (engine = 0; engine < *pCount; engine++) {
intel_gpu_get_queue_props(gpu, engine, pProperties);
pProperties++;
}
- return VK_SUCCESS;
}
-ICD_EXPORT VkResult VKAPI vkGetPhysicalDeviceMemoryProperties(
+ICD_EXPORT void VKAPI vkGetPhysicalDeviceMemoryProperties(
VkPhysicalDevice gpu_,
VkPhysicalDeviceMemoryProperties* pProperties)
{
struct intel_gpu *gpu = intel_gpu(gpu_);
intel_gpu_get_memory_props(gpu, pProperties);
- return VK_SUCCESS;
}
-ICD_EXPORT VkResult VKAPI vkGetPhysicalDeviceFeatures(
+ICD_EXPORT void VKAPI vkGetPhysicalDeviceFeatures(
VkPhysicalDevice physicalDevice,
VkPhysicalDeviceFeatures* pFeatures)
{
- VkResult ret = VK_SUCCESS;
-
/* TODO: fill out features */
memset(pFeatures, 0, sizeof(*pFeatures));
-
- return ret;
}
void intel_gpu_get_sparse_properties(VkPhysicalDeviceSparseProperties *pProps)
@@ -533,7 +526,7 @@
return VK_SUCCESS;
}
-ICD_EXPORT VkResult VKAPI vkGetPhysicalDeviceSparseImageFormatProperties(
+ICD_EXPORT void VKAPI vkGetPhysicalDeviceSparseImageFormatProperties(
VkPhysicalDevice physicalDevice,
VkFormat format,
VkImageType type,
@@ -544,6 +537,5 @@
VkSparseImageFormatProperties* pProperties)
{
*pNumProperties = 0;
- return VK_SUCCESS;
}