From 531275e6485c13e6b7846430a0716b44f9e852db Mon Sep 17 00:00:00 2001
From: Dzmitry Malyshau <kvarkus@gmail.com>
Date: Fri, 6 Apr 2018 10:42:38 -0400
Subject: [PATCH] First CTS results on OSX

---
 Makefile                        | 3 +++
 README.md                       | 1 +
 libportability-gfx/Cargo.toml   | 8 ++++----
 libportability-gfx/src/impls.rs | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 8642826..0301fac 100644
--- a/Makefile
+++ b/Makefile
@@ -68,6 +68,9 @@ cts: $(TARGET) $(TEST_LIST)
 	mv TestResults.qpa conformance/last.qpa
 	firefox conformance/last.xml
 
+cts-debug: $(TARGET) $(TEST_LIST)
+	LD_LIBRARY_PATH=$(FULL_LIBRARY_PATH) rust-lldb $(CTS_DIR)/build/external/vulkancts/modules/vulkan/deqp-vk -- --deqp-caselist-file=$(TEST_LIST)
+
 clean:
 	rm -f $(OBJECTS) $(TARGET) $(BINDING)
 	cargo clean
diff --git a/README.md b/README.md
index 9e9c022..78e2192 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@ This is a prototype library implementing [Vulkan Portability Initiative](https:/
 | -------------- | -- | -- | -- | - | - | - | - | - | - | - |
 | *Vulkan* | 3742 | 1393  | 101  | 0 | 0 | 2248 | 0 | 0 | 0 | 0 |
 | *DX12* | 3563 | 1243 | 73  | 0 | 0 | 2247 | 0 | 0 | 0 | 0 |
+| *Metal* | 6 | 6 | 0  | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
 
 Currently stopping with:
 > Unable to create Vulkan instance: VkError(ErrorIncompatibleDriver)
diff --git a/libportability-gfx/Cargo.toml b/libportability-gfx/Cargo.toml
index bb03eb9..2eb020d 100644
--- a/libportability-gfx/Cargo.toml
+++ b/libportability-gfx/Cargo.toml
@@ -25,19 +25,19 @@ optional = true
 
 [dependencies.gfx-hal]
 git = "https://github.com/gfx-rs/gfx"
-rev = "4538593758d826cdcfc9f2de95dfc03c68624d05"
+rev = "aaf5d5d675397db783041553e290e3331516e13b"
 
 [target.'cfg(not(target_os = "macos"))'.dependencies.gfx-backend-vulkan]
 git = "https://github.com/gfx-rs/gfx"
-rev = "4538593758d826cdcfc9f2de95dfc03c68624d05"
+rev = "aaf5d5d675397db783041553e290e3331516e13b"
 optional = true
 
 [target.'cfg(windows)'.dependencies.gfx-backend-dx12]
 git = "https://github.com/gfx-rs/gfx"
-rev = "4538593758d826cdcfc9f2de95dfc03c68624d05"
+rev = "aaf5d5d675397db783041553e290e3331516e13b"
 optional = true
 
 [target.'cfg(target_os = "macos")'.dependencies.gfx-backend-metal]
 git = "https://github.com/gfx-rs/gfx"
-rev = "4538593758d826cdcfc9f2de95dfc03c68624d05"
+rev = "aaf5d5d675397db783041553e290e3331516e13b"
 optional = true
diff --git a/libportability-gfx/src/impls.rs b/libportability-gfx/src/impls.rs
index f82c95b..1ef1cd6 100644
--- a/libportability-gfx/src/impls.rs
+++ b/libportability-gfx/src/impls.rs
@@ -3077,6 +3077,7 @@ pub extern "C" fn gfxCreateSwapchainKHR(
         color_format: conv::map_format(info.imageFormat).unwrap(),
         depth_stencil_format: None,
         image_count: info.minImageCount,
+        image_usage: conv::map_image_usage(info.imageUsage),
     };
     let (swapchain, backbuffers) = gpu.device
         .create_swapchain(&mut info.surface.clone(), config);