Commit 9e5d1174 authored by Khushal's avatar Khushal Committed by Commit Bot

Revert ui/gl: Disable Qcomm tiled rendering extension for Android.

This reverts commit d4260731 and commit
e3b5d5ac.

This extension was suspected to be responsible for some driver crashes
but this did not turn out to be the case.

TBR=zmo@chromium.org

Bug: 1042615
Change-Id: I1195e2f05c2e45d7476c2403873da0a44859144b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2148848Reviewed-by: default avatarKhushal <khushalsagar@chromium.org>
Commit-Queue: Khushal <khushalsagar@chromium.org>
Auto-Submit: Khushal <khushalsagar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759091}
parent e0d3779e
...@@ -190,18 +190,9 @@ void SharedContextState::InitializeGrContext( ...@@ -190,18 +190,9 @@ void SharedContextState::InitializeGrContext(
if (GrContextIsGL()) { if (GrContextIsGL()) {
DCHECK(context_->IsCurrent(nullptr)); DCHECK(context_->IsCurrent(nullptr));
std::vector<const char*> blacklisted_extensions;
constexpr char kQualcommTiledRendering[] = "GL_QCOM_tiled_rendering";
// We rely on |enable_threaded_texture_mailboxes| to limit the
// workaround to webview only.
if (workarounds.disable_qcomm_tiled_rendering &&
gpu_preferences.enable_threaded_texture_mailboxes) {
blacklisted_extensions.push_back(kQualcommTiledRendering);
}
sk_sp<GrGLInterface> interface(gl::init::CreateGrGLInterface( sk_sp<GrGLInterface> interface(gl::init::CreateGrGLInterface(
*context_->GetVersionInfo(), workarounds.use_es2_for_oopr, *context_->GetVersionInfo(), workarounds.use_es2_for_oopr,
progress_reporter, blacklisted_extensions)); progress_reporter));
if (!interface) { if (!interface) {
LOG(ERROR) << "OOP raster support disabled: GrGLInterface creation " LOG(ERROR) << "OOP raster support disabled: GrGLInterface creation "
"failed."; "failed.";
......
...@@ -3544,18 +3544,6 @@ ...@@ -3544,18 +3544,6 @@
"use_empty_video_hdr_metadata" "use_empty_video_hdr_metadata"
] ]
}, },
{
"id": 333,
"cr_bugs": [1042615],
"description": "Disable Qcomm_tiled_rendering extension for webview",
"os": {
"type": "android"
},
"gl_vendor": "Qualcomm.*",
"features": [
"disable_qcomm_tiled_rendering"
]
},
{ {
"id": 334, "id": 334,
"description": "NVidia drivers seem corrupt memory when all siblings of eglImage are destroyed", "description": "NVidia drivers seem corrupt memory when all siblings of eglImage are destroyed",
......
...@@ -41,7 +41,6 @@ disable_post_sub_buffers_for_onscreen_surfaces ...@@ -41,7 +41,6 @@ disable_post_sub_buffers_for_onscreen_surfaces
disable_program_cache disable_program_cache
disable_program_caching_for_transform_feedback disable_program_caching_for_transform_feedback
disable_program_disk_cache disable_program_disk_cache
disable_qcomm_tiled_rendering
disable_software_to_accelerated_canvas_upgrade disable_software_to_accelerated_canvas_upgrade
disable_texture_cube_map_seamless disable_texture_cube_map_seamless
disable_texture_storage disable_texture_storage
......
...@@ -215,8 +215,7 @@ const char* kBlacklistExtensions[] = { ...@@ -215,8 +215,7 @@ const char* kBlacklistExtensions[] = {
sk_sp<GrGLInterface> CreateGrGLInterface( sk_sp<GrGLInterface> CreateGrGLInterface(
const gl::GLVersionInfo& version_info, const gl::GLVersionInfo& version_info,
bool use_version_es2, bool use_version_es2,
gl::ProgressReporter* progress_reporter, gl::ProgressReporter* progress_reporter) {
std::vector<const char*> blacklisted_extensions) {
// Can't fake ES with desktop GL. // Can't fake ES with desktop GL.
use_version_es2 &= version_info.is_es; use_version_es2 &= version_info.is_es;
...@@ -268,8 +267,6 @@ sk_sp<GrGLInterface> CreateGrGLInterface( ...@@ -268,8 +267,6 @@ sk_sp<GrGLInterface> CreateGrGLInterface(
} }
for (const char* extension : kBlacklistExtensions) for (const char* extension : kBlacklistExtensions)
extensions.remove(extension); extensions.remove(extension);
for (const char* extension : blacklisted_extensions)
extensions.remove(extension);
GrGLInterface* interface = new GrGLInterface(); GrGLInterface* interface = new GrGLInterface();
GrGLInterface::Functions* functions = &interface->fFunctions; GrGLInterface::Functions* functions = &interface->fFunctions;
......
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
#ifndef UI_GL_INIT_CREATE_GR_GL_INTERFACE_H_ #ifndef UI_GL_INIT_CREATE_GR_GL_INTERFACE_H_
#define UI_GL_INIT_CREATE_GR_GL_INTERFACE_H_ #define UI_GL_INIT_CREATE_GR_GL_INTERFACE_H_
#include <vector>
#include "third_party/skia/include/gpu/gl/GrGLInterface.h" #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
#include "ui/gl/init/gl_init_export.h" #include "ui/gl/init/gl_init_export.h"
...@@ -24,8 +22,7 @@ namespace init { ...@@ -24,8 +22,7 @@ namespace init {
GL_INIT_EXPORT sk_sp<GrGLInterface> CreateGrGLInterface( GL_INIT_EXPORT sk_sp<GrGLInterface> CreateGrGLInterface(
const gl::GLVersionInfo& version_info, const gl::GLVersionInfo& version_info,
bool use_version_es2, bool use_version_es2,
gl::ProgressReporter* progress_reporter = nullptr, gl::ProgressReporter* progress_reporter = nullptr);
std::vector<const char*> blacklisted_extensions = {});
} // namespace init } // namespace init
} // namespace gl } // namespace gl
......
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