Cherry-pick the following missing commits from nyc-mr1-dev prior to b/33090058, which...

am: 72d633abbd

Change-Id: I557bd48c7fc66c79ad4a0befcffd1e6f9e8fe54f

diff --git a/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java b/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java
index 4a27522..465d2da 100644 (file)
--- a/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java
+++ b/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java
@@ -2031,7 +2031,7 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest,
         }
 
         mRemainingTests = new LinkedList<>(mTestInstances.keySet());
-
+        long startTime = System.currentTimeMillis();
         listener.testRunStarted(getId(), mRemainingTests.size());
 
         try {
@@ -2062,7 +2062,7 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest,
             uninstallTestApk();
         }
 
-        listener.testRunEnded(0, emptyMap);
+        listener.testRunEnded(System.currentTimeMillis() - startTime, emptyMap);
     }
 
    /**

diff --git a/modules/gles31/functional/es31fNegativeTextureApiTests.cpp b/modules/gles31/functional/es31fNegativeTextureApiTests.cpp
index 9cad1a8..6038b40 100644 (file)
--- a/modules/gles31/functional/es31fNegativeTextureApiTests.cpp
+++ b/modules/gles31/functional/es31fNegativeTextureApiTests.cpp
@@ -2674,9 +2674,9 @@ void teximage3d (NegativeTestContext& ctx)
        ctx.endSection();
 
        ctx.beginSection("GL_INVALID_OPERATION is generated if target is GL_TEXTURE_3D and format is GL_DEPTH_COMPONENT, or GL_DEPTH_STENCIL.");
-       ctx.glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA, 1, 1, 1, 0, GL_DEPTH_STENCIL, GL_UNSIGNED_BYTE, 0);
+       ctx.glTexImage3D(GL_TEXTURE_3D, 0, GL_DEPTH_STENCIL, 1, 1, 1, 0, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, 0);
        ctx.expectError(GL_INVALID_OPERATION);
-       ctx.glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA, 1, 1, 1, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, 0);
+       ctx.glTexImage3D(GL_TEXTURE_3D, 0, GL_DEPTH_COMPONENT, 1, 1, 1, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, 0);
        ctx.expectError(GL_INVALID_OPERATION);
        ctx.endSection();
 

diff --git a/modules/gles31/functional/es31fSampleVariableTests.cpp b/modules/gles31/functional/es31fSampleVariableTests.cpp
index bfd04e5..0570508 100644 (file)
--- a/modules/gles31/functional/es31fSampleVariableTests.cpp
+++ b/modules/gles31/functional/es31fSampleVariableTests.cpp
@@ -1340,7 +1340,7 @@ void SampleMaskCountCase::preDraw (void)
                // Worst case: all but one shader invocations get one sample, one shader invocation the rest of the samples
                const int minInvocationCount = ((m_numTargetSamples + 1) / 2);
                const int minBitCount = 1;
-               const int maxBitCount = (m_numTargetSamples <= 2) ? (1) : (m_numTargetSamples - ((minInvocationCount-1) * minBitCount));
+               const int maxBitCount = m_numTargetSamples - ((minInvocationCount-1) * minBitCount);
 
                if (maxLoc == -1)
                        throw tcu::TestError("Location of u_maxBitCount was -1");