commit 11e76ac8d0b8549992bc19d1c32640e33efbf873
author Tony Barbour <tony@LunarG.com> Mon Apr 20 16:28:46 2015 -0600
committer Tony Barbour <tony@LunarG.com> Tue Apr 21 09:56:51 2015 -0600
tree c1def2416277196e7dc93316c5afeb8958c2caca
parent ea95f5c3967480a57ceb03a98e8370225094ce42

vulkan.h: Fix up warnings and use VkObject appropriately

icd/nulldrv/nulldrv.c

diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index dabe668..8edacd5 100644
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -98,7 +98,7 @@
     memset(base, 0, obj_size);
 
     // Initialize pointer to loader's dispatch table with ICD_LOADER_MAGIC
-    set_loader_magic_value(base);
+    set_loader_magic_value((VkObject) base);
 
     if (dev == NULL) {
         /*
@@ -125,7 +125,7 @@
 	memset(gpu, 0, sizeof(*gpu));
 
     // Initialize pointer to loader's dispatch table with ICD_LOADER_MAGIC
-    set_loader_magic_value(gpu);
+    set_loader_magic_value((VkObject) gpu);
 
     *gpu_ret = gpu;
 
@@ -915,7 +915,7 @@
     }
     sc->dev = dev;
 
-    *pSwapChain = (VkSwapChainWSI *) sc;
+    *pSwapChain = (VkSwapChainWSI) sc;
 
     return VK_SUCCESS;
 }
@@ -1454,7 +1454,6 @@
     void*                                       pData)
 {
     NULLDRV_LOG_FUNC;
-    struct nulldrv_dev *dev = nulldrv_dev(device);
     VkFormatProperties *fmt = (VkFormatProperties *) pData;
     VkResult ret = VK_SUCCESS;
 
@@ -1481,7 +1480,6 @@
     void*                                       pData)
 {
     NULLDRV_LOG_FUNC;
-    struct nulldrv_gpu *gpu = nulldrv_gpu(gpu_);
     VkResult ret = VK_SUCCESS;
 
     switch (infoType) {