diff options
| author | tobine <tobine@google.com> | 2016-03-04 06:59:59 -0700 |
|---|---|---|
| committer | tobine <tobine@google.com> | 2016-03-04 06:59:59 -0700 |
| commit | 408b68f6699929c6e91eb05f143a71a8f391fc85 (patch) | |
| tree | 7a2b480c02917ffb216e25623cf0070c83ebf2dc | |
| parent | d7388b9846edbba7f46bfd3293cef7ff6b215221 (diff) | |
| parent | e198c1c89d35a8fe6fbd1a08368227ea22dbd74b (diff) | |
| download | usermoji-408b68f6699929c6e91eb05f143a71a8f391fc85.tar.xz | |
Merge pull request #59 from chrisforbes/ds-more-fixes
Miscellaneous fixes for DrawState layer
| -rw-r--r-- | layers/draw_state.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp index 86368642..34e62260 100644 --- a/layers/draw_state.cpp +++ b/layers/draw_state.cpp @@ -3694,7 +3694,6 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateDevice(VkPhysicalDevice g createDeviceRegisterExtensions(pCreateInfo, *pDevice); // Get physical device limits for this device my_instance_data->instance_dispatch_table->GetPhysicalDeviceProperties(gpu, &(my_device_data->physDevProperties.properties)); - my_instance_data->instance_dispatch_table->GetPhysicalDeviceFeatures(gpu, &(my_device_data->physDevProperties.features)); uint32_t count; my_instance_data->instance_dispatch_table->GetPhysicalDeviceQueueFamilyProperties(gpu, &count, nullptr); my_device_data->physDevProperties.queue_family_properties.resize(count); @@ -3704,8 +3703,7 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkCreateDevice(VkPhysicalDevice g my_device_data->physDevProperties.features = *pCreateInfo->pEnabledFeatures; } else { - my_instance_data->instance_dispatch_table->GetPhysicalDeviceFeatures( - gpu, &my_device_data->physDevProperties.features); + memset(&my_device_data->physDevProperties.features, 0, sizeof(VkPhysicalDeviceFeatures)); } loader_platform_thread_unlock_mutex(&globalLock); return result; @@ -7555,8 +7553,8 @@ bool validateSubpassCompatibility(layer_data* dev_data, VkCommandBuffer primaryB } skip_call |= validateAttachmentCompatibility(dev_data, primaryBuffer, primaryPass, primary_input_attach, secondaryBuffer, secondaryPass, secondary_input_attach, is_multi); } - maxInputAttachmentCount = std::max(primary_desc.colorAttachmentCount, secondary_desc.colorAttachmentCount); - for (uint32_t i = 0; i < maxInputAttachmentCount; ++i) { + uint32_t maxColorAttachmentCount = std::max(primary_desc.colorAttachmentCount, secondary_desc.colorAttachmentCount); + for (uint32_t i = 0; i < maxColorAttachmentCount; ++i) { uint32_t primary_color_attach = VK_ATTACHMENT_UNUSED, secondary_color_attach = VK_ATTACHMENT_UNUSED; if (i < primary_desc.colorAttachmentCount) { primary_color_attach = primary_desc.pColorAttachments[i].attachment; |