From ea092618b1b6df81c09c6d3abb30516a7daa321e Mon Sep 17 00:00:00 2001
From: Tony Barbour <tony@LunarG.com>
Date: Mon, 13 Jul 2015 15:06:12 -0600
Subject: Windows: more fixes for windows compile

---
 layers/draw_state.cpp                  | 4 ----
 layers/mem_tracker.cpp                 | 1 -
 layers/shader_checker.cpp              | 1 -
 layers/vk_layer_debug_marker_table.cpp | 5 ++---
 4 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'layers')

diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 83ceb385..49e91f4b 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -716,7 +716,6 @@ static LAYOUT_NODE* getLayoutNode(const VkDescriptorSetLayout layout) {
 // Return 1 if update struct is of valid type, 0 otherwise
 static VkBool32 validUpdateStruct(const VkDevice device, const GENERIC_HEADER* pUpdateStruct)
 {
-    char str[1024];
     switch (pUpdateStruct->sType)
     {
         case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET:
@@ -731,7 +730,6 @@ static VkBool32 validUpdateStruct(const VkDevice device, const GENERIC_HEADER* p
 // For given update struct, return binding
 static uint32_t getUpdateBinding(const VkDevice device, const GENERIC_HEADER* pUpdateStruct)
 {
-    char str[1024];
     switch (pUpdateStruct->sType)
     {
         case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET:
@@ -747,7 +745,6 @@ static uint32_t getUpdateBinding(const VkDevice device, const GENERIC_HEADER* pU
 // Return count for given update struct
 static uint32_t getUpdateArrayIndex(const VkDevice device, const GENERIC_HEADER* pUpdateStruct)
 {
-    char str[1024];
     switch (pUpdateStruct->sType)
     {
         case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET:
@@ -764,7 +761,6 @@ static uint32_t getUpdateArrayIndex(const VkDevice device, const GENERIC_HEADER*
 // Return count for given update struct
 static uint32_t getUpdateCount(const VkDevice device, const GENERIC_HEADER* pUpdateStruct)
 {
-    char str[1024];
     switch (pUpdateStruct->sType)
     {
         case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET:
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index 39a48bf6..6033806c 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -1296,7 +1296,6 @@ VkResult VKAPI vkCreateInstance(
 
 static void createDeviceRegisterExtensions(const VkDeviceCreateInfo* pCreateInfo, VkDevice device)
 {
-    uint32_t i;
     layer_data *my_device_data = get_my_data_ptr(get_dispatch_key(device), layer_data_map);
     my_device_data->wsi_enabled = false;
     for (uint32_t i = 0; i < pCreateInfo->extensionCount; i++) {
diff --git a/layers/shader_checker.cpp b/layers/shader_checker.cpp
index 25cd7ce6..2955f8d5 100644
--- a/layers/shader_checker.cpp
+++ b/layers/shader_checker.cpp
@@ -571,7 +571,6 @@ validate_interface_between_stages(VkDevice dev,
     std::map<uint32_t, interface_var> builtin_outputs;
     std::map<uint32_t, interface_var> builtin_inputs;
 
-    char str[1024];
     bool pass = true;
 
     collect_interface_by_location(dev, producer, spv::StorageClassOutput, outputs, builtin_outputs);
diff --git a/layers/vk_layer_debug_marker_table.cpp b/layers/vk_layer_debug_marker_table.cpp
index 47c93b10..b3b54c19 100644
--- a/layers/vk_layer_debug_marker_table.cpp
+++ b/layers/vk_layer_debug_marker_table.cpp
@@ -35,7 +35,6 @@ std::unordered_map<void *, VkLayerDebugMarkerDispatchTable *> tableDebugMarkerMa
  * and a new key inserted into map */
 VkLayerDebugMarkerDispatchTable * initDebugMarkerTable(VkDevice device)
 {
-    VkLayerDebugMarkerDispatchTable *pTable;
     VkLayerDebugMarkerDispatchTable *pDebugMarkerTable;
 
     assert(device);
@@ -56,5 +55,5 @@ VkLayerDebugMarkerDispatchTable * initDebugMarkerTable(VkDevice device)
     pDebugMarkerTable->DbgSetObjectTag   = (PFN_vkDbgSetObjectTag) pDisp->GetDeviceProcAddr(device, "vkDbgSetObjectTag");
     pDebugMarkerTable->DbgSetObjectName  = (PFN_vkDbgSetObjectName) pDisp->GetDeviceProcAddr(device, "vkDbgSetObjectName");
 
-    return pTable;
-}
\ No newline at end of file
+    return pDebugMarkerTable;
+}
-- 
cgit v1.2.3