commit 99b2a33c37cdb3f7a8a3e5ebf3b38e374ceb80bc
author Stephen White <senorblanco@chromium.org> Fri Jul 19 15:37:17 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jul 19 20:10:02 2019 +0000
tree 04db922ba19cd9b1b6e03a21a67044f6b220bf57
parent e8a766b16c51be302cdceccaf0d45637a4745944

Update Dawn backend to Skia ToT: GrRenderTarget, onCreateTexture.

Change-Id: I82aec74524f33b3b8ea7592a9a4bf904127b87b6
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/228569
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Stephen White <senorblanco@chromium.org>

src/gpu/dawn/GrDawnGpu.cpp

diff --git a/src/gpu/dawn/GrDawnGpu.cpp b/src/gpu/dawn/GrDawnGpu.cpp
index bc4593a..6f764de 100644
--- a/src/gpu/dawn/GrDawnGpu.cpp
+++ b/src/gpu/dawn/GrDawnGpu.cpp
@@ -99,8 +99,8 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 sk_sp<GrTexture> GrDawnGpu::onCreateTexture(const GrSurfaceDesc& desc, GrRenderable renderable,
-                                            SkBudgeted budgeted, const GrMipLevel texels[],
-                                            int mipLevelCount) {
+                                            SkBudgeted budgeted, GrProtected,
+                                            const GrMipLevel texels[], int mipLevelCount) {
     return nullptr;
 }
 

src/gpu/dawn/GrDawnGpu.h

diff --git a/src/gpu/dawn/GrDawnGpu.h b/src/gpu/dawn/GrDawnGpu.h
index 5edf232..2fb32fa 100644
--- a/src/gpu/dawn/GrDawnGpu.h
+++ b/src/gpu/dawn/GrDawnGpu.h
@@ -87,7 +87,8 @@
     virtual void querySampleLocations(GrRenderTarget*, SkTArray<SkPoint>*) override {}
 
     sk_sp<GrTexture> onCreateTexture(const GrSurfaceDesc& desc, GrRenderable, SkBudgeted budgeted,
-                                     const GrMipLevel texels[], int mipLevelCount) override;
+                                     GrProtected, const GrMipLevel texels[], int mipLevelCount)
+                                     override;
 
     sk_sp<GrTexture> onCreateCompressedTexture(int width, int height, SkImage::CompressionType,
                                                SkBudgeted, const void* data) override;

src/gpu/dawn/GrDawnRenderTarget.cpp

diff --git a/src/gpu/dawn/GrDawnRenderTarget.cpp b/src/gpu/dawn/GrDawnRenderTarget.cpp
index 02b8a5b..1a28ce2 100644
--- a/src/gpu/dawn/GrDawnRenderTarget.cpp
+++ b/src/gpu/dawn/GrDawnRenderTarget.cpp
@@ -15,8 +15,8 @@
                                        const GrSurfaceDesc& desc,
                                        const GrDawnImageInfo& info,
                                        GrBackendObjectOwnership ownership)
-    : GrSurface(gpu, desc)
-    , GrRenderTarget(gpu, desc)
+    : GrSurface(gpu, desc, GrProtected::kNo)
+    , GrRenderTarget(gpu, desc, GrProtected::kNo)
     , fInfo(info) {
     this->registerWithCacheWrapped(GrWrapCacheable::kNo);
 }