diff options
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)); } |