diff options
Diffstat (limited to 'chromium/gpu/vulkan/vulkan_image.cc')
| -rw-r--r-- | chromium/gpu/vulkan/vulkan_image.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chromium/gpu/vulkan/vulkan_image.cc b/chromium/gpu/vulkan/vulkan_image.cc index c01245faf1f..fa199dd224d 100644 --- a/chromium/gpu/vulkan/vulkan_image.cc +++ b/chromium/gpu/vulkan/vulkan_image.cc @@ -8,6 +8,7 @@ #include <algorithm> +#include "base/logging.h" #include "base/macros.h" #include "base/optional.h" #include "base/stl_util.h" @@ -103,7 +104,8 @@ std::unique_ptr<VulkanImage> VulkanImage::Create( VkImageTiling image_tiling, VkDeviceSize device_size, uint32_t memory_type_index, - base::Optional<VulkanYCbCrInfo>& ycbcr_info) { + base::Optional<VulkanYCbCrInfo>& ycbcr_info, + VkImageCreateFlags flags) { auto image = std::make_unique<VulkanImage>(util::PassKey<VulkanImage>()); image->device_queue_ = device_queue; image->image_ = vk_image; @@ -114,6 +116,7 @@ std::unique_ptr<VulkanImage> VulkanImage::Create( image->device_size_ = device_size; image->memory_type_index_ = memory_type_index; image->ycbcr_info_ = ycbcr_info; + image->flags_ = flags; return image; } @@ -203,7 +206,7 @@ bool VulkanImage::Initialize(VulkanDeviceQueue* device_queue, vkCreateImage(vk_device, &create_info, nullptr /* pAllocator */, &image_); if (result != VK_SUCCESS) { DLOG(ERROR) << "vkCreateImage failed result:" << result; - device_queue_ = VK_NULL_HANDLE; + device_queue_ = nullptr; return false; } @@ -339,4 +342,4 @@ bool VulkanImage::InitializeWithExternalMemory(VulkanDeviceQueue* device_queue, nullptr /* requirements */); } -} // namespace gpu
\ No newline at end of file +} // namespace gpu |