diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-21 21:48:59 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-21 21:48:59 +0000 |
| commit | 77f8db0759552d202e3ea14e2b13ba5eab969c6e (patch) | |
| tree | 2fe63e4b1b755394f32a899530e628bffa0e6195 /gpu/command_buffer/service/feature_info_unittest.cc | |
| parent | c26d2468448bacaf840b1d58c2a9971306f51261 (diff) | |
| download | chromium_src-77f8db0759552d202e3ea14e2b13ba5eab969c6e.zip chromium_src-77f8db0759552d202e3ea14e2b13ba5eab969c6e.tar.gz chromium_src-77f8db0759552d202e3ea14e2b13ba5eab969c6e.tar.bz2 | |
Change GL_EXT_texture_compression_s3tc to GL_CHROMIUM_texture_compression_dxt3
and GL_CHROMIUM_texture_compression_dxt5 because we don't support all the
features of GL_EXT_texture_compression_s3tc.
TEST=unit tests
BUG=none
Review URL: http://codereview.chromium.org/6715005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78926 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service/feature_info_unittest.cc')
| -rw-r--r-- | gpu/command_buffer/service/feature_info_unittest.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gpu/command_buffer/service/feature_info_unittest.cc b/gpu/command_buffer/service/feature_info_unittest.cc index 4db4229..cc96bc8 100644 --- a/gpu/command_buffer/service/feature_info_unittest.cc +++ b/gpu/command_buffer/service/feature_info_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -77,6 +77,10 @@ TEST_F(FeatureInfoTest, InitializeNoExtensions) { EXPECT_THAT(info_.extensions(), Not(HasSubstr("GL_OES_texture_npot"))); EXPECT_THAT(info_.extensions(), Not(HasSubstr("GL_EXT_texture_compression_dxt1"))); + EXPECT_THAT(info_.extensions(), + Not(HasSubstr("GL_CHROMIUM_texture_compression_dxt3"))); + EXPECT_THAT(info_.extensions(), + Not(HasSubstr("GL_CHROMIUM_texture_compression_dxt5"))); EXPECT_FALSE(info_.feature_flags().npot_ok); EXPECT_FALSE(info_.feature_flags().chromium_webglsl); EXPECT_FALSE(info_.validators()->compressed_texture_format.IsValid( @@ -153,7 +157,9 @@ TEST_F(FeatureInfoTest, InitializeDXTExtensionGL) { EXPECT_THAT(info_.extensions(), HasSubstr("GL_EXT_texture_compression_dxt1")); EXPECT_THAT(info_.extensions(), - HasSubstr("GL_EXT_texture_compression_s3tc")); + HasSubstr("GL_CHROMIUM_texture_compression_dxt3")); + EXPECT_THAT(info_.extensions(), + HasSubstr("GL_CHROMIUM_texture_compression_dxt5")); EXPECT_TRUE(info_.validators()->compressed_texture_format.IsValid( GL_COMPRESSED_RGB_S3TC_DXT1_EXT)); EXPECT_TRUE(info_.validators()->compressed_texture_format.IsValid( |