Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: gpu/command_buffer/service/feature_info_unittest.cc

Issue 2103773002: Occlusion query feature is already in GL ES3.0 spec, not an extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: unit test cases fail Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gpu/command_buffer/service/feature_info.h" 5 #include "gpu/command_buffer/service/feature_info.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 1173 matching lines...) Expand 10 before | Expand all | Expand 10 after
1184 EXPECT_TRUE(info_->validators()->compressed_texture_format.IsValid( 1184 EXPECT_TRUE(info_->validators()->compressed_texture_format.IsValid(
1185 GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG)); 1185 GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG));
1186 EXPECT_TRUE(info_->validators()->compressed_texture_format.IsValid( 1186 EXPECT_TRUE(info_->validators()->compressed_texture_format.IsValid(
1187 GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG)); 1187 GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG));
1188 EXPECT_TRUE(info_->validators()->compressed_texture_format.IsValid( 1188 EXPECT_TRUE(info_->validators()->compressed_texture_format.IsValid(
1189 GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG)); 1189 GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG));
1190 } 1190 }
1191 1191
1192 TEST_P(FeatureInfoTest, InitializeEXT_occlusion_query_boolean) { 1192 TEST_P(FeatureInfoTest, InitializeEXT_occlusion_query_boolean) {
1193 SetupInitExpectations("GL_EXT_occlusion_query_boolean"); 1193 SetupInitExpectations("GL_EXT_occlusion_query_boolean");
1194 EXPECT_THAT(info_->extensions(), 1194 if (GetContextType() == CONTEXT_TYPE_OPENGLES2) {
1195 HasSubstr("GL_EXT_occlusion_query_boolean")); 1195 EXPECT_THAT(info_->extensions(),
1196 HasSubstr("GL_EXT_occlusion_query_boolean"));
1197 }
1196 EXPECT_TRUE(info_->feature_flags().occlusion_query_boolean); 1198 EXPECT_TRUE(info_->feature_flags().occlusion_query_boolean);
1197 EXPECT_FALSE(info_->feature_flags( 1199 EXPECT_FALSE(info_->feature_flags(
1198 ).use_arb_occlusion_query2_for_occlusion_query_boolean); 1200 ).use_arb_occlusion_query2_for_occlusion_query_boolean);
1199 EXPECT_FALSE(info_->feature_flags( 1201 EXPECT_FALSE(info_->feature_flags(
1200 ).use_arb_occlusion_query_for_occlusion_query_boolean); 1202 ).use_arb_occlusion_query_for_occlusion_query_boolean);
1201 } 1203 }
1202 1204
1203 TEST_P(FeatureInfoTest, InitializeARB_occlusion_query) { 1205 TEST_P(FeatureInfoTest, InitializeARB_occlusion_query) {
1204 SetupInitExpectations("GL_ARB_occlusion_query"); 1206 SetupInitExpectations("GL_ARB_occlusion_query");
1205 EXPECT_THAT(info_->extensions(), 1207 if (GetContextType() == CONTEXT_TYPE_OPENGLES2) {
1206 HasSubstr("GL_EXT_occlusion_query_boolean")); 1208 EXPECT_THAT(info_->extensions(),
1209 HasSubstr("GL_EXT_occlusion_query_boolean"));
1210 }
1207 EXPECT_TRUE(info_->feature_flags().occlusion_query_boolean); 1211 EXPECT_TRUE(info_->feature_flags().occlusion_query_boolean);
1208 EXPECT_FALSE(info_->feature_flags( 1212 EXPECT_FALSE(info_->feature_flags(
1209 ).use_arb_occlusion_query2_for_occlusion_query_boolean); 1213 ).use_arb_occlusion_query2_for_occlusion_query_boolean);
1210 EXPECT_TRUE(info_->feature_flags( 1214 EXPECT_TRUE(info_->feature_flags(
1211 ).use_arb_occlusion_query_for_occlusion_query_boolean); 1215 ).use_arb_occlusion_query_for_occlusion_query_boolean);
1212 } 1216 }
1213 1217
1214 TEST_P(FeatureInfoTest, InitializeARB_occlusion_query2) { 1218 TEST_P(FeatureInfoTest, InitializeARB_occlusion_query2) {
1215 SetupInitExpectations("GL_ARB_occlusion_query2 GL_ARB_occlusion_query2"); 1219 SetupInitExpectations("GL_ARB_occlusion_query2 GL_ARB_occlusion_query2");
1216 EXPECT_THAT(info_->extensions(), 1220 if (GetContextType() == CONTEXT_TYPE_OPENGLES2) {
1217 HasSubstr("GL_EXT_occlusion_query_boolean")); 1221 EXPECT_THAT(info_->extensions(),
1222 HasSubstr("GL_EXT_occlusion_query_boolean"));
1223 }
1218 EXPECT_TRUE(info_->feature_flags().occlusion_query_boolean); 1224 EXPECT_TRUE(info_->feature_flags().occlusion_query_boolean);
1219 EXPECT_TRUE(info_->feature_flags( 1225 EXPECT_TRUE(info_->feature_flags(
1220 ).use_arb_occlusion_query2_for_occlusion_query_boolean); 1226 ).use_arb_occlusion_query2_for_occlusion_query_boolean);
1221 EXPECT_FALSE(info_->feature_flags( 1227 EXPECT_FALSE(info_->feature_flags(
1222 ).use_arb_occlusion_query_for_occlusion_query_boolean); 1228 ).use_arb_occlusion_query_for_occlusion_query_boolean);
1223 } 1229 }
1224 1230
1231 TEST_P(FeatureInfoTest, InitializeGLES3_occlusion_query_boolean) {
1232 SetupInitExpectationsWithGLVersion("", "", "OpenGL ES 3.0");
1233 if (GetContextType() == CONTEXT_TYPE_OPENGLES2) {
1234 EXPECT_THAT(info_->extensions(),
1235 HasSubstr("GL_EXT_occlusion_query_boolean"));
1236 }
1237 EXPECT_TRUE(info_->feature_flags().occlusion_query_boolean);
1238 }
1239
1225 TEST_P(FeatureInfoTest, InitializeOES_vertex_array_object) { 1240 TEST_P(FeatureInfoTest, InitializeOES_vertex_array_object) {
1226 SetupInitExpectations("GL_OES_vertex_array_object"); 1241 SetupInitExpectations("GL_OES_vertex_array_object");
1227 EXPECT_THAT(info_->extensions(), 1242 EXPECT_THAT(info_->extensions(),
1228 HasSubstr("GL_OES_vertex_array_object")); 1243 HasSubstr("GL_OES_vertex_array_object"));
1229 EXPECT_TRUE(info_->feature_flags().native_vertex_array_object); 1244 EXPECT_TRUE(info_->feature_flags().native_vertex_array_object);
1230 } 1245 }
1231 1246
1232 TEST_P(FeatureInfoTest, InitializeARB_vertex_array_object) { 1247 TEST_P(FeatureInfoTest, InitializeARB_vertex_array_object) {
1233 SetupInitExpectations("GL_ARB_vertex_array_object"); 1248 SetupInitExpectations("GL_ARB_vertex_array_object");
1234 EXPECT_THAT(info_->extensions(), 1249 EXPECT_THAT(info_->extensions(),
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
1515 EXPECT_TRUE(info_->validators()->render_buffer_format.IsValid(GL_RG8_EXT)); 1530 EXPECT_TRUE(info_->validators()->render_buffer_format.IsValid(GL_RG8_EXT));
1516 } 1531 }
1517 1532
1518 TEST_P(FeatureInfoTest, InitializeCHROMIUM_ycbcr_422_imageTrue) { 1533 TEST_P(FeatureInfoTest, InitializeCHROMIUM_ycbcr_422_imageTrue) {
1519 SetupInitExpectations("GL_APPLE_ycbcr_422"); 1534 SetupInitExpectations("GL_APPLE_ycbcr_422");
1520 EXPECT_TRUE(info_->feature_flags().chromium_image_ycbcr_422); 1535 EXPECT_TRUE(info_->feature_flags().chromium_image_ycbcr_422);
1521 } 1536 }
1522 1537
1523 } // namespace gles2 1538 } // namespace gles2
1524 } // namespace gpu 1539 } // namespace gpu
OLDNEW
« gpu/command_buffer/service/feature_info.cc ('K') | « gpu/command_buffer/service/feature_info.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698