diff options
author | Greg Daniel <egdaniel@google.com> | 2017-12-18 14:48:15 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-18 21:17:46 +0000 |
commit | f5d8758f29390fd5c135df12bc8a5e196854eda2 (patch) | |
tree | a7de0b54b030dda4549bc9feb0a0e2ff65ded7d6 /src | |
parent | 4fafedd33add9948db1147c60d681ed9340984fd (diff) |
Add new SkImage factory to create from GrBackendTexture with SkColorType
Bug: skia:
Change-Id: I46bdc54b6d9cdacc8f5a06644aa6b110837879f0
Reviewed-on: https://skia-review.googlesource.com/84342
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/gpu/GrCaps.cpp | 11 | ||||
-rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 55 | ||||
-rw-r--r-- | src/gpu/gl/GrGLCaps.h | 2 | ||||
-rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 4 | ||||
-rw-r--r-- | src/gpu/mock/GrMockCaps.h | 4 | ||||
-rw-r--r-- | src/gpu/mtl/GrMtlCaps.h | 4 | ||||
-rw-r--r-- | src/gpu/vk/GrVkCaps.cpp | 54 | ||||
-rw-r--r-- | src/gpu/vk/GrVkCaps.h | 2 | ||||
-rw-r--r-- | src/gpu/vk/GrVkGpu.cpp | 1 | ||||
-rw-r--r-- | src/image/SkImage.cpp | 14 | ||||
-rw-r--r-- | src/image/SkImage_Gpu.cpp | 34 |
11 files changed, 184 insertions, 1 deletions
diff --git a/src/gpu/GrCaps.cpp b/src/gpu/GrCaps.cpp index 2c83cc3bd1..8f6d27dcf2 100644 --- a/src/gpu/GrCaps.cpp +++ b/src/gpu/GrCaps.cpp @@ -6,6 +6,8 @@ */ #include "GrCaps.h" + +#include "GrBackendSurface.h" #include "GrContextOptions.h" #include "GrWindowRectangles.h" #include "SkJSONWriter.h" @@ -212,3 +214,12 @@ void GrCaps::dumpJSON(SkJSONWriter* writer) const { writer->endObject(); } + +bool GrCaps::validateBackendTexture(GrBackendTexture* tex, SkColorType ct) const { + if (!this->onValidateBackendTexture(tex, ct)) { + return false; + } + return this->isConfigTexturable(tex->fConfig); +} + + diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index efc6628266..05e3268dc9 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -2361,3 +2361,58 @@ int GrGLCaps::getSampleCount(int requestedCount, GrPixelConfig config) const { return fConfigTable[config].fColorSampleCounts[count-1]; } +bool GrGLCaps::onValidateBackendTexture(GrBackendTexture* tex, SkColorType ct) const { + const GrGLTextureInfo* texInfo = tex->getGLTextureInfo(); + if (!texInfo) { + return false; + } + GrGLenum format = texInfo->fFormat; + tex->fConfig = kUnknown_GrPixelConfig; + + switch (ct) { + case kUnknown_SkColorType: + return false; + case kAlpha_8_SkColorType: + if (GR_GL_ALPHA8 == format) { + tex->fConfig = kAlpha_8_as_Alpha_GrPixelConfig; + } else if (GR_GL_R8 == format) { + tex->fConfig = kAlpha_8_as_Red_GrPixelConfig; + } + break; + case kRGB_565_SkColorType: + if (GR_GL_RGB565 == format) { + tex->fConfig = kRGB_565_GrPixelConfig; + } + break; + case kARGB_4444_SkColorType: + if (GR_GL_RGBA4 == format) { + tex->fConfig = kRGBA_4444_GrPixelConfig; + } + break; + case kRGBA_8888_SkColorType: + if (GR_GL_RGBA8 == format) { + tex->fConfig = kRGBA_8888_GrPixelConfig; + } + break; + case kBGRA_8888_SkColorType: + if (GR_GL_BGRA8 == format) { + tex->fConfig = kBGRA_8888_GrPixelConfig; + } + break; + case kGray_8_SkColorType: + if (GR_GL_LUMINANCE8 == format) { + tex->fConfig = kGray_8_as_Lum_GrPixelConfig; + } else if (GR_GL_R8 == format) { + tex->fConfig = kGray_8_as_Red_GrPixelConfig; + } + break; + case kRGBA_F16_SkColorType: + if (GR_GL_RGBA16F == format) { + tex->fConfig = kRGBA_half_GrPixelConfig; + } + break; + } + + return kUnknown_GrPixelConfig != tex->fConfig; +} + diff --git a/src/gpu/gl/GrGLCaps.h b/src/gpu/gl/GrGLCaps.h index 3a50e8a393..38cbfe8747 100644 --- a/src/gpu/gl/GrGLCaps.h +++ b/src/gpu/gl/GrGLCaps.h @@ -416,6 +416,8 @@ public: } private: + bool onValidateBackendTexture(GrBackendTexture*, SkColorType) const override; + enum ExternalFormatUsage { kTexImage_ExternalFormatUsage, kOther_ExternalFormatUsage, diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index 95eb339db8..7b66bcc8a1 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -4421,6 +4421,8 @@ GrBackendTexture GrGLGpu::createTestingOnlyBackendTexture(void* pixels, int w, i return GrBackendTexture(); // invalid } + info.fFormat = this->glCaps().configSizedInternalFormat(config); + this->unbindCpuToGpuXferBuffer(); // Figure out the number of mip levels. @@ -4447,7 +4449,7 @@ GrBackendTexture GrGLGpu::createTestingOnlyBackendTexture(void* pixels, int w, i height = SkTMax(1, height / 2); } - return GrBackendTexture(w, h, config, mipMapped, info); + return GrBackendTexture(w, h, mipMapped, info); } bool GrGLGpu::isTestingOnlyBackendTexture(const GrBackendTexture& tex) const { diff --git a/src/gpu/mock/GrMockCaps.h b/src/gpu/mock/GrMockCaps.h index 47a5002f96..37bde8201c 100644 --- a/src/gpu/mock/GrMockCaps.h +++ b/src/gpu/mock/GrMockCaps.h @@ -52,6 +52,10 @@ public: } private: + bool onValidateBackendTexture(GrBackendTexture* tex, SkColorType ct) const override { + return SkToBool(tex->getMockTextureInfo()); + } + GrMockOptions fOptions; typedef GrCaps INHERITED; }; diff --git a/src/gpu/mtl/GrMtlCaps.h b/src/gpu/mtl/GrMtlCaps.h index 3f2adf8f7d..bc8aac9f8e 100644 --- a/src/gpu/mtl/GrMtlCaps.h +++ b/src/gpu/mtl/GrMtlCaps.h @@ -57,6 +57,10 @@ public: } private: + bool onValidateBackendTexture(GrBackendTexture* tex, SkColorType ct) const override { + return false; + } + void initFeatureSet(MTLFeatureSet featureSet); void initGrCaps(const id<MTLDevice> device); diff --git a/src/gpu/vk/GrVkCaps.cpp b/src/gpu/vk/GrVkCaps.cpp index 9e48983884..17253a0e04 100644 --- a/src/gpu/vk/GrVkCaps.cpp +++ b/src/gpu/vk/GrVkCaps.cpp @@ -6,6 +6,8 @@ */ #include "GrVkCaps.h" + +#include "GrBackendSurface.h" #include "GrRenderTargetProxy.h" #include "GrShaderCaps.h" #include "GrVkUtil.h" @@ -413,3 +415,55 @@ int GrVkCaps::getSampleCount(int requestedCount, GrPixelConfig config) const { return fConfigTable[config].fColorSampleCounts[count-1]; } +bool GrVkCaps::onValidateBackendTexture(GrBackendTexture* tex, SkColorType ct) const { + const GrVkImageInfo* imageInfo = tex->getVkImageInfo(); + if (!imageInfo) { + return false; + } + VkFormat format = imageInfo->fFormat; + tex->fConfig = kUnknown_GrPixelConfig; + + switch (ct) { + case kUnknown_SkColorType: + return false; + case kAlpha_8_SkColorType: + if (VK_FORMAT_R8_UNORM == format) { + tex->fConfig = kAlpha_8_as_Red_GrPixelConfig; + } + break; + case kRGB_565_SkColorType: + if (VK_FORMAT_R5G6B5_UNORM_PACK16 == format) { + tex->fConfig = kRGB_565_GrPixelConfig; + } + break; + case kARGB_4444_SkColorType: + if (VK_FORMAT_B4G4R4A4_UNORM_PACK16 == format) { + tex->fConfig = kRGBA_4444_GrPixelConfig; + } + break; + case kRGBA_8888_SkColorType: + if (VK_FORMAT_R8G8B8A8_UNORM == format) { + tex->fConfig = kRGBA_8888_GrPixelConfig; + } + break; + case kBGRA_8888_SkColorType: + if (VK_FORMAT_B8G8R8A8_UNORM == format) { + tex->fConfig = kBGRA_8888_GrPixelConfig; + } + break; + case kGray_8_SkColorType: + if (VK_FORMAT_R8_UNORM == format) { + tex->fConfig = kGray_8_as_Red_GrPixelConfig; + } + break; + case kRGBA_F16_SkColorType: + if (VK_FORMAT_R16G16B16A16_SFLOAT == format) { + tex->fConfig = kRGBA_half_GrPixelConfig; + } + break; + } + + return kUnknown_GrPixelConfig != tex->fConfig; +} + + diff --git a/src/gpu/vk/GrVkCaps.h b/src/gpu/vk/GrVkCaps.h index 1a6e1bd32a..8d0ab5dd8a 100644 --- a/src/gpu/vk/GrVkCaps.h +++ b/src/gpu/vk/GrVkCaps.h @@ -112,6 +112,8 @@ public: bool* rectsMustMatch, bool* disallowSubrect) const override; private: + bool onValidateBackendTexture(GrBackendTexture*, SkColorType) const override; + enum VkVendor { kAMD_VkVendor = 4098, kImagination_VkVendor = 4112, diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp index 5fdf58e406..baf022185f 100644 --- a/src/gpu/vk/GrVkGpu.cpp +++ b/src/gpu/vk/GrVkGpu.cpp @@ -2200,3 +2200,4 @@ sk_sp<GrSemaphore> GrVkGpu::prepareTextureForCrossContextUsage(GrTexture* textur // The image layout change serves as a barrier, so no semaphore is needed return nullptr; } + diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index 09796cdd34..6b35a12ff0 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -364,6 +364,13 @@ sk_sp<SkImage> SkImage::MakeFromDeferredTextureImageData(GrContext* context, con return nullptr; } +sk_sp<SkImage> SkImage::MakeFromTexture(GrContext* ctx, + const GrBackendTexture& tex, GrSurfaceOrigin origin, + SkColorType ct, SkAlphaType at, sk_sp<SkColorSpace> cs, + TextureReleaseProc releaseP, ReleaseContext releaseC) { + return nullptr; +} + bool SkImage::MakeBackendTextureFromSkImage(GrContext*, sk_sp<SkImage>, GrBackendTexture*, @@ -377,6 +384,13 @@ sk_sp<SkImage> SkImage::MakeFromAdoptedTexture(GrContext* ctx, return nullptr; } +sk_sp<SkImage> SkImage::MakeFromAdoptedTexture(GrContext* ctx, + const GrBackendTexture& tex, GrSurfaceOrigin origin, + SkColorType ct, SkAlphaType at, + sk_sp<SkColorSpace> cs) { + return nullptr; +} + sk_sp<SkImage> SkImage::MakeFromYUVTexturesCopy(GrContext* ctx, SkYUVColorSpace space, const GrBackendObject yuvTextureHandles[3], const SkISize yuvSizes[3], diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp index 8766dadeab..bf80ac0743 100644 --- a/src/image/SkImage_Gpu.cpp +++ b/src/image/SkImage_Gpu.cpp @@ -301,6 +301,29 @@ sk_sp<SkImage> SkImage::MakeFromTexture(GrContext* ctx, releaseP, releaseC); } +bool validate_backend_texture(GrContext* ctx, GrBackendTexture* tex, + SkColorType ct, SkAlphaType at, sk_sp<SkColorSpace> cs) { + // TODO: Create a SkImageColorInfo struct for color, alpha, and color space so we don't need to + // create a fake image info here. + SkImageInfo info = SkImageInfo::Make(1, 1, ct, at, cs); + if (!SkImageInfoIsValidAllowNumericalCS(info)) { + return false; + } + + return ctx->caps()->validateBackendTexture(tex, ct); +} + +sk_sp<SkImage> SkImage::MakeFromTexture(GrContext* ctx, + const GrBackendTexture& tex, GrSurfaceOrigin origin, + SkColorType ct, SkAlphaType at, sk_sp<SkColorSpace> cs, + TextureReleaseProc releaseP, ReleaseContext releaseC) { + GrBackendTexture texCopy = tex; + if (!validate_backend_texture(ctx, &texCopy, ct, at, cs)) { + return nullptr; + } + return MakeFromTexture(ctx, texCopy, origin, at, cs, releaseP, releaseC); +} + sk_sp<SkImage> SkImage::MakeFromAdoptedTexture(GrContext* ctx, const GrBackendTexture& tex, GrSurfaceOrigin origin, SkAlphaType at, sk_sp<SkColorSpace> cs) { @@ -308,6 +331,17 @@ sk_sp<SkImage> SkImage::MakeFromAdoptedTexture(GrContext* ctx, nullptr, nullptr); } +sk_sp<SkImage> SkImage::MakeFromAdoptedTexture(GrContext* ctx, + const GrBackendTexture& tex, GrSurfaceOrigin origin, + SkColorType ct, SkAlphaType at, + sk_sp<SkColorSpace> cs) { + GrBackendTexture texCopy = tex; + if (!validate_backend_texture(ctx, &texCopy, ct, at, cs)) { + return nullptr; + } + return MakeFromAdoptedTexture(ctx, texCopy, origin, at, cs); +} + static GrBackendTexture make_backend_texture_from_handle(GrBackend backend, int width, int height, GrPixelConfig config, |