diff options
| author |  Greg Daniel <egdaniel@google.com> | 2018-05-31 13:13:33 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-31 18:21:25 +0000 |
| commit | 81df0414c8226ed40ccf70b6f67890f136440b81 (patch) | |
| tree | 3d4d3a3256b7dfc0d0604ef4fa15db34f82b1e47 /include | |
| parent | ec0732433f28368b94973496fbdb990f967ba1f6 (diff) | |
Reland "Use GrVkMemoryAllocator for vulkan memory allocations in ganesh."
This is a reland of 331c266ed716526478a10885aff66181cec64486
Original change's description:
> Use GrVkMemoryAllocator for vulkan memory allocations in ganesh.
>
> Besides using the new allocator, the big logical change is that map
> and unmap calls form GrVkMemory are specc'd to map the entire GrVkAlloc
> instead of a specific offset and size as they did before. As a
> consequence of this, we move the handling of non-coherent alignment
> for flush/invalidate calls to GrVkMemory instead of the callers.
>
> Bug: skia:
> Change-Id: I794d713106602f27aa7e808c306bbb69fd2b67be
> Reviewed-on: https://skia-review.googlesource.com/130021
> Commit-Queue: Greg Daniel <egdaniel@google.com>
> Reviewed-by: Jim Van Verth <jvanverth@google.com>
Bug: skia:
Change-Id: Ia9a4192d344449fb444d2adaa1d62ff1ede4b21d
Reviewed-on: https://skia-review.googlesource.com/131083
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/GrVkBackendContext.h | 3 | ||||
| -rw-r--r-- | include/gpu/vk/GrVkTypes.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/gpu/vk/GrVkBackendContext.h b/include/gpu/vk/GrVkBackendContext.h index fdc71d373f..4b93de8554 100644 --- a/include/gpu/vk/GrVkBackendContext.h +++ b/include/gpu/vk/GrVkBackendContext.h @@ -12,6 +12,7 @@ #include "vk/GrVkDefines.h" #include "vk/GrVkInterface.h" +#include "vk/GrVkMemoryAllocator.h" enum GrVkExtensionFlags { kEXT_debug_report_GrVkExtensionFlag = 0x0001, @@ -45,6 +46,8 @@ struct SK_API GrVkBackendContext : public SkRefCnt { uint32_t fExtensions; uint32_t fFeatures; sk_sp<const GrVkInterface> fInterface; + sk_sp<GrVkMemoryAllocator> fMemoryAllocator; + /** * Controls whether this object destroys the instance and device upon destruction. The default * is temporarily 'true' to avoid breaking existing clients but will be changed to 'false'. diff --git a/include/gpu/vk/GrVkTypes.h b/include/gpu/vk/GrVkTypes.h index 2e31250324..9225e92778 100644 --- a/include/gpu/vk/GrVkTypes.h +++ b/include/gpu/vk/GrVkTypes.h @@ -10,7 +10,7 @@ #define GrVkTypes_DEFINED #include "GrTypes.h" -#include "vk/GrVkDefines.h" +#include "GrVkDefines.h" /** * KHR_debug |