glshared: Add watchdog touches to avoid timeouts on slow hardware

Based on diffs posted to deqp-external-requests

Bug: b/71753331
Bug: b/67854695

Change-Id: Id25e334814caf65f72b76e66d3b07fccba5ad355
Component: AOSP

diff --git a/modules/glshared/glsDrawTest.cpp b/modules/glshared/glsDrawTest.cpp
index 155bd35..c74dd4c 100644 (file)
--- a/modules/glshared/glsDrawTest.cpp
+++ b/modules/glshared/glsDrawTest.cpp
@@ -3279,6 +3279,7 @@ DrawTest::IterateResult DrawTest::iterate (void)
                        else
                        {
                                m_glArrayPack->render(spec.primitive, spec.drawMethod, spec.first, (int)primitiveElementCount, DrawTestSpec::INDEXTYPE_LAST, DE_NULL, 0, 0, spec.instanceCount, spec.indirectOffset, 0, coordScale, colorScale, DE_NULL);
+                               m_testCtx.touchWatchdog();
                                m_rrArrayPack->render(spec.primitive, spec.drawMethod, spec.first, (int)primitiveElementCount, DrawTestSpec::INDEXTYPE_LAST, DE_NULL, 0, 0, spec.instanceCount, spec.indirectOffset, 0, coordScale, colorScale, DE_NULL);
                        }
                }

diff --git a/modules/glshared/glsVertexArrayTests.cpp b/modules/glshared/glsVertexArrayTests.cpp
index 6509f6d..a9f6471 100644 (file)
--- a/modules/glshared/glsVertexArrayTests.cpp
+++ b/modules/glshared/glsVertexArrayTests.cpp
@@ -2127,6 +2127,7 @@ MultiVertexArrayTest::IterateResult MultiVertexArrayTest::iterate (void)
                try
                {
                        m_glArrayPack->render(m_spec.primitive, m_spec.first, m_spec.drawCount * (int)primitiveSize, useVao, coordScale, colorScale);
+                       m_testCtx.touchWatchdog();
                        m_rrArrayPack->render(m_spec.primitive, m_spec.first, m_spec.drawCount * (int)primitiveSize, useVao, coordScale, colorScale);
                }
                catch (glu::Error& err)