| Index: gpu/command_buffer/service/feature_info_unittest.cc
|
| diff --git a/gpu/command_buffer/service/feature_info_unittest.cc b/gpu/command_buffer/service/feature_info_unittest.cc
|
| index dafe9d377c70f39c58f5b038326e9609fab75d20..28ec470cad4f82d3de27ea84a216aafee4d3f267 100644
|
| --- a/gpu/command_buffer/service/feature_info_unittest.cc
|
| +++ b/gpu/command_buffer/service/feature_info_unittest.cc
|
| @@ -1191,8 +1191,10 @@ TEST_P(FeatureInfoTest, InitializeIMG_texture_compression_pvrtc) {
|
|
|
| TEST_P(FeatureInfoTest, InitializeEXT_occlusion_query_boolean) {
|
| SetupInitExpectations("GL_EXT_occlusion_query_boolean");
|
| - EXPECT_THAT(info_->extensions(),
|
| - HasSubstr("GL_EXT_occlusion_query_boolean"));
|
| + if (GetContextType() == CONTEXT_TYPE_OPENGLES2) {
|
| + EXPECT_THAT(info_->extensions(),
|
| + HasSubstr("GL_EXT_occlusion_query_boolean"));
|
| + }
|
| EXPECT_TRUE(info_->feature_flags().occlusion_query_boolean);
|
| EXPECT_FALSE(info_->feature_flags(
|
| ).use_arb_occlusion_query2_for_occlusion_query_boolean);
|
| @@ -1202,8 +1204,10 @@ TEST_P(FeatureInfoTest, InitializeEXT_occlusion_query_boolean) {
|
|
|
| TEST_P(FeatureInfoTest, InitializeARB_occlusion_query) {
|
| SetupInitExpectations("GL_ARB_occlusion_query");
|
| - EXPECT_THAT(info_->extensions(),
|
| - HasSubstr("GL_EXT_occlusion_query_boolean"));
|
| + if (GetContextType() == CONTEXT_TYPE_OPENGLES2) {
|
| + EXPECT_THAT(info_->extensions(),
|
| + HasSubstr("GL_EXT_occlusion_query_boolean"));
|
| + }
|
| EXPECT_TRUE(info_->feature_flags().occlusion_query_boolean);
|
| EXPECT_FALSE(info_->feature_flags(
|
| ).use_arb_occlusion_query2_for_occlusion_query_boolean);
|
| @@ -1213,8 +1217,10 @@ TEST_P(FeatureInfoTest, InitializeARB_occlusion_query) {
|
|
|
| TEST_P(FeatureInfoTest, InitializeARB_occlusion_query2) {
|
| SetupInitExpectations("GL_ARB_occlusion_query2 GL_ARB_occlusion_query2");
|
| - EXPECT_THAT(info_->extensions(),
|
| - HasSubstr("GL_EXT_occlusion_query_boolean"));
|
| + if (GetContextType() == CONTEXT_TYPE_OPENGLES2) {
|
| + EXPECT_THAT(info_->extensions(),
|
| + HasSubstr("GL_EXT_occlusion_query_boolean"));
|
| + }
|
| EXPECT_TRUE(info_->feature_flags().occlusion_query_boolean);
|
| EXPECT_TRUE(info_->feature_flags(
|
| ).use_arb_occlusion_query2_for_occlusion_query_boolean);
|
| @@ -1222,6 +1228,15 @@ TEST_P(FeatureInfoTest, InitializeARB_occlusion_query2) {
|
| ).use_arb_occlusion_query_for_occlusion_query_boolean);
|
| }
|
|
|
| +TEST_P(FeatureInfoTest, InitializeGLES3_occlusion_query_boolean) {
|
| + SetupInitExpectationsWithGLVersion("", "", "OpenGL ES 3.0");
|
| + if (GetContextType() == CONTEXT_TYPE_OPENGLES2) {
|
| + EXPECT_THAT(info_->extensions(),
|
| + HasSubstr("GL_EXT_occlusion_query_boolean"));
|
| + }
|
| + EXPECT_TRUE(info_->feature_flags().occlusion_query_boolean);
|
| +}
|
| +
|
| TEST_P(FeatureInfoTest, InitializeOES_vertex_array_object) {
|
| SetupInitExpectations("GL_OES_vertex_array_object");
|
| EXPECT_THAT(info_->extensions(),
|
|
|