| 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 7f265328a548353f939763f45f767a4b0dab0220..3ad2093b7eba1b9476a22b6901d79f43b24f8e2d 100644
|
| --- a/gpu/command_buffer/service/test_helper.cc
|
| +++ b/gpu/command_buffer/service/test_helper.cc
|
| @@ -343,7 +343,7 @@ void TestHelper::SetupContextGroupInitExpectations(
|
| .RetiresOnSaturation();
|
| if (strstr(extensions, "GL_EXT_framebuffer_multisample") ||
|
| strstr(extensions, "GL_EXT_multisampled_render_to_texture") ||
|
| - gl_info.is_es3) {
|
| + gl_info.is_es3 || gl_info.is_desktop_core_profile) {
|
| EXPECT_CALL(*gl, GetIntegerv(GL_MAX_SAMPLES, _))
|
| .WillOnce(SetArgumentPointee<1>(kMaxSamples))
|
| .RetiresOnSaturation();
|
| @@ -353,6 +353,18 @@ void TestHelper::SetupContextGroupInitExpectations(
|
| .RetiresOnSaturation();
|
| }
|
|
|
| + if (strstr(extensions, "GL_EXT_draw_buffers") ||
|
| + strstr(extensions, "GL_ARB_draw_buffers") ||
|
| + (gl_info.is_es3 && strstr(extensions, "GL_NV_draw_buffers")) ||
|
| + gl_info.is_desktop_core_profile) {
|
| + EXPECT_CALL(*gl, GetIntegerv(GL_MAX_COLOR_ATTACHMENTS_EXT, _))
|
| + .WillOnce(SetArgumentPointee<1>(8))
|
| + .RetiresOnSaturation();
|
| + EXPECT_CALL(*gl, GetIntegerv(GL_MAX_DRAW_BUFFERS_ARB, _))
|
| + .WillOnce(SetArgumentPointee<1>(8))
|
| + .RetiresOnSaturation();
|
| + }
|
| +
|
| if (gl_info.IsAtLeastGL(3, 3) ||
|
| (gl_info.IsAtLeastGL(3, 2) &&
|
| strstr(extensions, "GL_ARB_blend_func_extended")) ||
|
| @@ -396,7 +408,8 @@ void TestHelper::SetupContextGroupInitExpectations(
|
| .WillOnce(SetArgumentPointee<1>(kMaxArrayTextureLayers))
|
| .RetiresOnSaturation();
|
| }
|
| - if (strstr(extensions, "GL_ARB_texture_rectangle")) {
|
| + if (strstr(extensions, "GL_ARB_texture_rectangle") ||
|
| + gl_info.is_desktop_core_profile) {
|
| EXPECT_CALL(*gl, GetIntegerv(GL_MAX_RECTANGLE_TEXTURE_SIZE, _))
|
| .WillOnce(SetArgumentPointee<1>(kMaxRectangleTextureSize))
|
| .RetiresOnSaturation();
|
| @@ -408,7 +421,7 @@ void TestHelper::SetupContextGroupInitExpectations(
|
| .WillOnce(SetArgumentPointee<1>(kMaxVertexTextureImageUnits))
|
| .RetiresOnSaturation();
|
|
|
| - if (gl_info.is_es) {
|
| + if (gl_info.is_es || gl_info.is_desktop_core_profile) {
|
| EXPECT_CALL(*gl, GetIntegerv(GL_MAX_FRAGMENT_UNIFORM_VECTORS, _))
|
| .WillOnce(SetArgumentPointee<1>(kMaxFragmentUniformVectors))
|
| .RetiresOnSaturation();
|
|
|