commit b1076d7ea8a294f1ba8629c23423c03f7babb8ac
author Chia-I Wu <olvaffe@gmail.com> Mon Aug 18 16:10:20 2014 +0800
committer Chia-I Wu <olvaffe@gmail.com> Mon Aug 18 16:10:41 2014 +0800
tree 17446d973201719c82ecd0f5d9f428fb78bccb11
parent b8d04c8bd6c804d2ebfea0334f41e642b16452a3

intel: switch on dbg type instead of struct type

Struct types are not always available.

icd/intel/obj.c

diff --git a/icd/intel/obj.c b/icd/intel/obj.c
index 7a182c8..665b43f 100644
--- a/icd/intel/obj.c
+++ b/icd/intel/obj.c
@@ -77,48 +77,48 @@
     if (!create_info)
         return true;
 
-    switch (info.header->struct_type) {
-    case XGL_STRUCTURE_TYPE_DEVICE_CREATE_INFO:
-        assert(dbg->type == XGL_DBG_OBJECT_DEVICE);
+    switch (dbg->type) {
+    case XGL_DBG_OBJECT_DEVICE:
+        assert(info.header->struct_type == XGL_STRUCTURE_TYPE_DEVICE_CREATE_INFO);
         break;
-    case XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO:
-        assert(dbg->type == XGL_DBG_OBJECT_GPU_MEMORY);
+    case XGL_DBG_OBJECT_GPU_MEMORY:
+        assert(info.header->struct_type == XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO);
         shallow_copy = sizeof(XGL_MEMORY_ALLOC_INFO);
         break;
-    case XGL_STRUCTURE_TYPE_EVENT_CREATE_INFO:
-        assert(dbg->type == XGL_DBG_OBJECT_EVENT);
+    case XGL_DBG_OBJECT_EVENT:
+        assert(info.header->struct_type == XGL_STRUCTURE_TYPE_EVENT_CREATE_INFO);
         shallow_copy = sizeof(XGL_EVENT_CREATE_INFO);
         break;
-    case XGL_STRUCTURE_TYPE_FENCE_CREATE_INFO:
-        assert(dbg->type == XGL_DBG_OBJECT_FENCE);
+    case XGL_DBG_OBJECT_FENCE:
+        assert(info.header->struct_type == XGL_STRUCTURE_TYPE_FENCE_CREATE_INFO);
         shallow_copy = sizeof(XGL_FENCE_CREATE_INFO);
         break;
-    case XGL_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO:
-        assert(dbg->type == XGL_DBG_OBJECT_QUERY_POOL);
+    case XGL_DBG_OBJECT_QUERY_POOL:
+        assert(info.header->struct_type == XGL_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO);
         shallow_copy = sizeof(XGL_QUERY_POOL_CREATE_INFO);
         break;
-    case XGL_STRUCTURE_TYPE_IMAGE_CREATE_INFO:
-        assert(dbg->type == XGL_DBG_OBJECT_IMAGE);
+    case XGL_DBG_OBJECT_IMAGE:
+        assert(info.header->struct_type == XGL_STRUCTURE_TYPE_IMAGE_CREATE_INFO);
         shallow_copy = sizeof(XGL_IMAGE_CREATE_INFO);
         break;
-    case XGL_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO:
-        assert(dbg->type == XGL_DBG_OBJECT_IMAGE_VIEW);
+    case XGL_DBG_OBJECT_IMAGE_VIEW:
+        assert(info.header->struct_type == XGL_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO);
         shallow_copy = sizeof(XGL_IMAGE_VIEW_CREATE_INFO);
         break;
-    case XGL_STRUCTURE_TYPE_COLOR_ATTACHMENT_VIEW_CREATE_INFO:
-        assert(dbg->type == XGL_DBG_OBJECT_COLOR_TARGET_VIEW);
+    case XGL_DBG_OBJECT_COLOR_TARGET_VIEW:
+        assert(info.header->struct_type == XGL_STRUCTURE_TYPE_COLOR_ATTACHMENT_VIEW_CREATE_INFO);
         shallow_copy = sizeof(XGL_COLOR_ATTACHMENT_VIEW_CREATE_INFO);
         break;
-    case XGL_STRUCTURE_TYPE_DEPTH_STENCIL_VIEW_CREATE_INFO:
-        assert(dbg->type == XGL_DBG_OBJECT_DEPTH_STENCIL_VIEW);
+    case XGL_DBG_OBJECT_DEPTH_STENCIL_VIEW:
+        assert(info.header->struct_type == XGL_STRUCTURE_TYPE_DEPTH_STENCIL_VIEW_CREATE_INFO);
         shallow_copy = sizeof(XGL_DEPTH_STENCIL_VIEW_CREATE_INFO);
         break;
-    case XGL_STRUCTURE_TYPE_SAMPLER_CREATE_INFO:
-        assert(dbg->type == XGL_DBG_OBJECT_SAMPLER);
+    case XGL_DBG_OBJECT_SAMPLER:
+        assert(info.header->struct_type == XGL_STRUCTURE_TYPE_SAMPLER_CREATE_INFO);
         shallow_copy = sizeof(XGL_SAMPLER_CREATE_INFO);
         break;
-    case XGL_STRUCTURE_TYPE_DESCRIPTOR_SET_CREATE_INFO:
-        assert(dbg->type == XGL_DBG_OBJECT_DESCRIPTOR_SET);
+    case XGL_DBG_OBJECT_DESCRIPTOR_SET:
+        assert(info.header->struct_type == XGL_STRUCTURE_TYPE_DESCRIPTOR_SET_CREATE_INFO);
         shallow_copy = sizeof(XGL_DESCRIPTOR_SET_CREATE_INFO);
         break;
     default: