commit 9cc421eb545767e22fd723dc573a7a3225261b1c
author Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Apr 08 15:36:08 2015 -0600
committer Chia-I Wu <olv@lunarg.com> Thu Apr 16 17:48:17 2015 +0800
tree 2f6b6e233f1daf56a2123264a2347cbcc43a0f1b
parent 89e99e6dd74c1f407c2f2cb1aac2ad4ca3d45ff2

Stage 1 of rename

TODO: re-enable glave build, advance API for glave

v2: get rid of outdated code in tri introduced by rebase
    rename wsi_null.c (olv)

icd/common/icd-enumerate-drm.c

diff --git a/icd/common/icd-enumerate-drm.c b/icd/common/icd-enumerate-drm.c
index d09f3b8..65e3065 100644
--- a/icd/common/icd-enumerate-drm.c
+++ b/icd/common/icd-enumerate-drm.c
@@ -1,5 +1,5 @@
 /*
- * XGL
+ * Vulkan
  *
  * Copyright (C) 2014 LunarG, Inc.
  *
@@ -125,7 +125,7 @@
         return devices;
     } else {
         dev = icd_instance_alloc(instance, sizeof(*dev), 0,
-                XGL_SYSTEM_ALLOC_INTERNAL_TEMP);
+                VK_SYSTEM_ALLOC_INTERNAL_TEMP);
         if (!dev)
             return devices;
 
@@ -151,16 +151,16 @@
 
     udev = udev_new();
     if (udev == NULL) {
-        icd_instance_log(instance, XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0,
-                XGL_NULL_HANDLE, 0, 0, "failed to initialize udev context");
+        icd_instance_log(instance, VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0,
+                VK_NULL_HANDLE, 0, 0, "failed to initialize udev context");
 
         return NULL;
     }
 
     e = udev_enumerate_new(udev);
     if (e == NULL) {
-        icd_instance_log(instance, XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0,
-                XGL_NULL_HANDLE, 0, 0,
+        icd_instance_log(instance, VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0,
+                VK_NULL_HANDLE, 0, 0,
                 "failed to initialize udev enumerate context");
         udev_unref(udev);