diff options
author | Greg Daniel <egdaniel@google.com> | 2017-10-19 13:59:32 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-19 13:59:37 +0000 |
commit | 7477d9693869982a4b0b18d20fee32d2f3eaedbf (patch) | |
tree | 67b520aba720106b55c10cf898b59f5b08dbf069 /src/gpu/gl/GrGLGpu.cpp | |
parent | b8ad00b5a68975cafd68d6df0d66f0a01f5c07c2 (diff) |
Revert "Support creation/use of mipped proxy in GrBackendTextureImageGenerator"
This reverts commit b8ad00b5a68975cafd68d6df0d66f0a01f5c07c2.
Reason for revert: Some various test failures
Original change's description:
> Support creation/use of mipped proxy in GrBackendTextureImageGenerator
>
> Bug: skia:
> Change-Id: I9d06780ccb2db0865100b67041c03408f2445c62
> Reviewed-on: https://skia-review.googlesource.com/61241
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,brianosman@google.com
Change-Id: I28e625776352ee6f9f27e66cd5d4b149ef50a22a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/61941
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/gl/GrGLGpu.cpp')
-rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index 1bee54879e..649373bf79 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -4403,15 +4403,6 @@ GrBackendObject GrGLGpu::createTestingOnlyBackendTexture(void* pixels, int w, in mipLevels = SkMipMap::ComputeLevelCount(w, h) + 1; } - size_t bpp = GrBytesPerPixel(config); - size_t baseLayerSize = bpp * w * h; - SkAutoMalloc defaultStorage(baseLayerSize); - if (!pixels) { - // Fill in the texture with all zeros so we don't have random garbage - pixels = defaultStorage.get(); - memset(pixels, 0, baseLayerSize); - } - int width = w; int height = h; for (int i = 0; i < mipLevels; ++i) { |