Revert "Implement window rectangles in vulkan"
This reverts commit 94c0468b2b4255e3beed81efdcfbf6d9d39e11e4.
Reason for revert: <INSERT REASONING HERE>
Original change's description:
> Implement window rectangles in vulkan
>
> Bug: skia:
> Change-Id: I32c079b90a5503c797dfc073a093f940cd8c550a
> Reviewed-on: https://skia-review.googlesource.com/65423
> Commit-Queue: Chris Dalton <csmartdalton@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,csmartdalton@google.com
Change-Id: I5a90cb57fb5d4bcf8c7e76a5f71a7f16edbaf6be
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/67060
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
diff --git a/src/gpu/vk/GrVkCaps.cpp b/src/gpu/vk/GrVkCaps.cpp
index 9f635e2..2b24205 100644
--- a/src/gpu/vk/GrVkCaps.cpp
+++ b/src/gpu/vk/GrVkCaps.cpp
@@ -75,30 +75,9 @@
void GrVkCaps::init(const GrContextOptions& contextOptions, const GrVkInterface* vkInterface,
VkPhysicalDevice physDev, uint32_t featureFlags, uint32_t extensionFlags) {
- VkPhysicalDeviceProperties2KHR khrProperties;
- if (SkToBool(extensionFlags & kKHR_get_physical_device_properties2_GrVkExtensionFlag)) {
- khrProperties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR;
- khrProperties.pNext = nullptr;
- VkPhysicalDeviceDiscardRectanglePropertiesEXT discardRectsProperties;
- if (SkToBool(extensionFlags & kEXT_discard_rectangles_GrVkExtensionFlag)) {
- discardRectsProperties.sType =
- VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISCARD_RECTANGLE_PROPERTIES_EXT;
- discardRectsProperties.pNext = khrProperties.pNext;
- khrProperties.pNext = &discardRectsProperties;
- }
-
- GR_VK_CALL(vkInterface, GetPhysicalDeviceProperties2KHR(physDev, &khrProperties));
-
- if (SkToBool(extensionFlags & kEXT_discard_rectangles_GrVkExtensionFlag)) {
- fWindowRectsSupport = WindowRectsSupport::kDrawOnly;
- fMaxWindowRectangles = discardRectsProperties.maxDiscardRectangles;
- }
- } else {
- GR_VK_CALL(vkInterface, GetPhysicalDeviceProperties(physDev, &khrProperties.properties));
- }
-
- const VkPhysicalDeviceProperties& properties = khrProperties.properties;
+ VkPhysicalDeviceProperties properties;
+ GR_VK_CALL(vkInterface, GetPhysicalDeviceProperties(physDev, &properties));
VkPhysicalDeviceMemoryProperties memoryProperties;
GR_VK_CALL(vkInterface, GetPhysicalDeviceMemoryProperties(physDev, &memoryProperties));