Bug 14621: Change vkGet* functions to not return VkResult
diff --git a/icd/intel/cmd_pipeline.c b/icd/intel/cmd_pipeline.c
index 206a03e..719d277 100644
--- a/icd/intel/cmd_pipeline.c
+++ b/icd/intel/cmd_pipeline.c
@@ -3801,15 +3801,13 @@
/* TODO: Implement */
}
-VkResult VKAPI vkGetRenderAreaGranularity(
+void VKAPI vkGetRenderAreaGranularity(
VkDevice device,
VkRenderPass renderPass,
VkExtent2D* pGranularity)
{
pGranularity->height = 1;
pGranularity->width = 1;
-
- return VK_SUCCESS;
}
ICD_EXPORT void VKAPI vkCmdBeginRenderPass(
diff --git a/icd/intel/dev.c b/icd/intel/dev.c
index 8da7e28..3fe20d5 100644
--- a/icd/intel/dev.c
+++ b/icd/intel/dev.c
@@ -224,7 +224,7 @@
intel_dev_destroy(dev);
}
-ICD_EXPORT VkResult VKAPI vkGetDeviceQueue(
+ICD_EXPORT void VKAPI vkGetDeviceQueue(
VkDevice device,
uint32_t queueFamilyIndex,
uint32_t queueIndex,
@@ -233,7 +233,6 @@
struct intel_dev *dev = intel_dev(device);
*pQueue = (VkQueue) dev->queues[queueFamilyIndex];
- return VK_SUCCESS;
}
ICD_EXPORT VkResult VKAPI vkDeviceWaitIdle(
diff --git a/icd/intel/format.c b/icd/intel/format.c
index 1a3caa4..98bb9e6 100644
--- a/icd/intel/format.c
+++ b/icd/intel/format.c
@@ -680,17 +680,14 @@
}
}
-ICD_EXPORT VkResult VKAPI vkGetPhysicalDeviceFormatProperties(
+ICD_EXPORT void VKAPI vkGetPhysicalDeviceFormatProperties(
VkPhysicalDevice physicalDevice,
VkFormat format,
VkFormatProperties* pFormatInfo)
{
const struct intel_gpu *gpu = intel_gpu(physicalDevice);
- VkResult ret = VK_SUCCESS;
intel_format_get_props(gpu, format, pFormatInfo);
-
- return ret;
}
// From the Ivy Bridge PRM, volume 1 part 1, page 105:
@@ -700,7 +697,7 @@
// maximum is 2 GB for all products and all surface types."
static const size_t intel_max_resource_size = 1u << 31;
-ICD_EXPORT VkResult VKAPI vkGetPhysicalDeviceImageFormatProperties(
+ICD_EXPORT void VKAPI vkGetPhysicalDeviceImageFormatProperties(
VkPhysicalDevice physicalDevice,
VkFormat format,
VkImageType type,
@@ -719,5 +716,4 @@
pImageFormatProperties->maxExtent.depth = 8192;
pImageFormatProperties->maxArraySize = 2048;
pImageFormatProperties->maxResourceSize = intel_max_resource_size;
- return VK_SUCCESS;
}
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;
}
diff --git a/icd/intel/img.c b/icd/intel/img.c
index 675d499..c9bca4e 100644
--- a/icd/intel/img.c
+++ b/icd/intel/img.c
@@ -160,7 +160,7 @@
obj->destroy(obj);
}
-ICD_EXPORT VkResult VKAPI vkGetImageSubresourceLayout(
+ICD_EXPORT void VKAPI vkGetImageSubresourceLayout(
VkDevice device,
VkImage image,
const VkImageSubresource* pSubresource,
@@ -179,15 +179,13 @@
pLayout->rowPitch = img->layout.bo_stride;
pLayout->depthPitch = intel_layout_get_slice_stride(&img->layout,
pSubresource->mipLevel);
- return VK_SUCCESS;
}
-VkResult VKAPI vkGetImageSparseMemoryRequirements(
+void VKAPI vkGetImageSparseMemoryRequirements(
VkDevice device,
VkImage image,
uint32_t* pNumRequirements,
VkSparseImageMemoryRequirements* pSparseMemoryRequirements)
{
*pNumRequirements = 0;
- return VK_SUCCESS;
}
diff --git a/icd/intel/mem.c b/icd/intel/mem.c
index 3739978..21936a5 100644
--- a/icd/intel/mem.c
+++ b/icd/intel/mem.c
@@ -122,10 +122,9 @@
return VK_SUCCESS;
}
-ICD_EXPORT VkResult VKAPI vkGetDeviceMemoryCommitment(
+ICD_EXPORT void VKAPI vkGetDeviceMemoryCommitment(
VkDevice device,
VkDeviceMemory memory,
VkDeviceSize* pCommittedMemoryInBytes)
{
- return VK_SUCCESS;
}
diff --git a/icd/intel/obj.c b/icd/intel/obj.c
index 9432e72..ba4f254 100644
--- a/icd/intel/obj.c
+++ b/icd/intel/obj.c
@@ -299,24 +299,24 @@
intel_free(base, base);
}
-ICD_EXPORT VkResult VKAPI vkGetBufferMemoryRequirements(
+ICD_EXPORT void VKAPI vkGetBufferMemoryRequirements(
VkDevice device,
VkBuffer buffer,
VkMemoryRequirements* pRequirements)
{
struct intel_base *base = intel_base(buffer.handle);
- return base->get_memory_requirements(base, pRequirements);
+ base->get_memory_requirements(base, pRequirements);
}
-ICD_EXPORT VkResult VKAPI vkGetImageMemoryRequirements(
+ICD_EXPORT void VKAPI vkGetImageMemoryRequirements(
VkDevice device,
VkImage image,
VkMemoryRequirements* pRequirements)
{
struct intel_base *base = intel_base(image.handle);
- return base->get_memory_requirements(base, pRequirements);
+ base->get_memory_requirements(base, pRequirements);
}
ICD_EXPORT VkResult VKAPI vkBindBufferMemory(