commit 0629efa8c641a1872e9d89d3b98e01fdd2616cce
author Courtney Goeltzenleuchter <courtney@LunarG.com> Mon Apr 13 14:59:19 2015 -0600
committer Chia-I Wu <olv@lunarg.com> Thu Apr 16 17:33:25 2015 +0800
tree 7f4ce4624894c11c90b5b538ef5f2924f6c00211
parent e97dc8159c35dc77a7e931d25e775106f27312e4

intel: use per-instance logging

icd/intel/gpu.c

diff --git a/icd/intel/gpu.c b/icd/intel/gpu.c
index 645de1c..f2fcdca 100644
--- a/icd/intel/gpu.c
+++ b/icd/intel/gpu.c
@@ -63,7 +63,7 @@
     if (gpu->render_fd_internal < 0 && gpu->render_node) {
         gpu->render_fd_internal = open(gpu->render_node, O_RDWR);
         if (gpu->render_fd_internal < 0) {
-            icd_log(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, NULL, 0,
+            intel_log(gpu, XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, NULL, 0,
                     0, "failed to open %s", gpu->render_node);
         }
     }
@@ -154,8 +154,8 @@
     struct intel_gpu *gpu;
 
     if (gen < 0) {
-        icd_log(XGL_DBG_MSG_WARNING, XGL_VALIDATION_LEVEL_0, XGL_NULL_HANDLE,
-                0, 0, "unsupported device id 0x%04x", devid);
+        intel_log(instance, XGL_DBG_MSG_WARNING, XGL_VALIDATION_LEVEL_0,
+                XGL_NULL_HANDLE, 0, 0, "unsupported device id 0x%04x", devid);
         return XGL_ERROR_INITIALIZATION_FAILED;
     }
 
@@ -325,7 +325,7 @@
         break;
     }
 
-    icd_log(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, XGL_NULL_HANDLE,
+    intel_log(gpu, XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, XGL_NULL_HANDLE,
             0, 0, "unknown Gen or shader stage");
 
     switch (stage) {
@@ -355,8 +355,8 @@
 
     gpu->winsys = intel_winsys_create_for_fd(gpu->handle.icd, fd);
     if (!gpu->winsys) {
-        icd_log(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, XGL_NULL_HANDLE,
-                0, 0, "failed to create GPU winsys");
+        intel_log(gpu, XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0,
+                XGL_NULL_HANDLE, 0, 0, "failed to create GPU winsys");
         gpu_close_render_node(gpu);
         return XGL_ERROR_UNKNOWN;
     }