diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-05-19 15:45:48 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-21 11:41:17 +0000 |
| commit | d34edf3dc902532f88842f35375c474f94f82d83 (patch) | |
| tree | 06a38d69c351e6675467daeafc1439124561cbd0 /src/gpu/vk | |
| parent | 76149aa5fba375ebedab3d0422e0677e0bb102a7 (diff) | |
Revert "Revert "Remove GrSurfaceDesc member from GrSurface.""
This reverts commit 4b30a96a3e96b7f051e25025f4f17f3c54e04153.
Bug: skia:
Change-Id: I14d5b402c87df8fffbc29f16686fcfa18474fc48
Reviewed-on: https://skia-review.googlesource.com/17408
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/vk')
| -rw-r--r-- | src/gpu/vk/GrVkTexture.cpp | 6 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkTextureRenderTarget.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/vk/GrVkTexture.cpp b/src/gpu/vk/GrVkTexture.cpp index 4857db6f13..826f091ebe 100644 --- a/src/gpu/vk/GrVkTexture.cpp +++ b/src/gpu/vk/GrVkTexture.cpp @@ -186,7 +186,7 @@ bool GrVkTexture::reallocForMipmap(GrVkGpu* gpu, uint32_t mipLevels) { return false; } - bool renderTarget = SkToBool(fDesc.fFlags & kRenderTarget_GrSurfaceFlag); + bool renderTarget = SkToBool(this->asRenderTarget()); VkImageUsageFlags usageFlags = VK_IMAGE_USAGE_SAMPLED_BIT; if (renderTarget) { @@ -197,8 +197,8 @@ bool GrVkTexture::reallocForMipmap(GrVkGpu* gpu, uint32_t mipLevels) { GrVkImage::ImageDesc imageDesc; imageDesc.fImageType = VK_IMAGE_TYPE_2D; imageDesc.fFormat = fInfo.fFormat; - imageDesc.fWidth = fDesc.fWidth; - imageDesc.fHeight = fDesc.fHeight; + imageDesc.fWidth = this->width(); + imageDesc.fHeight = this->height(); imageDesc.fLevels = mipLevels; imageDesc.fSamples = 1; imageDesc.fImageTiling = VK_IMAGE_TILING_OPTIMAL; diff --git a/src/gpu/vk/GrVkTextureRenderTarget.cpp b/src/gpu/vk/GrVkTextureRenderTarget.cpp index cfa63be8af..2a6810d209 100644 --- a/src/gpu/vk/GrVkTextureRenderTarget.cpp +++ b/src/gpu/vk/GrVkTextureRenderTarget.cpp @@ -152,8 +152,8 @@ GrVkTextureRenderTarget::MakeWrappedTextureRenderTarget(GrVkGpu* gpu, bool GrVkTextureRenderTarget::updateForMipmap(GrVkGpu* gpu, const GrVkImageInfo& newInfo) { VkFormat pixelFormat; - GrPixelConfigToVkFormat(fDesc.fConfig, &pixelFormat); - if (fDesc.fSampleCnt) { + GrPixelConfigToVkFormat(this->config(), &pixelFormat); + if (this->numStencilSamples()) { const GrVkImageView* resolveAttachmentView = GrVkImageView::Create(gpu, newInfo.fImage, |