Add support for ES 3.2.

Change-Id: Ib0490b74a20f0bd59b2f6c03e07ce8ea2688f85b

diff --git a/modules/gles31/functional/es31fTextureLevelStateQueryTests.cpp b/modules/gles31/functional/es31fTextureLevelStateQueryTests.cpp
index a44f3b2..b7d9fcf 100644 (file)
--- a/modules/gles31/functional/es31fTextureLevelStateQueryTests.cpp
+++ b/modules/gles31/functional/es31fTextureLevelStateQueryTests.cpp
@@ -97,7 +97,7 @@ static const char* getTextureTargetExtension (glw::GLenum target)
        }
 }
 
-static bool isCoreTextureTarget (glw::GLenum target)
+static bool isCoreTextureTarget (glw::GLenum target, const glu::ContextType& contextType)
 {
        switch (target)
        {
@@ -108,6 +108,11 @@ static bool isCoreTextureTarget (glw::GLenum target)
                case GL_TEXTURE_2D_MULTISAMPLE:
                        return true;
 
+               case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
+               case GL_TEXTURE_BUFFER:
+               case GL_TEXTURE_CUBE_MAP_ARRAY:
+                       return glu::contextSupports(contextType, glu::ApiType::es(3, 2));
+
                default:
                        return false;
        }
@@ -856,7 +861,7 @@ TextureLevelCase::~TextureLevelCase (void)
 
 void TextureLevelCase::init (void)
 {
-       if (!isCoreTextureTarget(m_target))
+       if (!isCoreTextureTarget(m_target, m_context.getRenderContext().getType()))
        {
                const char* const targetExtension = getTextureTargetExtension(m_target);
 
@@ -1497,7 +1502,8 @@ public:
 private:
        void init (void)
        {
-               if (!m_context.getContextInfo().isExtensionSupported("GL_EXT_texture_buffer"))
+               if (!m_context.getContextInfo().isExtensionSupported("GL_EXT_texture_buffer") &&
+                       !glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::es(3, 2)))
                        throw tcu::NotSupportedError("Test requires GL_EXT_texture_buffer extension");
                TextureLevelCase::init();
        }
@@ -1535,7 +1541,8 @@ public:
 private:
        void init (void)
        {
-               if (!m_context.getContextInfo().isExtensionSupported("GL_EXT_texture_buffer"))
+               if (!m_context.getContextInfo().isExtensionSupported("GL_EXT_texture_buffer") &&
+                       !glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::es(3, 2)))
                        throw tcu::NotSupportedError("Test requires GL_EXT_texture_buffer extension");
                TextureLevelCase::init();
        }
@@ -1575,7 +1582,8 @@ public:
 private:
        void init (void)
        {
-               if (!m_context.getContextInfo().isExtensionSupported("GL_EXT_texture_buffer"))
+               if (!m_context.getContextInfo().isExtensionSupported("GL_EXT_texture_buffer") &&
+                       !glu::contextSupports(m_context.getRenderContext().getType(), glu::ApiType::es(3, 2)))
                        throw tcu::NotSupportedError("Test requires GL_EXT_texture_buffer extension");
                TextureLevelCase::init();
        }