commit 9ae59c104ea6d4e45e5b3abfb896cf662dac88c9
author Chia-I Wu <olvaffe@gmail.com> Thu Aug 07 10:08:49 2014 +0800
committer Chia-I Wu <olvaffe@gmail.com> Thu Aug 07 10:11:35 2014 +0800
tree 4bbef700daa88b0a98fe8e892ff2ba2f7fff3581
parent e09b5365e5030ae5d91f3822ead813b9e5062800

intel: let intel_queue_create return an error code

To be consistent with other object creation functions, now that intel_queue
has been splitted to its own files.

icd/intel/dev.c

diff --git a/icd/intel/dev.c b/icd/intel/dev.c
index 84956e8..e068a5c 100644
--- a/icd/intel/dev.c
+++ b/icd/intel/dev.c
@@ -75,16 +75,13 @@
         const XGL_DEVICE_QUEUE_CREATE_INFO *q = &queues[i];
         XGL_RESULT ret = XGL_SUCCESS;
 
-        if (q->queueNodeIndex >= INTEL_GPU_ENGINE_COUNT ||
-            q->queueCount > 1 ||
-            dev->queues[q->queueNodeIndex]) {
-            ret = XGL_ERROR_INVALID_POINTER;
+        if (q->queueNodeIndex < INTEL_GPU_ENGINE_COUNT &&
+            q->queueCount == 1 && !dev->queues[q->queueNodeIndex]) {
+            ret = intel_queue_create(dev, q->queueNodeIndex,
+                    &dev->queues[q->queueNodeIndex]);
         }
         else {
-            dev->queues[q->queueNodeIndex] =
-                intel_queue_create(dev, q->queueNodeIndex);
-            if (!dev->queues[q->queueNodeIndex])
-                ret = XGL_ERROR_OUT_OF_MEMORY;
+            ret = XGL_ERROR_INVALID_POINTER;
         }
 
         if (ret != XGL_SUCCESS) {