Merge vk-gl-cts/vulkan-cts-1.3.4 into vk-gl-cts/vulkan-cts-1.3.5

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

diff --git a/modules/egl/teglRenderCase.hpp b/modules/egl/teglRenderCase.hpp
index a823750..551952b 100644 (file)
--- a/modules/egl/teglRenderCase.hpp
+++ b/modules/egl/teglRenderCase.hpp
@@ -37,7 +37,7 @@ namespace egl
 class RenderCase : public SimpleConfigCase
 {
 public:
-                                               RenderCase                              (EglTestContext& eglTestCtx, const char* name, const char* description, eglw::EGLint apiMask, eglw::EGLint surfaceTypeMask, const eglu::FilterList& filters);
+                                               RenderCase                              (EglTestContext& eglTestCtx, const char* name, const char* description, eglw::EGLint surfaceTypeMask, const eglu::FilterList& filters);
        virtual                         ~RenderCase                             (void);
 
 protected:
@@ -56,10 +56,8 @@ protected:
        };
 
        virtual void            executeForConfig                (eglw::EGLDisplay display, eglw::EGLConfig config);
-
        virtual void            executeForSurface               (eglw::EGLDisplay display, eglw::EGLSurface surface, const Config& config) = DE_NULL;
 
-       eglw::EGLint            m_apiMask;
        eglw::EGLint            m_surfaceTypeMask;
 };
 
@@ -71,8 +69,9 @@ public:
 
 protected:
        virtual void    executeForSurface                       (eglw::EGLDisplay display, eglw::EGLSurface surface, const Config& config);
-
        virtual void    executeForContext                       (eglw::EGLDisplay display, eglw::EGLContext context, eglw::EGLSurface surface, const Config& config) = DE_NULL;
+
+       eglw::EGLint    m_apiMask;
 };
 
 class MultiContextRenderCase : public RenderCase
@@ -82,11 +81,11 @@ public:
        virtual                 ~MultiContextRenderCase         (void);
 
 protected:
-       void                    executeForSurface                       (eglw::EGLDisplay display, eglw::EGLSurface surface, const Config& config);
-
+       virtual void    executeForSurface                       (eglw::EGLDisplay display, eglw::EGLSurface surface, const Config& config);
        virtual void    executeForContexts                      (eglw::EGLDisplay display, eglw::EGLSurface surface, const Config& config, const std::vector<std::pair<eglw::EGLint, eglw::EGLContext> >& contexts) = DE_NULL;
 
        int                             m_numContextsPerApi;
+       eglw::EGLint    m_apiMask;
 };
 
 class RenderFilterList : public NamedFilterList