commit 426b90566abae5716741aade41184dc4dafe4aa4
author Tony Barbour <tony@LunarG.com> Wed Jun 24 16:06:58 2015 -0600
committer Tony Barbour <tony@LunarG.com> Thu Jun 25 15:17:05 2015 -0600
tree 33f49508ff8b02622d689337b283380a1cdabbc9
parent 01630b8a4ba8b3b6529cbf1a5e5d54df77333ee9

vulkan.h: V108 -- Static Types, Bug# 13919

icd/intel/event.c

diff --git a/icd/intel/event.c b/icd/intel/event.c
index a55c1ea..e444aeb 100644
--- a/icd/intel/event.c
+++ b/icd/intel/event.c
@@ -90,31 +90,15 @@
     intel_event_destroy(event);
 }
 
-static VkResult event_get_info(struct intel_base *base, int type,
-                                 size_t *size, void *data)
+static VkResult event_get_memory_requirements(struct intel_base *base,
+                                 VkMemoryRequirements *pRequirements)
 {
-    VkResult ret = VK_SUCCESS;
+    /* use dword aligned to 64-byte boundaries */
+    pRequirements->size = 4;
+    pRequirements->alignment = 64;
+    pRequirements->memPropsAllowed = INTEL_MEMORY_PROPERTY_ALL;
 
-    switch (type) {
-    case VK_OBJECT_INFO_TYPE_MEMORY_REQUIREMENTS:
-        {
-            VkMemoryRequirements *mem_req = data;
-
-            *size = sizeof(VkMemoryRequirements);
-            if (data == NULL)
-                return ret;
-            /* use dword aligned to 64-byte boundaries */
-            mem_req->size = 4;
-            mem_req->alignment = 64;
-            mem_req->memPropsAllowed = INTEL_MEMORY_PROPERTY_ALL;
-        }
-        break;
-    default:
-        ret = intel_base_get_info(base, type, size, data);
-        break;
-    }
-
-    return ret;
+    return VK_SUCCESS;
 }
 
 VkResult intel_event_create(struct intel_dev *dev,
@@ -128,7 +112,7 @@
     if (!event)
         return VK_ERROR_OUT_OF_HOST_MEMORY;
 
-    event->obj.base.get_info = event_get_info;
+    event->obj.base.get_memory_requirements = event_get_memory_requirements;
     event->obj.destroy = event_destroy;
 
     *event_ret = event;