Commit 7d20dd4a by Geoff Lang Committed by Commit Bot

Add missing EXT_disjoint_timer_query entry points to eglGetProcAddress.

BUG=angleproject:1405 BUG=angleproject:1265 Change-Id: I823e1393943f7531374c094ce590fa0a6f49d213 Reviewed-on: https://chromium-review.googlesource.com/351776Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>
parent c20ab279
...@@ -1411,6 +1411,19 @@ __eglMustCastToProperFunctionPointerType EGLAPIENTRY GetProcAddress(const char * ...@@ -1411,6 +1411,19 @@ __eglMustCastToProperFunctionPointerType EGLAPIENTRY GetProcAddress(const char *
INSERT_PROC_ADDRESS(gl, GetQueryivEXT); INSERT_PROC_ADDRESS(gl, GetQueryivEXT);
INSERT_PROC_ADDRESS(gl, GetQueryObjectuivEXT); INSERT_PROC_ADDRESS(gl, GetQueryObjectuivEXT);
// GL_EXT_disjoint_timer_query
INSERT_PROC_ADDRESS(gl, GenQueriesEXT);
INSERT_PROC_ADDRESS(gl, DeleteQueriesEXT);
INSERT_PROC_ADDRESS(gl, IsQueryEXT);
INSERT_PROC_ADDRESS(gl, BeginQueryEXT);
INSERT_PROC_ADDRESS(gl, EndQueryEXT);
INSERT_PROC_ADDRESS(gl, QueryCounterEXT);
INSERT_PROC_ADDRESS(gl, GetQueryivEXT);
INSERT_PROC_ADDRESS(gl, GetQueryObjectivEXT);
INSERT_PROC_ADDRESS(gl, GetQueryObjectuivEXT);
INSERT_PROC_ADDRESS(gl, GetQueryObjecti64vEXT);
INSERT_PROC_ADDRESS(gl, GetQueryObjectui64vEXT);
// GL_EXT_draw_buffers // GL_EXT_draw_buffers
INSERT_PROC_ADDRESS(gl, DrawBuffersEXT); INSERT_PROC_ADDRESS(gl, DrawBuffersEXT);
......
...@@ -79,6 +79,29 @@ class TimerQueriesTest : public ANGLETest ...@@ -79,6 +79,29 @@ class TimerQueriesTest : public ANGLETest
GLuint mProgramCostly; GLuint mProgramCostly;
}; };
// Test that all proc addresses are loadable
TEST_P(TimerQueriesTest, ProcAddresses)
{
if (!extensionEnabled("GL_EXT_disjoint_timer_query"))
{
std::cout << "Test skipped because GL_EXT_disjoint_timer_query is not available."
<< std::endl;
return;
}
ASSERT_NE(nullptr, eglGetProcAddress("glGenQueriesEXT"));
ASSERT_NE(nullptr, eglGetProcAddress("glDeleteQueriesEXT"));
ASSERT_NE(nullptr, eglGetProcAddress("glIsQueryEXT"));
ASSERT_NE(nullptr, eglGetProcAddress("glBeginQueryEXT"));
ASSERT_NE(nullptr, eglGetProcAddress("glEndQueryEXT"));
ASSERT_NE(nullptr, eglGetProcAddress("glQueryCounterEXT"));
ASSERT_NE(nullptr, eglGetProcAddress("glGetQueryivEXT"));
ASSERT_NE(nullptr, eglGetProcAddress("glGetQueryObjectivEXT"));
ASSERT_NE(nullptr, eglGetProcAddress("glGetQueryObjectuivEXT"));
ASSERT_NE(nullptr, eglGetProcAddress("glGetQueryObjecti64vEXT"));
ASSERT_NE(nullptr, eglGetProcAddress("glGetQueryObjectui64vEXT"));
}
// Tests the time elapsed query // Tests the time elapsed query
TEST_P(TimerQueriesTest, TimeElapsed) TEST_P(TimerQueriesTest, TimeElapsed)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment