Fix the crash in angle_deqp_gles31_tests

This crash only happened on a compute test which following a render test. This root case was that after the render test, mVertexArray11 became an invalid pointer. However, compute test still went to the common path to use mVertexArray11. mVertexArray11 is never updated since compute shader doesn't need to triger DIRTY_BIT_VERTEX_ARRAY_BINDING. This patch adds checking to avoid compute test to use mVertexArray11. Besides, more ASSERT checking are added to convenient debugging. Bug: angleproject:3518, angleproject:1663, angleproject:2619 Change-Id: I446214110d762fc259899cef7635f369fa1f59a7 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1652866Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jiajia Qin <jiajia.qin@intel.com>

Fix the crash in angle_deqp_gles31_tests
3f2b4e7f · Qin Jiajia · Commit Bot · 85fef1bc · 3f2b4e7f · 3f2b4e7f
Commit 3f2b4e7f authored Jun 11, 2019 by Qin Jiajia Committed by Commit Bot Jun 13, 2019
3 changed files
--- a/src/common/bitset_utils.h
+++ b/src/common/bitset_utils.h
@@ -390,6 +390,7 @@ BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::operator>>=(std::size_t po
 template <size_t N, typename BitsT, typename ParamT>
 BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::set()
 {
+    ASSERT(mBits == (mBits & Mask(N)));
    mBits = Mask(N);
    return *this;
 }
@@ -397,6 +398,7 @@ BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::set()
 template <size_t N, typename BitsT, typename ParamT>
 BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::set(ParamT pos, bool value)
 {
+    ASSERT(mBits == (mBits & Mask(N)));
    if (value)
    {
        mBits |= Bit(pos) & Mask(N);
@@ -411,6 +413,7 @@ BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::set(ParamT pos, bool value
 template <size_t N, typename BitsT, typename ParamT>
 BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::reset()
 {
+    ASSERT(mBits == (mBits & Mask(N)));
    mBits = 0;
    return *this;
 }
@@ -418,6 +421,7 @@ BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::reset()
 template <size_t N, typename BitsT, typename ParamT>
 BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::reset(ParamT pos)
 {
+    ASSERT(mBits == (mBits & Mask(N)));
    mBits &= ~Bit(pos);
    return *this;
 }
@@ -425,6 +429,7 @@ BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::reset(ParamT pos)
 template <size_t N, typename BitsT, typename ParamT>
 BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::flip()
 {
+    ASSERT(mBits == (mBits & Mask(N)));
    mBits ^= Mask(N);
    return *this;
 }
@@ -432,6 +437,7 @@ BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::flip()
 template <size_t N, typename BitsT, typename ParamT>
 BitSetT<N, BitsT, ParamT> &BitSetT<N, BitsT, ParamT>::flip(ParamT pos)
 {
+    ASSERT(mBits == (mBits & Mask(N)));
    mBits ^= Bit(pos) & Mask(N);
    return *this;
 }

--- a/src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp
@@ -1142,24 +1142,30 @@ void StateManager11::syncState(const gl::Context *context, const gl::State::Dirt
                break;
            case gl::State::DIRTY_BIT_PROGRAM_EXECUTABLE:
            {
-                mInternalDirtyBits.set(DIRTY_BIT_PRIMITIVE_TOPOLOGY);
                invalidateShaders();
-                invalidateVertexBuffer();
-                invalidateRenderTarget();
                invalidateTexturesAndSamplers();
                invalidateProgramUniforms();
                invalidateProgramUniformBuffers();
                invalidateProgramAtomicCounterBuffers();
                invalidateProgramShaderStorageBuffers();
                invalidateDriverUniforms();
-                // If OVR_multiview2 is enabled, the attribute divisor has to be updated for each
+                const gl::Program *program = state.getProgram();
-                // binding. When using compute, there could be no vertex array.
+                if (!program || !program->hasLinkedShaderStage(gl::ShaderType::Compute))
-                if (mIsMultiviewEnabled && mVertexArray11)
                {
-                    ASSERT(mProgramD3D);
+                    mInternalDirtyBits.set(DIRTY_BIT_PRIMITIVE_TOPOLOGY);
-                    const gl::ProgramState &programState = mProgramD3D->getState();
+                    invalidateVertexBuffer();
-                    int numViews = programState.usesMultiview() ? programState.getNumViews() : 1;
+                    invalidateRenderTarget();
-                    mVertexArray11->markAllAttributeDivisorsForAdjustment(numViews);
+                    // If OVR_multiview2 is enabled, the attribute divisor has to be updated for
+                    // each binding. When using compute, there could be no vertex array.
+                    if (mIsMultiviewEnabled && mVertexArray11)
+                    {
+                        ASSERT(mProgramD3D);
+                        ASSERT(mVertexArray11 == GetImplAs<VertexArray11>(state.getVertexArray()));
+                        const gl::ProgramState &programState = mProgramD3D->getState();
+                        int numViews =
+                            programState.usesMultiview() ? programState.getNumViews() : 1;
+                        mVertexArray11->markAllAttributeDivisorsForAdjustment(numViews);
+                    }
                }
                break;
            }

--- a/src/tests/deqp_support/deqp_gles31_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_gles31_test_expectations.txt
@@ -87,7 +87,6 @@
 1442 D3D11 : dEQP-GLES31.functional.debug.error_groups.case_3 = FAIL
 1442 D3D11 : dEQP-GLES31.functional.debug.error_groups.case_9 = FAIL
 1442 D3D11 : dEQP-GLES31.functional.debug.error_groups.case_10 = FAIL
-1663 D3D11 : dEQP-GLES31.functional.draw_indirect.compute_interop.* = FAIL
 1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.float_lowp_geometry = FAIL
 1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.common.abs.float_mediump_geometry = FAIL
@@ -505,7 +504,6 @@
 1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec4_lowp_geometry = FAIL
 1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec4_mediump_geometry = FAIL
 1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.integer.findmsb.uvec4_highp_geometry = FAIL
-2619 D3D11 : dEQP-GLES31.functional.shaders.builtin_functions.uniform.findLSBMinusOne.highp_compute = FAIL
 1941 D3D11 : dEQP-GLES31.functional.shaders.builtin_constants.geometry_shader.* = FAIL
 1941 D3D11 : dEQP-GLES31.functional.state_query.program.geometry_shader_state_get_programiv = FAIL
 1941 D3D11 : dEQP-GLES31.functional.geometry_shading.query.* = FAIL