commit 2a25307e190c6babed79cb6cc08f7eac00e86b82
author Mark Lobodzinski <mark@lunarg.com> Thu Oct 08 10:44:07 2015 -0600
committer Mark Lobodzinski <mark@lunarg.com> Mon Oct 12 14:19:02 2015 -0600
tree 662208e30494e7e04ede2fc3096216d00a7a5cea
parent 983984fd6981293cc009bc64059fee51c1d02baf

layers: Bug #14850, enforce validation for semaphore states

Added creation of driver-side semaphore objects.

icd/intel/queue.c

diff --git a/icd/intel/queue.c b/icd/intel/queue.c
index a11a00a..4e58d44 100644
--- a/icd/intel/queue.c
+++ b/icd/intel/queue.c
@@ -32,6 +32,36 @@
 #include "fence.h"
 #include "queue.h"
 
+static void semaphore_destroy(struct intel_obj *obj)
+{
+    struct intel_semaphore *semaphore = intel_semaphore_from_obj(obj);
+
+    intel_semaphore_destroy(semaphore);
+}
+
+VkResult intel_semaphore_create(struct intel_dev *dev,
+                                const VkSemaphoreCreateInfo *info,
+                                struct intel_semaphore **semaphore_ret)
+{
+    struct intel_semaphore *semaphore;
+    semaphore = (struct intel_semaphore *) intel_base_create(&dev->base.handle,
+            sizeof(*semaphore), dev->base.dbg, VK_OBJECT_TYPE_SEMAPHORE, info, 0);
+
+    if (!semaphore)
+        return VK_ERROR_OUT_OF_HOST_MEMORY;
+
+    semaphore->references = 0;
+    *semaphore_ret = semaphore;
+    semaphore->obj.destroy = semaphore_destroy;
+
+    return VK_SUCCESS;
+}
+
+void intel_semaphore_destroy(struct intel_semaphore *semaphore)
+{
+    intel_base_destroy(&semaphore->obj.base);
+}
+
 static void queue_submit_hang(struct intel_queue *queue,
                               struct intel_cmd *cmd,
                               uint32_t active_lost,
@@ -381,13 +411,10 @@
 }
 
 ICD_EXPORT VkResult VKAPI vkCreateSemaphore(
-    VkDevice                                  device,
-    const VkSemaphoreCreateInfo*            pCreateInfo,
-    VkSemaphore*                              pSemaphore)
+    VkDevice                                device,
+    const VkSemaphoreCreateInfo            *pCreateInfo,
+    VkSemaphore                            *pSemaphore)
 {
-    // TODO: fully support semaphores (mean time, simply fake it):
-    pSemaphore->handle = 1;
-
     /*
      * We want to find an unused semaphore register and initialize it.  Signal
      * will increment the register.  Wait will atomically decrement it and
@@ -396,20 +423,28 @@
      *
      * XXX However, MI_SEMAPHORE_MBOX does not seem to have the flexibility.
      */
-    return VK_SUCCESS;
+
+    // TODO: fully support semaphores (mean time, simulate it):
+    struct intel_dev *dev = intel_dev(device);
+
+    return intel_semaphore_create(dev, pCreateInfo,
+           (struct intel_semaphore **) pSemaphore);
 }
 
 ICD_EXPORT void VKAPI vkDestroySemaphore(
     VkDevice                                    device,
     VkSemaphore                                 semaphore)
-
- {
- }
+{
+    struct intel_obj *obj = intel_obj(semaphore.handle);
+    obj->destroy(obj);
+}
 
 ICD_EXPORT VkResult VKAPI vkQueueSignalSemaphore(
     VkQueue                                   queue,
     VkSemaphore                               semaphore)
 {
+    struct intel_semaphore *pSemaphore = intel_semaphore(semaphore);
+    pSemaphore->references++;
     return VK_SUCCESS;
 }
 
@@ -417,7 +452,9 @@
     VkQueue                                   queue,
     VkSemaphore                               semaphore)
 {
+    struct intel_semaphore *pSemaphore = intel_semaphore(semaphore);
     vkQueueWaitIdle(queue);
+    pSemaphore->references--;
 
     return VK_SUCCESS;
 }