diff options
| -rw-r--r-- | src/gpu/vk/GrVkGpu.cpp | 8 | ||||
| -rw-r--r-- | tests/PathOpsDVectorTest.cpp | 2 | ||||
| -rw-r--r-- | tests/TArrayTest.cpp | 2 | ||||
| -rw-r--r-- | tests/VkBackendSurfaceTest.cpp | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp index ff0f5bcbe3..bc47ae6558 100644 --- a/src/gpu/vk/GrVkGpu.cpp +++ b/src/gpu/vk/GrVkGpu.cpp @@ -838,7 +838,7 @@ sk_sp<GrTexture> GrVkGpu::onCreateTexture(const GrSurfaceDesc& desc, SkBudgeted VK_ACCESS_TRANSFER_WRITE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, false); this->currentCommandBuffer()->clearColorImage(this, tex.get(), &zeroClearColor, 1, &range); } - return tex; + return std::move(tex); } //////////////////////////////////////////////////////////////////////////////// @@ -960,7 +960,7 @@ sk_sp<GrRenderTarget> GrVkGpu::onWrapBackendRenderTarget(const GrBackendRenderTa SkASSERT(tgt->canAttemptStencilAttachment()); } - return tgt; + return std::move(tgt); } sk_sp<GrRenderTarget> GrVkGpu::onWrapBackendTextureAsRenderTarget(const GrBackendTexture& tex, @@ -987,9 +987,7 @@ sk_sp<GrRenderTarget> GrVkGpu::onWrapBackendTextureAsRenderTarget(const GrBacken sk_sp<GrVkImageLayout> layout = tex.getGrVkImageLayout(); SkASSERT(layout); - sk_sp<GrVkRenderTarget> tgt = GrVkRenderTarget::MakeWrappedRenderTarget(this, desc, imageInfo, - std::move(layout)); - return tgt; + return GrVkRenderTarget::MakeWrappedRenderTarget(this, desc, imageInfo, std::move(layout)); } void GrVkGpu::generateMipmap(GrVkTexture* tex, GrSurfaceOrigin texOrigin) { diff --git a/tests/PathOpsDVectorTest.cpp b/tests/PathOpsDVectorTest.cpp index 583a868149..5eced8f5e7 100644 --- a/tests/PathOpsDVectorTest.cpp +++ b/tests/PathOpsDVectorTest.cpp @@ -28,7 +28,7 @@ DEF_TEST(PathOpsDVector, reporter) { SkASSERT(ValidVector(v2)); v1 += v2; REPORTER_ASSERT(reporter, v1.fX == 0 && v1.fY == 0); - v2 -= v2; + v2 -= static_cast<decltype(v2)&>(v2); REPORTER_ASSERT(reporter, v2.fX == 0 && v2.fY == 0); v1 = tests[index + 1] - tests[index]; v1 /= 2; diff --git a/tests/TArrayTest.cpp b/tests/TArrayTest.cpp index 1b376e4d4b..5845b61f93 100644 --- a/tests/TArrayTest.cpp +++ b/tests/TArrayTest.cpp @@ -289,7 +289,7 @@ static void test_self_assignment(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, a.count() == 1); REPORTER_ASSERT(reporter, a[0] == 1); - a = a; + a = static_cast<decltype(a)&>(a); REPORTER_ASSERT(reporter, !a.empty()); REPORTER_ASSERT(reporter, a.count() == 1); REPORTER_ASSERT(reporter, a[0] == 1); diff --git a/tests/VkBackendSurfaceTest.cpp b/tests/VkBackendSurfaceTest.cpp index fc0464d981..6b442a9725 100644 --- a/tests/VkBackendSurfaceTest.cpp +++ b/tests/VkBackendSurfaceTest.cpp @@ -125,7 +125,7 @@ DEF_GPUTEST_FOR_VULKAN_CONTEXT(VkImageLayoutTest, reporter, ctxInfo) { REPORTER_ASSERT(reporter, invalidTexture.isValid()); REPORTER_ASSERT(reporter, GrBackendTexture::TestingOnly_Equals(invalidTexture, backendTex)); - invalidTexture = invalidTexture; + invalidTexture = static_cast<decltype(invalidTexture)&>(invalidTexture); REPORTER_ASSERT(reporter, invalidTexture.isValid()); REPORTER_ASSERT(reporter, GrBackendTexture::TestingOnly_Equals(invalidTexture, invalidTexture)); |