Clean up ANGLE test extension functions.
None of these functions needed to be member functions. Also make the
naming more consistent.
Bug: angleproject:3393
Change-Id: I7aafe2269a48af703a87bd9a8cf4cfab9e177dd3
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1574673
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
diff --git a/src/tests/gl_tests/MultiviewDrawTest.cpp b/src/tests/gl_tests/MultiviewDrawTest.cpp
index 27026a1..003cea3 100644
--- a/src/tests/gl_tests/MultiviewDrawTest.cpp
+++ b/src/tests/gl_tests/MultiviewDrawTest.cpp
@@ -358,12 +358,12 @@
bool requestOcclusionQueryExtension()
{
- if (extensionRequestable("GL_EXT_occlusion_query_boolean"))
+ if (IsGLExtensionRequestable("GL_EXT_occlusion_query_boolean"))
{
glRequestExtensionANGLE("GL_EXT_occlusion_query_boolean");
}
- if (!extensionEnabled("GL_EXT_occlusion_query_boolean"))
+ if (!IsGLExtensionEnabled("GL_EXT_occlusion_query_boolean"))
{
std::cout << "Test skipped due to missing GL_EXT_occlusion_query_boolean." << std::endl;
return false;
@@ -751,7 +751,7 @@
TEST_P(MultiviewDrawValidationTest, ActiveTimeElapsedQuery)
{
ANGLE_SKIP_TEST_IF(!requestMultiviewExtension());
- ANGLE_SKIP_TEST_IF(!ensureExtensionEnabled("GL_EXT_disjoint_timer_query"));
+ ANGLE_SKIP_TEST_IF(!EnsureGLExtensionEnabled("GL_EXT_disjoint_timer_query"));
ANGLE_GL_PROGRAM(dualViewProgram, kDualViewVSSource, kDualViewFSSource);