| Index: src/gpu/vk/GrVkStencilAttachment.h
|
| diff --git a/src/gpu/vk/GrVkStencilAttachment.h b/src/gpu/vk/GrVkStencilAttachment.h
|
| index ab1b32bc70d20b69984f5cb060dc018d8ddfb6ad..d05a809ee91a6c6ca1a5d44e4dd1eb136bf521ef 100644
|
| --- a/src/gpu/vk/GrVkStencilAttachment.h
|
| +++ b/src/gpu/vk/GrVkStencilAttachment.h
|
| @@ -15,7 +15,7 @@
|
| class GrVkImageView;
|
| class GrVkGpu;
|
|
|
| -class GrVkStencilAttachment : public GrStencilAttachment {
|
| +class GrVkStencilAttachment : public GrStencilAttachment, public GrVkImage {
|
| public:
|
| struct Format {
|
| VkFormat fInternalFormat;
|
| @@ -30,7 +30,7 @@ public:
|
|
|
| ~GrVkStencilAttachment() override;
|
|
|
| - const GrVkImage::Resource* imageResource() const { return fImageResource; }
|
| + const GrVkImage::Resource* imageResource() const { return this->resource(); }
|
| const GrVkImageView* stencilView() const { return fStencilView; }
|
|
|
| VkFormat vkFormat() const { return fFormat.fInternalFormat; }
|
| @@ -53,10 +53,7 @@ private:
|
|
|
| Format fFormat;
|
|
|
| - const GrVkImage::Resource* fImageResource;
|
| const GrVkImageView* fStencilView;
|
| -
|
| - typedef GrStencilAttachment INHERITED;
|
| };
|
|
|
| #endif
|
|
|