diff options
| author | Brian Paul <brianp@vmware.com> | 2009-07-10 07:52:48 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-07-10 07:56:43 -0600 |
| commit | 4ecf545d5201b4ff50b89a912c9f53b8a480a423 (patch) | |
| tree | aa8043c026b1eaebbbbe17d422568a570fa4c384 | |
| parent | b97a8a32716e2c22aab85d996f2cba9b08d1b967 (diff) | |
texcombine: remove check for GL_ARB_texture_env_dot3, update crossbar extension check
GL_ARB_texture_env_dot3 is slightly different than GL_EXT_texture_env_dot3
(different enum values, for one thing) so the extensions aren't equivalent.
If a GL implementation supports the ARB version but not the EXT version
we'll generate GL errors.
Also, when checking for GL_ARB_texture_env_crossbar, also check for
GL_ARB_texture_env_combine, just to be safe.
This test should be freshened up a bit to work with the ARB versions of
the EXT extensions. For example, GL_ARB_texture_env_combine has a
GL_SUBTRACT mode that's not in GL_EXT_texture_env_combine.
| -rw-r--r-- | src/glean/ttexcombine.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/glean/ttexcombine.cpp b/src/glean/ttexcombine.cpp index be9b421..d4a43c2 100644 --- a/src/glean/ttexcombine.cpp +++ b/src/glean/ttexcombine.cpp @@ -1441,10 +1441,9 @@ TexCombineTest::runOne(BasicResult& r, Window& w) { // Test the availability of the DOT3 extenstion haveDot3 = GLUtils::haveExtensions("GL_EXT_texture_env_dot3"); - if (0 == haveDot3) - haveDot3 = GLUtils::haveExtensions("GL_ARB_texture_env_dot3"); - haveCrossbar = GLUtils::haveExtensions("GL_ARB_texture_env_crossbar"); + haveCrossbar = GLUtils::haveExtensions("GL_ARB_texture_env_crossbar") + && GLUtils::haveExtensions("GL_ARB_texture_env_combine"); // compute RGB error tolerance { |