projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: faaa445)
Fix bad merge in DeqpTestRunner.java
authorPaul Thomson <paulthomson@google.com>
Wed, 3 Mar 2021 12:29:11 +0000 (12:29 +0000)
committerAlexander Galazin <Alexander.Galazin@arm.com>
Tue, 9 Mar 2021 16:14:26 +0000 (16:14 +0000)
Components: Android

Change-Id: Ib557d85deb85dc528fde2765e8c6442bffe67fc4

android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java patch | blob | history

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 e372d8f..07c38ba 100644 (file)
--- a/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java
+++ b/android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java
@@ -2125,7 +2125,6 @@ public class DeqpTestRunner implements IBuildReceiver, IDeviceTest,
             final boolean isSupportedApi = (isOpenGlEsPackage() && isSupportedGles())
                                             || (isVulkanPackage() && isSupportedVulkan())
                                             || (!isOpenGlEsPackage() && !isVulkanPackage());
-                                            || (!isOpenGlEsPackage() && !isVulkanPackage());
             if (mCollectTestsOnly
                 || !isSupportedApi
                 || ((isVulkanPackage() || isOpenGlEsPackage()) && !claimedDeqpLevelIsRecentEnough())) {
Domain: Graphics System / GL;