Commit 75aa2b5d authored by Jonathan Backer's avatar Jonathan Backer Committed by Commit Bot

Respect blacklist of ES3 contexts

Speculative fix for https://crbug.com/901862

This bug seems very similar to https://crbug.com/791788, which had a
similar fix
https://chromium-review.googlesource.com/c/chromium/src/+/810049

This will affect Jelly Bean as per: https://cs.chromium.org/chromium/src/gpu/config/gpu_driver_bug_list.json?rcl=dba77bd3350d39eac12db8aba801a7ef0c3c190f&l=2017

Bug: 901862
Change-Id: Iccf4f54091ee0fcb5bd077ac5e06b38b83ff55c7
Reviewed-on: https://chromium-review.googlesource.com/c/1338338Reviewed-by: default avatarKhushal <khushalsagar@chromium.org>
Reviewed-by: default avatarJonathan Backer <backer@chromium.org>
Commit-Queue: Jonathan Backer <backer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608568}
parent a061c829
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "base/threading/thread_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "components/viz/common/features.h" #include "components/viz/common/features.h"
#include "gpu/command_buffer/common/context_creation_attribs.h"
#include "gpu/command_buffer/common/sync_token.h" #include "gpu/command_buffer/common/sync_token.h"
#include "gpu/command_buffer/service/feature_info.h" #include "gpu/command_buffer/service/feature_info.h"
#include "gpu/command_buffer/service/gpu_tracer.h" #include "gpu/command_buffer/service/gpu_tracer.h"
...@@ -394,9 +395,8 @@ GpuChannelManager::GetRasterDecoderContextState(ContextResult* result) { ...@@ -394,9 +395,8 @@ GpuChannelManager::GetRasterDecoderContextState(ContextResult* result) {
use_virtualized_gl_contexts ? share_group->GetSharedContext(surface.get()) use_virtualized_gl_contexts ? share_group->GetSharedContext(surface.get())
: nullptr; : nullptr;
if (!context) { if (!context) {
gl::GLContextAttribs attribs; gl::GLContextAttribs attribs = gles2::GenerateGLContextAttribs(
if (use_passthrough_decoder) ContextCreationAttribs(), use_passthrough_decoder);
attribs.global_texture_share_group = true;
context = context =
gl::init::CreateGLContext(share_group.get(), surface.get(), attribs); gl::init::CreateGLContext(share_group.get(), surface.get(), attribs);
if (!context) { if (!context) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment