From a89b41ac4072fbc4f84047b574c0781b46f4c14d Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvark@mozilla.com>
Date: Wed, 28 Feb 2018 12:49:44 -0500
Subject: [PATCH] Basic env_logger hookup

---
 libportability-gfx/Cargo.toml   | 5 +++++
 libportability-gfx/src/impls.rs | 6 ++++++
 libportability-gfx/src/lib.rs   | 2 ++
 3 files changed, 13 insertions(+)

diff --git a/libportability-gfx/Cargo.toml b/libportability-gfx/Cargo.toml
index 35aaa1c..ccc99c6 100644
--- a/libportability-gfx/Cargo.toml
+++ b/libportability-gfx/Cargo.toml
@@ -8,6 +8,7 @@ name = "portability_gfx"
 
 [features]
 default = []
+#default = ["env_logger"] # uncomment for debugging
 dx12 = ["gfx-backend-dx12"]
 vulkan = ["gfx-backend-vulkan"]
 
@@ -15,6 +16,10 @@ vulkan = ["gfx-backend-vulkan"]
 lazy_static = "1.0"
 log = "0.4"
 
+[dependencies.env_logger]
+version = "0.5"
+optional = true
+
 [dependencies.gfx-hal]
 git = "https://github.com/gfx-rs/gfx"
 rev = "070e0cee47ae6f0c395a3402fd6f889c1315ef3e"
diff --git a/libportability-gfx/src/impls.rs b/libportability-gfx/src/impls.rs
index 3b2a525..2332075 100644
--- a/libportability-gfx/src/impls.rs
+++ b/libportability-gfx/src/impls.rs
@@ -48,6 +48,12 @@ pub extern "C" fn gfxCreateInstance(
     _pAllocator: *const VkAllocationCallbacks,
     pInstance: *mut VkInstance,
 ) -> VkResult {
+    //Note: is this the best place to enable logging?
+    #[cfg(feature = "env_logger")]
+    {
+        use env_logger;
+        env_logger::init();
+    }
     let instance = back::Instance::create("portability", 1);
     unsafe { *pInstance = Handle::new(instance) };
     VkResult::VK_SUCCESS
diff --git a/libportability-gfx/src/lib.rs b/libportability-gfx/src/lib.rs
index a68e048..ae0bfe1 100644
--- a/libportability-gfx/src/lib.rs
+++ b/libportability-gfx/src/lib.rs
@@ -13,6 +13,8 @@ extern crate gfx_backend_vulkan as back;
 extern crate lazy_static;
 #[macro_use]
 extern crate log;
+#[cfg(feature = "env_logger")]
+extern crate env_logger;
 
 mod conv;
 mod handle;