diff options
Diffstat (limited to 'www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc')
| -rw-r--r-- | www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc index d1fb6c6e50aa..f0e13f27d8d5 100644 --- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc +++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc @@ -1,4 +1,4 @@ ---- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2021-04-14 18:41:04 UTC +--- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2021-07-19 18:45:17 UTC +++ gpu/command_buffer/service/external_vk_image_backing.cc @@ -30,7 +30,7 @@ #include "ui/gl/gl_version_info.h" @@ -9,7 +9,7 @@ #include "gpu/command_buffer/service/external_vk_image_dawn_representation.h" #endif -@@ -616,7 +616,7 @@ std::unique_ptr<SharedImageRepresentationDawn> +@@ -601,7 +601,7 @@ std::unique_ptr<SharedImageRepresentationDawn> ExternalVkImageBacking::ProduceDawn(SharedImageManager* manager, MemoryTypeTracker* tracker, WGPUDevice wgpuDevice) { @@ -18,7 +18,7 @@ auto wgpu_format = viz::ToWGPUFormat(format()); if (wgpu_format == WGPUTextureFormat_Undefined) { -@@ -635,7 +635,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager +@@ -620,7 +620,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager return std::make_unique<ExternalVkImageDawnRepresentation>( manager, this, tracker, wgpuDevice, wgpu_format, std::move(memory_fd)); @@ -27,9 +27,9 @@ NOTIMPLEMENTED_LOG_ONCE(); return nullptr; #endif -@@ -648,7 +648,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna +@@ -633,7 +633,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna gl::GLApi* api = gl::g_current_gl_context; - base::Optional<ScopedDedicatedMemoryObject> memory_object; + absl::optional<ScopedDedicatedMemoryObject> memory_object; if (!use_separate_gl_texture()) { -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) |