Merge vk-gl-cts/aosp-deqp-dev into vk-gl-cts/master

Change-Id: Ie1e6a555ace52a51725be96da0fa272bf4f3b1cc

diff --cc modules/egl/teglWideColorTests.cpp
index 1ca999b,4508433..c512923
--- 1/modules/egl/teglWideColorTests.cpp
--- 2/modules/egl/teglWideColorTests.cpp
+++ b/modules/egl/teglWideColorTests.cpp
@@@ -94,15 -94,22 +94,21 @@@ public
                DRAWTYPE_GLES2_RENDER
        };
  
-                                               WideColorTest           (EglTestContext& eglTestCtx, const char* name, const char* description);
-                                               ~WideColorTest          (void);
- 
-       void                            init                            (void);
-       void                            deinit                          (void);
+                                               WideColorTest                           (EglTestContext& eglTestCtx, const char* name, const char* description);
+                                               ~WideColorTest                          (void);
+ 
+       void                            init                                            (void);
+       void                            deinit                                          (void);
+       void                            checkPixelFloatSupport          (void);
+       void                            checkDisplayP3Support           (void);
 -      void                            checkDisplayP3LinearSupport (void);
+       void                            check1010102Support                     (void);
+       void                            checkFP16Support                        (void);
+       void                            checkSCRGBSupport                       (void);
+       void                            checkSCRGBLinearSupport         (void);
  
  protected:
-       void                            initEGLSurface          (EGLConfig config);
-       void                            initEGLContext          (EGLConfig config);
+       void                            initEGLSurface                          (EGLConfig config);
+       void                            initEGLContext                          (EGLConfig config);
  
        EGLDisplay                      m_eglDisplay;
        glw::Functions          m_gl;
@@@ -280,13 -297,25 +292,17 @@@ void WideColorTest::checkDisplayP3Suppo
  
        if (!eglu::hasExtension(egl, m_eglDisplay, "EGL_EXT_gl_colorspace_display_p3"))
                TCU_THROW(NotSupportedError, "EGL_EXT_gl_colorspace_display_p3 is not supported");
+ }
  
 -void WideColorTest::checkDisplayP3LinearSupport (void)
 -{
 -      const Library&  egl     = m_eglTestCtx.getLibrary();
 -
--      if (!eglu::hasExtension(egl, m_eglDisplay, "EGL_EXT_gl_colorspace_display_p3_linear"))
--              TCU_THROW(NotSupportedError, "EGL_EXT_gl_colorspace_display_p3_linear is not supported");
 -}
 -
+ void WideColorTest::checkSCRGBSupport (void)
+ {
+       const Library&  egl     = m_eglTestCtx.getLibrary();
  
+       if (!eglu::hasExtension(egl, m_eglDisplay, "EGL_EXT_gl_colorspace_scrgb"))
+               TCU_THROW(NotSupportedError, "EGL_EXT_gl_colorspace_scrgb is not supported");
  }
  
- void WideColorTest::deinit (void)
+ void WideColorTest::checkSCRGBLinearSupport (void)
  {
        const Library&  egl     = m_eglTestCtx.getLibrary();