diff options
Diffstat (limited to 'chromium/gpu/command_buffer/client/gles2_implementation.cc')
| -rw-r--r-- | chromium/gpu/command_buffer/client/gles2_implementation.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/chromium/gpu/command_buffer/client/gles2_implementation.cc b/chromium/gpu/command_buffer/client/gles2_implementation.cc index a3044fd3704..be8c49feb86 100644 --- a/chromium/gpu/command_buffer/client/gles2_implementation.cc +++ b/chromium/gpu/command_buffer/client/gles2_implementation.cc @@ -26,8 +26,8 @@ #include "base/bits.h" #include "base/compiler_specific.h" #include "base/containers/span.h" +#include "base/cxx17_backports.h" #include "base/numerics/safe_math.h" -#include "base/stl_util.h" #include "base/strings/string_split.h" #include "base/system/sys_info.h" #include "base/threading/thread_task_runner_handle.h" @@ -387,7 +387,8 @@ void GLES2Implementation::OnGpuControlErrorMessage(const char* message, } void GLES2Implementation::OnGpuControlSwapBuffersCompleted( - const SwapBuffersCompleteParams& params) { + const SwapBuffersCompleteParams& params, + gfx::GpuFenceHandle release_fence) { auto found = pending_swap_callbacks_.find(params.swap_response.swap_id); if (found == pending_swap_callbacks_.end()) return; @@ -397,7 +398,7 @@ void GLES2Implementation::OnGpuControlSwapBuffersCompleted( auto callback = std::move(found->second); pending_swap_callbacks_.erase(found); - std::move(callback).Run(params); + std::move(callback).Run(params, std::move(release_fence)); } void GLES2Implementation::OnGpuSwitched( @@ -5133,16 +5134,20 @@ void GLES2Implementation::BindFramebufferHelper(GLenum target, } break; case GL_READ_FRAMEBUFFER: +#if EXPENSIVE_DCHECKS_ARE_ON() DCHECK(capabilities_.major_version >= 3 || IsChromiumFramebufferMultisampleAvailable()); +#endif if (bound_read_framebuffer_ != framebuffer) { bound_read_framebuffer_ = framebuffer; changed = true; } break; case GL_DRAW_FRAMEBUFFER: +#if EXPENSIVE_DCHECKS_ARE_ON() DCHECK(capabilities_.major_version >= 3 || IsChromiumFramebufferMultisampleAvailable()); +#endif if (bound_framebuffer_ != framebuffer) { bound_framebuffer_ = framebuffer; changed = true; |