From 88fdee9bde97df106a8d81b450982b8296a2bc90 Mon Sep 17 00:00:00 2001 From: Greg Daniel Date: Sat, 24 Feb 2018 22:41:50 +0000 Subject: Revert "Fixes to alignment issues with regards to mapped vulkan memory." This reverts commit 9fb6cf4c49b0f095e5cc005feb05b5522731421b. Reason for revert: breaks fuchsia Original change's description: > Fixes to alignment issues with regards to mapped vulkan memory. > > Bug: skia: > Change-Id: Ida9813fe774580a6d157b8eb8d330488c8e8c4bc > Reviewed-on: https://skia-review.googlesource.com/109483 > Commit-Queue: Greg Daniel > Reviewed-by: Jim Van Verth TBR=djsollen@google.com,egdaniel@google.com,jvanverth@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Bug: skia: Change-Id: If1223313cab27737ada401d1f3fe4b7ab849d03f Reviewed-on: https://skia-review.googlesource.com/110040 Reviewed-by: Greg Daniel Commit-Queue: Greg Daniel --- include/gpu/vk/GrVkTypes.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/gpu/vk/GrVkTypes.h b/include/gpu/vk/GrVkTypes.h index 5e93733531..aa1334adca 100644 --- a/include/gpu/vk/GrVkTypes.h +++ b/include/gpu/vk/GrVkTypes.h @@ -31,17 +31,14 @@ * Vulkan textures are really const GrVkImageInfo* */ struct GrVkAlloc { - VkDeviceMemory fMemory = VK_NULL_HANDLE; // can be VK_NULL_HANDLE iff is an RT and is borrowed - VkDeviceSize fOffset = 0; - VkDeviceSize fSize = 0; // this can be indeterminate iff Tex uses borrow semantics - uint32_t fFlags= 0; + VkDeviceMemory fMemory; // can be VK_NULL_HANDLE iff Tex is an RT and uses borrow semantics + VkDeviceSize fOffset; + VkDeviceSize fSize; // this can be indeterminate iff Tex uses borrow semantics + uint32_t fFlags; enum Flag { kNoncoherent_Flag = 0x1, // memory must be flushed to device after mapping }; -private: - friend class GrVkHeap; // For access to usesSystemHeap - bool fUsesSystemHeap = false; }; struct GrVkImageInfo { -- cgit v1.2.3