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

Unified Diff: gpu/command_buffer/service/test_helper.cc

Issue 2098913002: GLVersionInfo: alse detect es3 support with extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix references to IsES3Capable Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/service/program_manager.cc ('k') | ui/gl/gl_version_info.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/test_helper.cc
diff --git a/gpu/command_buffer/service/test_helper.cc b/gpu/command_buffer/service/test_helper.cc
index 98fb05093b93fadcef178c898b1275f432e6bc78..59363f86733a495b4cd9f935d4cf78881864d6d9 100644
--- a/gpu/command_buffer/service/test_helper.cc
+++ b/gpu/command_buffer/service/test_helper.cc
@@ -374,7 +374,7 @@ void TestHelper::SetupContextGroupInitExpectations(
.RetiresOnSaturation();
}
- if (gl_info.IsES3Capable()) {
+ if (gl_info.is_es3_capable) {
EXPECT_CALL(*gl, GetIntegerv(GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS, _))
.WillOnce(SetArgumentPointee<1>(kMaxTransformFeedbackSeparateAttribs))
.RetiresOnSaturation();
@@ -398,12 +398,12 @@ void TestHelper::SetupContextGroupInitExpectations(
EXPECT_CALL(*gl, GetIntegerv(GL_MAX_CUBE_MAP_TEXTURE_SIZE, _))
.WillOnce(SetArgumentPointee<1>(kMaxCubeMapTextureSize))
.RetiresOnSaturation();
- if (gl_info.IsES3Capable()) {
+ if (gl_info.is_es3_capable) {
EXPECT_CALL(*gl, GetIntegerv(GL_MAX_3D_TEXTURE_SIZE, _))
.WillOnce(SetArgumentPointee<1>(kMax3DTextureSize))
.RetiresOnSaturation();
}
- if (gl_info.IsES3Capable()) {
+ if (gl_info.is_es3_capable) {
EXPECT_CALL(*gl, GetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS, _))
.WillOnce(SetArgumentPointee<1>(kMaxArrayTextureLayers))
.RetiresOnSaturation();
@@ -566,7 +566,7 @@ void TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(
.WillOnce(Return(GL_FRAMEBUFFER_COMPLETE))
.RetiresOnSaturation();
- if (enable_es3 && gl_info.IsES3Capable()) {
+ if (enable_es3 && gl_info.is_es3_capable) {
EXPECT_CALL(*gl, TexImage2D(GL_TEXTURE_2D, 0, GL_R16F, width, width,
0, GL_RED, GL_FLOAT, _))
.Times(1)
@@ -943,7 +943,7 @@ void TestHelper::SetupProgramSuccessExpectations(
.RetiresOnSaturation();
}
}
- if (feature_info->gl_version_info().IsES3Capable() &&
+ if (feature_info->gl_version_info().is_es3_capable &&
!feature_info->disable_shader_translator()) {
for (size_t ii = 0; ii < num_program_outputs; ++ii) {
ProgramOutputInfo& info = program_outputs[ii];
« no previous file with comments | « gpu/command_buffer/service/program_manager.cc ('k') | ui/gl/gl_version_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698