Fix dEQP_GLES3.functional.negative_api.shader.program_binary

The frontend was not taking into account the fact that some drivers do not support program binaries. The fix is that now glGetProgramiv(GL_PROGRAM_BINARY_LENGTH) returns 0 under such circumstances. Bug: angleproject:2780 Change-Id: I4ea2cda6bb4612e69dbd7e00b3d43b97ee3b3c3d Reviewed-on: https://chromium-review.googlesource.com/1188768Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

Fix dEQP_GLES3.functional.negative_api.shader.program_binary
c14ab2a7 · Shahbaz Youssefi · Commit Bot · 89664843 · c14ab2a7 · c14ab2a7
Commit c14ab2a7 authored Aug 24, 2018 by Shahbaz Youssefi Committed by Commit Bot Aug 27, 2018
Showing with 4 additions and 4 deletions

queryutils.cpp src/libANGLE/queryutils.cpp +3 -1

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

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

No files found.
--- a/src/libANGLE/queryutils.cpp
+++ b/src/libANGLE/queryutils.cpp
@@ -1043,7 +1043,9 @@ void QueryProgramiv(const Context *context, const Program *program, GLenum pname
            *params = program->getActiveUniformMaxLength();
            return;
        case GL_PROGRAM_BINARY_LENGTH_OES:
-            *params = program->getBinaryLength(context);
+            *params = context->getCaps().programBinaryFormats.empty()
+                          ? 0
+                          : program->getBinaryLength(context);
            return;
        case GL_ACTIVE_UNIFORM_BLOCKS:
            *params = program->getActiveUniformBlockCount();

--- a/src/libANGLE/renderer/gl/renderergl_utils.cpp
+++ b/src/libANGLE/renderer/gl/renderergl_utils.cpp
@@ -381,7 +381,7 @@ void GenerateCaps(const FunctionsGL *functions,
    if (functions->isAtLeastGL(gl::Version(4, 1)) ||
        functions->hasGLExtension("GL_ARB_get_program_binary") ||
        functions->isAtLeastGLES(gl::Version(3, 0)) ||
-        functions->hasGLExtension("GL_OES_get_program_binary"))
+        functions->hasGLESExtension("GL_OES_get_program_binary"))
    {
        // Able to support the GL_PROGRAM_BINARY_ANGLE format as long as another program binary
        // format is available.

--- a/src/tests/deqp_support/deqp_gles3_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_gles3_test_expectations.txt
@@ -325,14 +325,12 @@

 // Linux Intel specific
 2349 LINUX INTEL : dEQP-GLES3.functional.fbo.blit.default_framebuffer* = FAIL
-2349 LINUX INTEL : dEQP-GLES3.functional.negative_api.shader.program_binary = FAIL

 // Mac failures (overbroad suppresions)
 2137 MAC : dEQP-GLES3.functional.fbo.blit.default_framebuffer.* = FAIL
 2137 MAC : dEQP-GLES3.functional.fbo.blit.rect.out_of_bounds_reverse_* = FAIL
 2137 MAC : dEQP-GLES3.functional.implementation_limits.compressed_texture_formats = FAIL
 2137 MAC : dEQP-GLES3.functional.implementation_limits.num_compressed_texture_formats = FAIL
-2137 MAC : dEQP-GLES3.functional.negative_api.shader.program_binary = FAIL
 2137 MAC : dEQP-GLES3.functional.primitive_restart.* = FAIL
 2137 MAC : dEQP-GLES3.functional.shaders.linkage.varying.rules.vertex_declare_fragment_use = FAIL
 2137 MAC : dEQP-GLES3.functional.shaders.scoping.valid.function_parameter_hides_struct_type_fragment = FAIL