Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Unified Diff: src/gpu/vk/GrVkImage.h

Issue 1906623002: Update min Vulkan version to 1.0.8.0, and fix various bugs (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/vk/GrVkGpu.cpp ('k') | src/gpu/vk/GrVkImage.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/vk/GrVkImage.h
diff --git a/src/gpu/vk/GrVkImage.h b/src/gpu/vk/GrVkImage.h
index 13c6e369d0fe3252a2918a7baa22e48453ee8d53..5b3b527202be99236a340485fe93354ec6591baf 100644
--- a/src/gpu/vk/GrVkImage.h
+++ b/src/gpu/vk/GrVkImage.h
@@ -28,11 +28,17 @@ public:
VkImage fImage;
VkDeviceMemory fAlloc;
Flags fFlags;
+ VkFormat fFormat;
- Resource() : INHERITED(), fImage(VK_NULL_HANDLE), fAlloc(VK_NULL_HANDLE), fFlags(kNo_Flags) {}
+ Resource()
+ : INHERITED()
+ , fImage(VK_NULL_HANDLE)
+ , fAlloc(VK_NULL_HANDLE)
+ , fFlags(kNo_Flags)
+ , fFormat(VK_FORMAT_UNDEFINED) {}
- Resource(VkImage image, VkDeviceMemory alloc, Flags flags)
- : fImage(image), fAlloc(alloc), fFlags(flags) {}
+ Resource(VkImage image, VkDeviceMemory alloc, Flags flags, VkFormat format)
+ : fImage(image), fAlloc(alloc), fFlags(flags), fFormat(format) {}
~Resource() override {}
private:
@@ -44,8 +50,8 @@ public:
// for wrapped textures
class BorrowedResource : public Resource {
public:
- BorrowedResource(VkImage image, VkDeviceMemory alloc, Flags flags)
- : Resource(image, alloc, flags) {}
+ BorrowedResource(VkImage image, VkDeviceMemory alloc, Flags flags, VkFormat format)
+ : Resource(image, alloc, flags, format) {}
private:
void freeGPUData(const GrVkGpu* gpu) const override;
};
@@ -70,7 +76,8 @@ public:
VkImageLayout currentLayout() const { return fCurrentLayout; }
- void setImageLayout(const GrVkGpu* gpu, VkImageLayout newLayout,
+ void setImageLayout(const GrVkGpu* gpu,
+ VkImageLayout newLayout,
VkAccessFlags srcAccessMask,
VkAccessFlags dstAccessMask,
VkPipelineStageFlags srcStageMask,
« no previous file with comments | « src/gpu/vk/GrVkGpu.cpp ('k') | src/gpu/vk/GrVkImage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698