Merge vk-gl-cts/vulkan-cts-1.1.2 into vk-gl-cts/vulkan-cts-1.1.3

[platform/upstream/VK-GL-CTS.git] / modules / egl / teglTestPackage.hpp

diff --git a/modules/egl/teglTestPackage.hpp b/modules/egl/teglTestPackage.hpp
index a6b1073..c9f0db2 100644 (file)
--- a/modules/egl/teglTestPackage.hpp
+++ b/modules/egl/teglTestPackage.hpp
@@ -26,39 +26,12 @@
 #include "tcuDefs.hpp"
 #include "tcuTestPackage.hpp"
 #include "teglTestCase.hpp"
-#include "tcuResource.hpp"
 
 namespace deqp
 {
 namespace egl
 {
 
-class TestCaseWrapper : public tcu::TestCaseWrapper
-{
-public:
-                                                                       TestCaseWrapper                 (EglTestContext& eglTestContext);
-                                                                       ~TestCaseWrapper                (void);
-
-       bool                                                    initTestCase                    (tcu::TestCase* testCase);
-       bool                                                    deinitTestCase                  (tcu::TestCase* testCase);
-
-       tcu::TestNode::IterateResult    iterateTestCase                 (tcu::TestCase* testCase);
-};
-
-class PackageContext
-{
-public:
-                                                                       PackageContext                  (tcu::TestContext& testCtx);
-                                                                       ~PackageContext                 (void);
-
-       EglTestContext&                                 getEglTestContext               (void) { return m_eglTestCtx;   }
-       tcu::TestCaseWrapper&                   getTestCaseWrapper              (void) { return m_caseWrapper;  }
-
-private:
-       EglTestContext                                  m_eglTestCtx;
-       TestCaseWrapper                                 m_caseWrapper;
-};
-
 class TestPackage : public tcu::TestPackage
 {
 public:
@@ -68,12 +41,10 @@ public:
        virtual void                                    init                                    (void);
        virtual void                                    deinit                                  (void);
 
-       tcu::TestCaseWrapper&                   getTestCaseWrapper              (void) { return m_packageCtx->getTestCaseWrapper(); }
-       tcu::ResourcePrefix&                    getArchive                              (void) { return m_archive; }
+       tcu::TestCaseExecutor*                  createExecutor                  (void) const;
 
 private:
-       PackageContext*                                 m_packageCtx;
-       tcu::ResourcePrefix                             m_archive;
+       EglTestContext*                                 m_eglTestCtx;
 };
 
 } // egl