From 8d03b7c546d057e281fe3c24337ed0faf51790ec Mon Sep 17 00:00:00 2001 From: Tobin Ehlis Date: Tue, 29 Sep 2015 11:22:37 -0600 Subject: Fix windows build issues in cube.c and device_limits.cpp --- demos/cube.c | 2 +- layers/device_limits.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/demos/cube.c b/demos/cube.c index b3398683..9d3c7a86 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -2275,7 +2275,7 @@ static void demo_init_vk(struct demo *demo) assert(gfx_queue_idx < demo->queue_count); // Query fine-grained feature support for this device. // If app has specific feature requirements it should check supported features based on this query - VkPhysicalDeviceFeatures physDevFeatures = {}; + VkPhysicalDeviceFeatures physDevFeatures; err = vkGetPhysicalDeviceFeatures(demo->gpu, &physDevFeatures); assert(!err); diff --git a/layers/device_limits.cpp b/layers/device_limits.cpp index 8e20ace9..8cb8b6b5 100644 --- a/layers/device_limits.cpp +++ b/layers/device_limits.cpp @@ -356,6 +356,7 @@ static VkBool32 validate_features_request(layer_data *phy_dev_data) skipCall |= log_msg(phy_dev_data->report_data, VK_DBG_REPORT_WARN_BIT, VK_OBJECT_TYPE_PHYSICAL_DEVICE, 0, 0, DEVLIMITS_INVALID_FEATURE_REQUESTED, "DL", "You requested features that are unavailable on this device. You should first query feature availability by calling vkGetPhysicalDeviceFeatures()."); } + return skipCall; } VK_LAYER_EXPORT VkResult VKAPI vkCreateDevice(VkPhysicalDevice gpu, const VkDeviceCreateInfo* pCreateInfo, VkDevice* pDevice) -- cgit v1.2.3