From 15fd0760d6abbce28307bd4279a7f02a605f1cb5 Mon Sep 17 00:00:00 2001 From: Alexander Galazin Date: Mon, 14 Dec 2020 12:51:26 +0100 Subject: [PATCH] Support GL 4.5 context in the precision and draw tests Affects: dEQP-GLES3*.functional.shaders.builtin_functions.precision.* dEQP-GLES3*.functional.draw_base_vertex.* Components: AOSP Change-Id: I8539b5b31bdbf206d89ef3dc1f74917f655a266b --- modules/glshared/glsBuiltinPrecisionTests.cpp | 3 ++- modules/glshared/glsDrawTest.cpp | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/glshared/glsBuiltinPrecisionTests.cpp b/modules/glshared/glsBuiltinPrecisionTests.cpp index a46fc04..a1a9962 100644 --- a/modules/glshared/glsBuiltinPrecisionTests.cpp +++ b/modules/glshared/glsBuiltinPrecisionTests.cpp @@ -5063,7 +5063,8 @@ IterateResult FuncCaseBase::iterate (void) { MovePtr info (ContextInfo::create(getRenderContext())); - if (!m_extension.empty() && !info->isExtensionSupported(m_extension.c_str())) + if (!m_extension.empty() && !info->isExtensionSupported(m_extension.c_str()) && + !glu::contextSupports(getRenderContext().getType(), glu::ApiType::core(4, 5))) throw NotSupportedError("Unsupported extension: " + m_extension); runTest(); diff --git a/modules/glshared/glsDrawTest.cpp b/modules/glshared/glsDrawTest.cpp index b8cff9c..a026d49 100644 --- a/modules/glshared/glsDrawTest.cpp +++ b/modules/glshared/glsDrawTest.cpp @@ -3162,8 +3162,9 @@ DrawTest::IterateResult DrawTest::iterate (void) spec.drawMethod == DrawTestSpec::DRAWMETHOD_DRAWELEMENTS_INSTANCED_BASEVERTEX || spec.drawMethod == DrawTestSpec::DRAWMETHOD_DRAWELEMENTS_RANGED_BASEVERTEX) { - const bool supportsES32 = contextSupports(m_renderCtx.getType(), glu::ApiType::es(3, 2)); - TCU_CHECK_AND_THROW(NotSupportedError, supportsES32 || m_contextInfo->isExtensionSupported("GL_EXT_draw_elements_base_vertex"), "GL_EXT_draw_elements_base_vertex is not supported."); + const bool supportsES32orGL45 = contextSupports(m_renderCtx.getType(), glu::ApiType::es(3, 2)) || + contextSupports(m_renderCtx.getType(), glu::ApiType::core(4, 5)); + TCU_CHECK_AND_THROW(NotSupportedError, supportsES32orGL45 || m_contextInfo->isExtensionSupported("GL_EXT_draw_elements_base_vertex"), "GL_EXT_draw_elements_base_vertex is not supported."); } const bool drawStep = (m_iteration % 2) == 0; -- 2.7.4