Commit 297d4c28 authored by Julien Isorce's avatar Julien Isorce Committed by Commit Bot

Revert "Skip GpuOESEGLImageTest on ATI proprietary driver"

This reverts commit ed312194.

Reason for revert: It should have been "gpu_info.gl_vendor" instead of "gpu_info.driver_vendor"

Original change's description:
> Skip GpuOESEGLImageTest on ATI proprietary driver
> 
> Detect the GL_VENDOR string from the default GL implementation.
> If it is the ATI proprietary driver then do not switch to EGL/GLES2
> as there is a known bug and this driver crashes in eglInitialize
> instead of failing properly.
> 
> BUG=822716
> 
> Cq-Include-Trybots: luci.chromium.try:linux_optional_gpu_tests_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
> Change-Id: I00b883012c31867f938bf3f68440058738bb312b
> Reviewed-on: https://chromium-review.googlesource.com/966662
> Commit-Queue: Kenneth Russell <kbr@chromium.org>
> Reviewed-by: Kenneth Russell <kbr@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#543735}

TBR=kbr@chromium.org,cwallez@chromium.org,piman@chromium.org,julien.isorce@chromium.org

Change-Id: I88454724ed1a39688f18278404ea28d978b1331d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 822716
Cq-Include-Trybots: luci.chromium.try:linux_optional_gpu_tests_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Reviewed-on: https://chromium-review.googlesource.com/967821Reviewed-by: default avatarJulien Isorce <julien.isorce@chromium.org>
Commit-Queue: Julien Isorce <julien.isorce@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543942}
parent 2fb83e4f
...@@ -375,16 +375,6 @@ bool GpuCommandBufferTestEGL::InitializeEGLGLES2(int width, int height) { ...@@ -375,16 +375,6 @@ bool GpuCommandBufferTestEGL::InitializeEGLGLES2(int width, int height) {
return false; return false;
} }
gpu::GPUInfo gpu_info;
gpu::CollectContextGraphicsInfo(&gpu_info);
// See crbug.com/822716, the ATI proprietary driver has eglGetProcAddress
// but eglInitialize crashes with x11.
if (gpu_info.driver_vendor.find("ATI Technologies Inc.") !=
std::string::npos) {
LOG(INFO) << "Skip test, ATI proprietary driver crashes with egl/x11";
return false;
}
gl_reinitialized_ = true; gl_reinitialized_ = true;
gl::init::ShutdownGL(false /* due_to_fallback */); gl::init::ShutdownGL(false /* due_to_fallback */);
if (!GLTestHelper::InitializeGL( if (!GLTestHelper::InitializeGL(
......
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