commit f9c81ef6b349eec46dfb041c091b8a8e0c0c34e3
author Chia-I Wu <olv@lunarg.com> Sun Feb 22 13:49:15 2015 +0800
committer Chia-I Wu <olv@lunarg.com> Thu Mar 05 14:20:31 2015 -0700
tree 9ad40ce96ba60a459dd794026cc7a9d5194e754d
parent 032a2e3fa819b04b644c7980afbfd37ce100abba

intel: use intel_alloc()/intel_free() when possible

There are still a few places that intel_handle is not readily available and we
are stuck with icd_alloc()/icd_free().  They will be fixed later.

icd/intel/cmd.c

diff --git a/icd/intel/cmd.c b/icd/intel/cmd.c
index 56e5b04..afdd869 100644
--- a/icd/intel/cmd.c
+++ b/icd/intel/cmd.c
@@ -58,7 +58,7 @@
     writer->sba_offset = 0;
 
     if (writer->items) {
-        icd_free(writer->items);
+        intel_free(cmd, writer->items);
         writer->items = NULL;
         writer->item_alloc = 0;
         writer->item_used = 0;
@@ -194,7 +194,7 @@
             writer->item_alloc << 1 : 256;
         struct intel_cmd_item *items;
 
-        items = icd_alloc(sizeof(writer->items[0]) * new_alloc,
+        items = intel_alloc(cmd, sizeof(writer->items[0]) * new_alloc,
                 0, XGL_SYSTEM_ALLOC_DEBUG);
         if (!items) {
             writer->item_used = 0;
@@ -205,7 +205,7 @@
         memcpy(items, writer->items,
                 sizeof(writer->items[0]) * writer->item_alloc);
 
-        icd_free(writer->items);
+        intel_free(cmd, writer->items);
 
         writer->items = items;
         writer->item_alloc = new_alloc;
@@ -235,12 +235,12 @@
         cmd_writer_reset(cmd, i);
 
     if (cmd->bind.shader_cache.entries)
-        icd_free(cmd->bind.shader_cache.entries);
+        intel_free(cmd, cmd->bind.shader_cache.entries);
 
     if (cmd->bind.dset.graphics_dynamic_offsets)
-        icd_free(cmd->bind.dset.graphics_dynamic_offsets);
+        intel_free(cmd, cmd->bind.dset.graphics_dynamic_offsets);
     if (cmd->bind.dset.compute_dynamic_offsets)
-        icd_free(cmd->bind.dset.compute_dynamic_offsets);
+        intel_free(cmd, cmd->bind.dset.compute_dynamic_offsets);
 
     memset(&cmd->bind, 0, sizeof(cmd->bind));
 
@@ -294,7 +294,7 @@
      * and end offsets, for each referenced memories.
      */
     cmd->reloc_count = dev->gpu->batch_buffer_reloc_count;
-    cmd->relocs = icd_alloc(sizeof(cmd->relocs[0]) * cmd->reloc_count,
+    cmd->relocs = intel_alloc(cmd, sizeof(cmd->relocs[0]) * cmd->reloc_count,
             4096, XGL_SYSTEM_ALLOC_INTERNAL);
     if (!cmd->relocs) {
         intel_cmd_destroy(cmd);
@@ -310,7 +310,7 @@
 {
     cmd_reset(cmd);
 
-    icd_free(cmd->relocs);
+    intel_free(cmd, cmd->relocs);
     intel_base_destroy(&cmd->obj.base);
 }