diff options
| author |  Greg Daniel <egdaniel@google.com> | 2018-05-30 22:59:03 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-30 22:59:08 +0000 |
| commit | a9d3dae67ade82d6e01fd911dc7c63ec41c64107 (patch) | |
| tree | 05542f085a298a8b88f005a25ceebc673719dde2 /include | |
| parent | de81143630f379af560467c3ae1335e73a0b9f03 (diff) | |
Revert "Use GrVkMemoryAllocator for vulkan memory allocations in ganesh."
This reverts commit 331c266ed716526478a10885aff66181cec64486.
Reason for revert: breaking an intel vulkan bot
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>
TBR=egdaniel@google.com,jvanverth@google.com,bsalomon@google.com
Change-Id: I5237c00625dc95d3d9b36c1e5591762988d85562
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/131081
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/gpu/vk/GrVkBackendContext.h | 4 | ||||
| -rw-r--r-- | include/gpu/vk/GrVkTypes.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/gpu/vk/GrVkBackendContext.h b/include/gpu/vk/GrVkBackendContext.h index 212362873a..fdc71d373f 100644 --- a/include/gpu/vk/GrVkBackendContext.h +++ b/include/gpu/vk/GrVkBackendContext.h @@ -13,8 +13,6 @@ #include "vk/GrVkDefines.h" #include "vk/GrVkInterface.h" -class GrVkMemoryAllocator; - enum GrVkExtensionFlags { kEXT_debug_report_GrVkExtensionFlag = 0x0001, kNV_glsl_shader_GrVkExtensionFlag = 0x0002, @@ -47,8 +45,6 @@ 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 9225e92778..2e31250324 100644 --- a/include/gpu/vk/GrVkTypes.h +++ b/include/gpu/vk/GrVkTypes.h @@ -10,7 +10,7 @@ #define GrVkTypes_DEFINED #include "GrTypes.h" -#include "GrVkDefines.h" +#include "vk/GrVkDefines.h" /** * KHR_debug |