AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Dawn: update to new GrGpu::onCreateBackendTexture() semantics.

Browse Source 
Also remove GrDawnRenderTarget::getResolveType() override (was removed
from base class).

Change-Id: Ie71e41d1542b9124464278aa0f266ce476915d51
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/245159
Commit-Queue: Stephen White <senorblanco@chromium.org>
Reviewed-by: Robert Phillips <robertphillips@google.com>
This commit is contained in:
Stephen White 2019-09-30 12:51:28 -04:00 committed by Skia Commit-Bot
parent 55e5be3fc3
commit 04b9964167
3 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/gpu/dawn/GrDawnGpu.cpp
View File

@ -307,14 +307,14 @@ GrStencilAttachment* GrDawnGpu::createStencilAttachmentForRenderTarget(const GrR
return stencil;
}
GrBackendTexture GrDawnGpu::createBackendTexture(int width, int height,
const GrBackendFormat& backendFormat,
GrMipMapped mipMapped,
GrRenderable renderable,
const void* pixels,
size_t rowBytes,
const SkColor4f* color,
GrProtected isProtected) {
GrBackendTexture GrDawnGpu::onCreateBackendTexture(int width, int height,
const GrBackendFormat& backendFormat,
GrMipMapped mipMapped,
GrRenderable renderable,
const SkPixmap srcData[],
int numMipLevels,
const SkColor4f* color,
GrProtected isProtected) {
dawn::TextureFormat format;
if (!backendFormat.asDawnFormat(&format)) {
return GrBackendTexture();
@ -322,9 +322,7 @@ GrBackendTexture GrDawnGpu::createBackendTexture(int width, int height,
GrPixelConfig config = GrDawnFormatToPixelConfig(format);
if (width > this->caps()->maxTextureSize() || height > this->caps()->maxTextureSize()) {
return GrBackendTexture();
}
SkASSERT(width <= this->caps()->maxTextureSize() && height <= this->caps()->maxTextureSize());
// FIXME: Dawn doesn't support mipmapped render targets (yet).
if (GrMipMapped::kYes == mipMapped && GrRenderable::kYes == renderable) {
@ -347,7 +345,9 @@ GrBackendTexture GrDawnGpu::createBackendTexture(int width, int height,
desc.format = format;
// Figure out the number of mip levels.
if (GrMipMapped::kYes == mipMapped) {
if (srcData) {
desc.mipLevelCount = numMipLevels;
} else if (GrMipMapped::kYes == mipMapped) {
desc.mipLevelCount = SkMipMap::ComputeLevelCount(width, height) + 1;
}
@ -355,9 +355,11 @@ GrBackendTexture GrDawnGpu::createBackendTexture(int width, int height,
size_t bpp = GrBytesPerPixel(config);
size_t baseLayerSize = bpp * width * height;
const void* pixels;
SkAutoMalloc defaultStorage(baseLayerSize);
if (!pixels) {
// Fill in the texture with all zeros so we don't have random garbage
if (srcData) {
pixels = srcData->addr();
} else {
pixels = defaultStorage.get();
memset(defaultStorage.get(), 0, baseLayerSize);
}

16
src/gpu/dawn/GrDawnGpu.h
View File

@ -38,14 +38,14 @@ public:
void xferBarrier(GrRenderTarget*, GrXferBarrierType) override {}
GrBackendTexture createBackendTexture(int w, int h,
const GrBackendFormat &,
GrMipMapped,
GrRenderable,
const void* pixels,
size_t rowBytes,
const SkColor4f* color,
GrProtected isProtected) override;
GrBackendTexture onCreateBackendTexture(int w, int h,
const GrBackendFormat&,
GrMipMapped,
GrRenderable,
const SkPixmap srcData[],
int numMipLevels,
const SkColor4f* color,
GrProtected isProtected) override;
void deleteBackendTexture(const GrBackendTexture&) override;
#if GR_TEST_UTILS
bool isTestingOnlyBackendTexture(const GrBackendTexture&) const override;

8
src/gpu/dawn/GrDawnRenderTarget.h
View File

@ -21,14 +21,6 @@ public:
~GrDawnRenderTarget() override;
// override of GrRenderTarget
ResolveType getResolveType() const override {
if (this->numSamples() > 1) {
return kCanResolve_ResolveType;
}
return kAutoResolves_ResolveType;
}
bool canAttemptStencilAttachment() const override {
return true;
}