commit c217f80679c39425837ac8c6f1d3650f1fdb90b6
author Chia-I Wu <olvaffe@gmail.com> Tue Aug 05 10:17:50 2014 +0800
committer Chia-I Wu <olvaffe@gmail.com> Wed Aug 06 11:30:11 2014 +0800
tree 957375c5327fa9ef7ed683804054eaf523e43620
parent 3eb44894c3c15c73ba1efb8faee1b9a9186a9186

icd: assign each allocator a unique id

It can be used to determine if an object is allocated by the current
allocator.

icd/common/icd.c

diff --git a/icd/common/icd.c b/icd/common/icd.c
index 7dd8103..0d279f8 100644
--- a/icd/common/icd.c
+++ b/icd/common/icd.c
@@ -50,7 +50,7 @@
     bool break_on_warning;
 
     XGL_ALLOC_CALLBACKS alloc_callbacks;
-    bool alloc_callbacks_initialized;
+    int init_count;
 };
 
 static XGL_VOID *default_alloc(XGL_VOID *user_data,
@@ -217,9 +217,14 @@
     return res;
 }
 
-XGL_RESULT icd_set_alloc_callbacks(const XGL_ALLOC_CALLBACKS *alloc_cb)
+XGL_RESULT icd_set_allocator(const XGL_ALLOC_CALLBACKS *alloc_cb)
 {
-    if (icd.alloc_callbacks_initialized) {
+    if (icd.init_count) {
+        /*
+         * The spec says: Changing the callbacks on subsequent calls to
+         * xglInitAndEnumerateGpus() causes it to fail with
+         * XGL_ERROR_INVALID_POINTER error.
+         */
         return (memcmp(&icd.alloc_callbacks, alloc_cb, sizeof(*alloc_cb))) ?
             XGL_ERROR_INVALID_POINTER : XGL_SUCCESS;
     }
@@ -227,11 +232,16 @@
     if (alloc_cb)
         icd.alloc_callbacks = *alloc_cb;
 
-    icd.alloc_callbacks_initialized = true;
+    icd.init_count++;
 
     return XGL_SUCCESS;
 }
 
+int icd_get_allocator_id(void)
+{
+    return icd.init_count;
+}
+
 void *icd_alloc(XGL_SIZE size, XGL_SIZE alignment,
                 XGL_SYSTEM_ALLOC_TYPE type)
 {

icd/common/icd.h

diff --git a/icd/common/icd.h b/icd/common/icd.h
index 323d956..00916e5 100644
--- a/icd/common/icd.h
+++ b/icd/common/icd.h
@@ -63,7 +63,8 @@
 
 void icd_clear_msg_callbacks(void);
 
-XGL_RESULT icd_set_alloc_callbacks(const XGL_ALLOC_CALLBACKS *alloc_cb);
+XGL_RESULT icd_set_allocator(const XGL_ALLOC_CALLBACKS *alloc_cb);
+int icd_get_allocator_id(void);
 
 void *icd_alloc(XGL_SIZE size, XGL_SIZE alignment,
                 XGL_SYSTEM_ALLOC_TYPE type);

icd/intel/init_driver.c

diff --git a/icd/intel/init_driver.c b/icd/intel/init_driver.c
index 0a56edc..9096012 100644
--- a/icd/intel/init_driver.c
+++ b/icd/intel/init_driver.c
@@ -73,7 +73,7 @@
     XGL_RESULT ret;
     XGL_UINT count = 0;
 
-    ret = icd_set_alloc_callbacks(pAllocCb);
+    ret = icd_set_allocator(pAllocCb);
     if (ret != XGL_SUCCESS)
         return ret;