diff options
| author |  Brian Salomon <bsalomon@google.com> | 2018-07-30 10:24:13 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-30 14:54:25 +0000 |
| commit | 60dd8c746428fb6218fff5f437b1b7c5256bba13 (patch) | |
| tree | bc9c5c5b16de0ecf6d60452d69dbfd870126f97a /src/gpu/vk/GrVkTexture.cpp | |
| parent | 12e42565886ac6b28cbcae40d63ee093bde3e630 (diff) | |
Introduce enum class for texture type.
This represents the GL texture "target" but at the API-neutral level. It
will be needed here because proxy's that wrap imported texture's need to
know about sampling restrictions.
Change-Id: Ie811a6f6d04ba1b04faa6908422dca64e8e447c8
Reviewed-on: https://skia-review.googlesource.com/144304
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/vk/GrVkTexture.cpp')
| -rw-r--r-- | src/gpu/vk/GrVkTexture.cpp | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/gpu/vk/GrVkTexture.cpp b/src/gpu/vk/GrVkTexture.cpp index 1f1d1bbc1a..93171c0aa9 100644 --- a/src/gpu/vk/GrVkTexture.cpp +++ b/src/gpu/vk/GrVkTexture.cpp @@ -30,11 +30,10 @@ GrVkTexture::GrVkTexture(GrVkGpu* gpu, sk_sp<GrVkImageLayout> layout, const GrVkImageView* view, GrMipMapsStatus mipMapsStatus) - : GrSurface(gpu, desc) - , GrVkImage(info, std::move(layout), GrBackendObjectOwnership::kOwned) - , INHERITED(gpu, desc, kTexture2DSampler_GrSLType, highest_filter_mode(desc.fConfig), - mipMapsStatus) - , fTextureView(view) { + : GrSurface(gpu, desc) + , GrVkImage(info, std::move(layout), GrBackendObjectOwnership::kOwned) + , INHERITED(gpu, desc, GrTextureType::k2D, highest_filter_mode(desc.fConfig), mipMapsStatus) + , fTextureView(view) { SkASSERT((GrMipMapsStatus::kNotAllocated == mipMapsStatus) == (1 == info.fLevelCount)); this->registerWithCache(budgeted); } @@ -47,11 +46,10 @@ GrVkTexture::GrVkTexture(GrVkGpu* gpu, const GrVkImageView* view, GrMipMapsStatus mipMapsStatus, GrBackendObjectOwnership ownership) - : GrSurface(gpu, desc) - , GrVkImage(info, std::move(layout), ownership) - , INHERITED(gpu, desc, kTexture2DSampler_GrSLType, highest_filter_mode(desc.fConfig), - mipMapsStatus) - , fTextureView(view) { + : GrSurface(gpu, desc) + , GrVkImage(info, std::move(layout), ownership) + , INHERITED(gpu, desc, GrTextureType::k2D, highest_filter_mode(desc.fConfig), mipMapsStatus) + , fTextureView(view) { SkASSERT((GrMipMapsStatus::kNotAllocated == mipMapsStatus) == (1 == info.fLevelCount)); this->registerWithCacheWrapped(); } @@ -64,11 +62,10 @@ GrVkTexture::GrVkTexture(GrVkGpu* gpu, const GrVkImageView* view, GrMipMapsStatus mipMapsStatus, GrBackendObjectOwnership ownership) - : GrSurface(gpu, desc) - , GrVkImage(info, layout, ownership) - , INHERITED(gpu, desc, kTexture2DSampler_GrSLType, highest_filter_mode(desc.fConfig), - mipMapsStatus) - , fTextureView(view) { + : GrSurface(gpu, desc) + , GrVkImage(info, layout, ownership) + , INHERITED(gpu, desc, GrTextureType::k2D, highest_filter_mode(desc.fConfig), mipMapsStatus) + , fTextureView(view) { SkASSERT((GrMipMapsStatus::kNotAllocated == mipMapsStatus) == (1 == info.fLevelCount)); } |