Enable the dEQP-GL45 package on Android

When the AOSP ES tests were added to the GL 4.5 mustpass packages
they were only added for non-Android, resulting in an empty configuration
when run on Android.

Affects:

dEQP-GL45.*

Components: OpenGL
VK-GL-CTS issue: 3314

Change-Id: I62e72cb507bf74cf5e267f35ae5e754bd8f63656

diff --git a/external/openglcts/modules/glcTestPackageRegistry.cpp b/external/openglcts/modules/glcTestPackageRegistry.cpp
index 09b55a0..563f7ef 100644 (file)
--- a/external/openglcts/modules/glcTestPackageRegistry.cpp
+++ b/external/openglcts/modules/glcTestPackageRegistry.cpp
@@ -130,11 +130,11 @@ static tcu::TestPackage* createdEQPES31Package(tcu::TestContext& testCtx)
 {
        return new deqp::gles31::TestPackage(testCtx);
 }
+#endif
 static tcu::TestPackage* createdEQPGL45Package(tcu::TestContext& testCtx)
 {
        return new deqp::gles31::TestPackageGL45(testCtx);
 }
-#endif
 static tcu::TestPackage* createES31Package(tcu::TestContext& testCtx)
 {
        return new es31cts::ES31TestPackage(testCtx, "KHR-GLES31");
@@ -308,8 +308,8 @@ void registerPackages(void)
 
 #if DE_OS != DE_OS_ANDROID
        registry->registerPackage("dEQP-GLES31", createdEQPES31Package);
-       registry->registerPackage("dEQP-GL45", createdEQPGL45Package);
 #endif
+       registry->registerPackage("dEQP-GL45", createdEQPGL45Package);
        registry->registerPackage("KHR-GLES31", createES31Package);
        registry->registerPackage("KHR-GLESEXT", createESEXTPackage);