diff options
| author |  Greg Daniel <egdaniel@google.com> | 2018-02-24 22:41:50 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-25 14:00:39 +0000 |
| commit | 88fdee9bde97df106a8d81b450982b8296a2bc90 (patch) | |
| tree | 7b91e8687e20e4eb994480c1d3262f74de284686 /tests/VkWrapTests.cpp | |
| parent | 1267efac7f0a530a9c93e2d20662d62bd9ccb542 (diff) | |
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>
Diffstat (limited to 'tests/VkWrapTests.cpp')
| -rw-r--r-- | tests/VkWrapTests.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/VkWrapTests.cpp b/tests/VkWrapTests.cpp index bcf59d222e..9723d5763b 100644 --- a/tests/VkWrapTests.cpp +++ b/tests/VkWrapTests.cpp @@ -55,7 +55,7 @@ void wrap_tex_test(skiatest::Reporter* reporter, GrContext* context) { // alloc is null { GrVkImageInfo backendCopy = *imageInfo; - backendCopy.fAlloc = GrVkAlloc(); + backendCopy.fAlloc = { VK_NULL_HANDLE, 0, 0, 0 }; GrBackendTexture backendTex = GrBackendTexture(kW, kH, backendCopy); tex = gpu->wrapBackendTexture(backendTex, kBorrow_GrWrapOwnership); REPORTER_ASSERT(reporter, !tex); @@ -100,7 +100,7 @@ void wrap_rt_test(skiatest::Reporter* reporter, GrContext* context) { // alloc is null { GrVkImageInfo backendCopy = *imageInfo; - backendCopy.fAlloc = GrVkAlloc(); + backendCopy.fAlloc = { VK_NULL_HANDLE, 0, 0, 0 }; // can wrap null alloc GrBackendRenderTarget backendRT(kW, kH, 1, 0, backendCopy); rt = gpu->wrapBackendRenderTarget(backendRT); @@ -138,7 +138,7 @@ void wrap_trt_test(skiatest::Reporter* reporter, GrContext* context) { // alloc is null { GrVkImageInfo backendCopy = *imageInfo; - backendCopy.fAlloc = GrVkAlloc(); + backendCopy.fAlloc = { VK_NULL_HANDLE, 0, 0, 0 }; GrBackendTexture backendTex = GrBackendTexture(kW, kH, backendCopy); tex = gpu->wrapRenderableBackendTexture(backendTex, 1, kBorrow_GrWrapOwnership); REPORTER_ASSERT(reporter, !tex); |