GL: Work around driver returning negative GL_MAX_SERVER_WAIT_TIMEOUT

GL_MAX_SERVER_WAIT_TIMEOUT is only allowed to be positive, ensure that with a std::max. BUG=angleproject:2961 Change-Id: I8dd66df24d35c8ae81038d6d9cd0bad0d51f1a80 Reviewed-on: https://chromium-review.googlesource.com/c/1335889Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

GL: Work around driver returning negative GL_MAX_SERVER_WAIT_TIMEOUT
ccad5e33 · Geoff Lang · Commit Bot · f87bd3dc · ccad5e33 · ccad5e33
Commit ccad5e33 authored Nov 14, 2018 by Geoff Lang Committed by Commit Bot Nov 14, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

renderergl_utils.cpp src/libANGLE/renderer/gl/renderergl_utils.cpp +3 -1

deqp_gles3_test_expectations.txt src/tests/deqp_support/deqp_gles3_test_expectations.txt +0 -1

No files found.
--- a/src/libANGLE/renderer/gl/renderergl_utils.cpp
+++ b/src/libANGLE/renderer/gl/renderergl_utils.cpp
@@ -466,7 +466,9 @@ void GenerateCaps(const FunctionsGL *functions,
    if (functions->isAtLeastGL(gl::Version(3, 2)) || functions->hasGLExtension("GL_ARB_sync") ||
        functions->isAtLeastGLES(gl::Version(3, 0)))
    {
-        caps->maxServerWaitTimeout = QuerySingleGLInt64(functions, GL_MAX_SERVER_WAIT_TIMEOUT);
+        // Work around Linux NVIDIA driver bug where GL_TIMEOUT_IGNORED is returned.
+        caps->maxServerWaitTimeout =
+            std::max<GLint64>(QuerySingleGLInt64(functions, GL_MAX_SERVER_WAIT_TIMEOUT), 0);
    }
    else
    {

--- a/src/tests/deqp_support/deqp_gles3_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_gles3_test_expectations.txt
@@ -451,7 +451,6 @@
 2960 OPENGL : dEQP-GLES3.functional.fbo.blit.default_framebuffer.srgb8_alpha8_linear_out_of_bounds_blit_to_default = FAIL
 2960 OPENGL : dEQP-GLES3.functional.fbo.blit.default_framebuffer.srgb8_alpha8_linear_scale_blit_to_default = FAIL
 2960 OPENGL : dEQP-GLES3.functional.fbo.blit.default_framebuffer.srgb8_alpha8_nearest_scale_blit_to_default = FAIL
-2961 OPENGL : dEQP-GLES3.functional.state_query.integers64.max_server_wait_timeout_getfloat = FAIL
 // Fails on Windows + Linux.
 2222 OPENGL NVIDIA : dEQP-GLES3.functional.fbo.completeness.samples.rbo2_rbo2_rbo0 = FAIL