diff options
| author |  Greg Daniel <egdaniel@google.com> | 2018-02-26 13:29:37 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-26 18:59:38 +0000 |
| commit | 8385a8a44bd06cbd400bc66440466229dc52f33f (patch) | |
| tree | 5e60caa92d4fe35edc6258249ffa98153880a571 /include | |
| parent | 3716179484c843ab72e73d19d27009e3a424040d (diff) | |
Revert "Revert "Fixes to alignment issues with regards to mapped vulkan memory.""
This reverts commit 88fdee9bde97df106a8d81b450982b8296a2bc90.
Reason for revert: Pre Fixes landed in other repos
Original change's description:
> 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 <egdaniel@google.com>
> > Reviewed-by: Jim Van Verth <jvanverth@google.com>
>
> 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 <egdaniel@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>
Bug: skia:
Change-Id: Ifeebf535c3617674846f7ef25e686ee11ceee65c
Reviewed-on: https://skia-review.googlesource.com/110160
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/gpu/vk/GrVkTypes.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/gpu/vk/GrVkTypes.h b/include/gpu/vk/GrVkTypes.h index aa1334adca..5e93733531 100644 --- a/include/gpu/vk/GrVkTypes.h +++ b/include/gpu/vk/GrVkTypes.h @@ -31,14 +31,17 @@ * Vulkan textures are really const GrVkImageInfo* */ struct GrVkAlloc { - 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; + 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; 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 { |