diff options
| author | Eric Anholt <eric@anholt.net> | 2011-10-18 12:32:35 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2011-10-18 12:49:53 -0700 |
| commit | 80824eb27c2b070bff39e95dd2a877d8d19d08fd (patch) | |
| tree | 5a809e39b7add82a5c366c7c19c2d8f3e415ef4b /tests/glean/tvertarraybgra.cpp | |
| parent | ccd5ea5ad58d3a05e24d7d3b08429a825e0976c4 (diff) | |
Update glean tests to 2a932dcf5d3aa513ecb65b51555408fb4783ba1a+fixes
This still contains one of my two blendFunc performance fixes that
were never applied. The other one got reimplemented by probing less
instead of just drawing fewer pixels, for whatever reason.
Diffstat (limited to 'tests/glean/tvertarraybgra.cpp')
| -rw-r--r-- | tests/glean/tvertarraybgra.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/glean/tvertarraybgra.cpp b/tests/glean/tvertarraybgra.cpp index f13b461ee..05e03bc2d 100644 --- a/tests/glean/tvertarraybgra.cpp +++ b/tests/glean/tvertarraybgra.cpp @@ -70,8 +70,7 @@ VertArrayBGRATest::testAPI(void) // Get glVertexAttrib() function PFNGLVERTEXATTRIBPOINTERARBPROC VertexAttribPointer = NULL; - const char *version = (const char *) glGetString(GL_VERSION); - if (version[0] == '2') { + if (GLUtils::getVersion() >= 2.0) { VertexAttribPointer = (PFNGLVERTEXATTRIBPOINTERARBPROC) GLUtils::getProcAddress("glVertexAttribPointer"); } @@ -140,18 +139,18 @@ void VertArrayBGRATest::renderPoints(bool useBGRA) { glVertexPointer(2, GL_FLOAT, 0, mPos); - glEnable(GL_VERTEX_ARRAY); + glEnableClientState(GL_VERTEX_ARRAY); if (useBGRA) glColorPointer(GL_BGRA, GL_UNSIGNED_BYTE, 0, mBGRA); else glColorPointer(4, GL_UNSIGNED_BYTE, 0, mRGBA); - glEnable(GL_COLOR_ARRAY); + glEnableClientState(GL_COLOR_ARRAY); glDrawArrays(GL_POINTS, 0, NUM_POINTS); - glDisable(GL_VERTEX_ARRAY); - glDisable(GL_COLOR_ARRAY); + glDisableClientState(GL_VERTEX_ARRAY); + glDisableClientState(GL_COLOR_ARRAY); } |