commit 2094dc769204cd5ad492e5a9b34781dd6ad7efe0
author Tony Barbour <tony@LunarG.com> Thu Jul 09 15:26:32 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Jul 17 10:05:19 2015 -0600
tree b30eb0bc9f40ac701d690b98d48639adaad5a6dd
parent b857d3163df90e77c03df4a8b91968f28d2e4b2e

intel: Add memory allocs for event, pipeline and query

icd/intel/pipeline.c

diff --git a/icd/intel/pipeline.c b/icd/intel/pipeline.c
index f9835d9..c7d6116 100644
--- a/icd/intel/pipeline.c
+++ b/icd/intel/pipeline.c
@@ -32,6 +32,7 @@
 #include "format.h"
 #include "shader.h"
 #include "pipeline.h"
+#include "mem.h"
 
 static int translate_blend_func(VkBlendOp func)
 {
@@ -460,18 +461,6 @@
     intel_base_destroy(&pipeline->obj.base);
 }
 
-static VkResult pipeline_get_memory_requirements(struct intel_base *base,
-                                    VkMemoryRequirements* pRequirements)
-{
-    struct intel_pipeline *pipeline = intel_pipeline_from_base(base);
-
-    pRequirements->size           = pipeline->scratch_size;
-    pRequirements->alignment      = 1024;
-    pRequirements->memoryTypeBits = (1 << INTEL_MEMORY_TYPE_COUNT) - 1;
-
-    return VK_SUCCESS;
-}
-
 static VkResult pipeline_validate(struct intel_pipeline *pipeline)
 {
     /*
@@ -1303,7 +1292,6 @@
     pipeline->dev = dev;
     pipeline->pipeline_layout = intel_pipeline_layout(info.graphics.layout);
 
-    pipeline->obj.base.get_memory_requirements = pipeline_get_memory_requirements;
     pipeline->obj.destroy = pipeline_destroy;
 
     ret = pipeline_build_all(pipeline, &info);
@@ -1314,6 +1302,13 @@
         return ret;
     }
 
+    VkMemoryAllocInfo mem_reqs;
+    mem_reqs.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
+    mem_reqs.allocationSize = pipeline->scratch_size;
+    mem_reqs.pNext = NULL;
+    mem_reqs.memoryTypeIndex = 0;
+    intel_mem_alloc(dev, &mem_reqs, &pipeline->obj.mem);
+
     *pipeline_ret = pipeline;
     return VK_SUCCESS;
 }
@@ -1405,6 +1400,7 @@
  {
     struct intel_obj *obj = intel_obj(pipeline.handle);
 
+    intel_mem_free(obj->mem);
     obj->destroy(obj);
     return VK_SUCCESS;
  }