| 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 4da2bb5b236c940c3bb9f2b0c3e35c14fbf05b08..2643e6e346920466c74bcc1436f262d1edd5d21b 100644
|
| --- a/gpu/command_buffer/service/feature_info_unittest.cc
|
| +++ b/gpu/command_buffer/service/feature_info_unittest.cc
|
| @@ -256,7 +256,7 @@ TEST_P(FeatureInfoTest, InitializeNoExtensions) {
|
| GL_SRGB_ALPHA_EXT));
|
| EXPECT_TRUE(info_->validators()->render_buffer_format.IsValid(
|
| GL_SRGB8_ALPHA8_EXT));
|
| - EXPECT_TRUE(info_->validators()->frame_buffer_parameter.IsValid(
|
| + EXPECT_TRUE(info_->validators()->framebuffer_parameter.IsValid(
|
| GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT));
|
| } else {
|
| EXPECT_THAT(info_->extensions(), Not(HasSubstr("GL_EXT_sRGB")));
|
| @@ -269,7 +269,7 @@ TEST_P(FeatureInfoTest, InitializeNoExtensions) {
|
| GL_SRGB_ALPHA_EXT));
|
| EXPECT_FALSE(info_->validators()->render_buffer_format.IsValid(
|
| GL_SRGB8_ALPHA8_EXT));
|
| - EXPECT_FALSE(info_->validators()->frame_buffer_parameter.IsValid(
|
| + EXPECT_FALSE(info_->validators()->framebuffer_parameter.IsValid(
|
| GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT));
|
| }
|
|
|
| @@ -320,9 +320,9 @@ TEST_P(FeatureInfoTest, InitializeNoExtensions) {
|
| GL_TEXTURE_MAX_ANISOTROPY_EXT));
|
| EXPECT_FALSE(info_->validators()->g_l_state.IsValid(
|
| GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT));
|
| - EXPECT_FALSE(info_->validators()->frame_buffer_target.IsValid(
|
| + EXPECT_FALSE(info_->validators()->framebuffer_target.IsValid(
|
| GL_READ_FRAMEBUFFER_EXT));
|
| - EXPECT_FALSE(info_->validators()->frame_buffer_target.IsValid(
|
| + EXPECT_FALSE(info_->validators()->framebuffer_target.IsValid(
|
| GL_DRAW_FRAMEBUFFER_EXT));
|
| EXPECT_FALSE(info_->validators()->g_l_state.IsValid(
|
| GL_READ_FRAMEBUFFER_BINDING_EXT));
|
| @@ -516,7 +516,7 @@ TEST_P(FeatureInfoTest, InitializeEXT_sRGB) {
|
| GL_SRGB_ALPHA_EXT));
|
| EXPECT_FALSE(
|
| info_->validators()->render_buffer_format.IsValid(GL_SRGB8_ALPHA8_EXT));
|
| - EXPECT_FALSE(info_->validators()->frame_buffer_parameter.IsValid(
|
| + EXPECT_FALSE(info_->validators()->framebuffer_parameter.IsValid(
|
| GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT));
|
| } else {
|
| EXPECT_THAT(info_->extensions(), HasSubstr("GL_EXT_sRGB"));
|
| @@ -528,7 +528,7 @@ TEST_P(FeatureInfoTest, InitializeEXT_sRGB) {
|
| GL_SRGB_ALPHA_EXT));
|
| EXPECT_TRUE(
|
| info_->validators()->render_buffer_format.IsValid(GL_SRGB8_ALPHA8_EXT));
|
| - EXPECT_TRUE(info_->validators()->frame_buffer_parameter.IsValid(
|
| + EXPECT_TRUE(info_->validators()->framebuffer_parameter.IsValid(
|
| GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT));
|
| }
|
| }
|
| @@ -846,7 +846,7 @@ TEST_P(FeatureInfoTest, Initialize_sRGBGLES3) {
|
| GL_SRGB_ALPHA_EXT));
|
| EXPECT_FALSE(info_->validators()->render_buffer_format.IsValid(
|
| GL_SRGB8_ALPHA8_EXT));
|
| - EXPECT_FALSE(info_->validators()->frame_buffer_parameter.IsValid(
|
| + EXPECT_FALSE(info_->validators()->framebuffer_parameter.IsValid(
|
| GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT));
|
| }
|
|
|
| @@ -911,9 +911,9 @@ TEST_P(FeatureInfoTest, InitializeEXT_framebuffer_multisample) {
|
| EXPECT_TRUE(info_->feature_flags().chromium_framebuffer_multisample);
|
| EXPECT_THAT(info_->extensions(),
|
| HasSubstr("GL_CHROMIUM_framebuffer_multisample"));
|
| - EXPECT_TRUE(info_->validators()->frame_buffer_target.IsValid(
|
| + EXPECT_TRUE(info_->validators()->framebuffer_target.IsValid(
|
| GL_READ_FRAMEBUFFER_EXT));
|
| - EXPECT_TRUE(info_->validators()->frame_buffer_target.IsValid(
|
| + EXPECT_TRUE(info_->validators()->framebuffer_target.IsValid(
|
| GL_DRAW_FRAMEBUFFER_EXT));
|
| EXPECT_TRUE(info_->validators()->g_l_state.IsValid(
|
| GL_READ_FRAMEBUFFER_BINDING_EXT));
|
| @@ -929,9 +929,9 @@ TEST_P(FeatureInfoTest, InitializeANGLE_framebuffer_multisample) {
|
| EXPECT_TRUE(info_->feature_flags().chromium_framebuffer_multisample);
|
| EXPECT_THAT(info_->extensions(),
|
| HasSubstr("GL_CHROMIUM_framebuffer_multisample"));
|
| - EXPECT_TRUE(info_->validators()->frame_buffer_target.IsValid(
|
| + EXPECT_TRUE(info_->validators()->framebuffer_target.IsValid(
|
| GL_READ_FRAMEBUFFER_EXT));
|
| - EXPECT_TRUE(info_->validators()->frame_buffer_target.IsValid(
|
| + EXPECT_TRUE(info_->validators()->framebuffer_target.IsValid(
|
| GL_DRAW_FRAMEBUFFER_EXT));
|
| EXPECT_TRUE(info_->validators()->g_l_state.IsValid(
|
| GL_READ_FRAMEBUFFER_BINDING_EXT));
|
| @@ -949,9 +949,9 @@ TEST_P(FeatureInfoTest, InitializeANGLE_framebuffer_multisampleWithoutANGLE) {
|
| EXPECT_FALSE(info_->feature_flags().chromium_framebuffer_multisample);
|
| EXPECT_THAT(info_->extensions(),
|
| Not(HasSubstr("GL_CHROMIUM_framebuffer_multisample")));
|
| - EXPECT_FALSE(info_->validators()->frame_buffer_target.IsValid(
|
| + EXPECT_FALSE(info_->validators()->framebuffer_target.IsValid(
|
| GL_READ_FRAMEBUFFER_EXT));
|
| - EXPECT_FALSE(info_->validators()->frame_buffer_target.IsValid(
|
| + EXPECT_FALSE(info_->validators()->framebuffer_target.IsValid(
|
| GL_DRAW_FRAMEBUFFER_EXT));
|
| EXPECT_FALSE(info_->validators()->g_l_state.IsValid(
|
| GL_READ_FRAMEBUFFER_BINDING_EXT));
|
| @@ -973,7 +973,7 @@ TEST_P(FeatureInfoTest, InitializeEXT_multisampled_render_to_texture) {
|
| GL_MAX_SAMPLES_EXT));
|
| EXPECT_TRUE(info_->validators()->render_buffer_parameter.IsValid(
|
| GL_RENDERBUFFER_SAMPLES_EXT));
|
| - EXPECT_TRUE(info_->validators()->frame_buffer_parameter.IsValid(
|
| + EXPECT_TRUE(info_->validators()->framebuffer_parameter.IsValid(
|
| GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT));
|
| }
|
|
|
| @@ -989,7 +989,7 @@ TEST_P(FeatureInfoTest, InitializeIMG_multisampled_render_to_texture) {
|
| GL_MAX_SAMPLES_EXT));
|
| EXPECT_TRUE(info_->validators()->render_buffer_parameter.IsValid(
|
| GL_RENDERBUFFER_SAMPLES_EXT));
|
| - EXPECT_TRUE(info_->validators()->frame_buffer_parameter.IsValid(
|
| + EXPECT_TRUE(info_->validators()->framebuffer_parameter.IsValid(
|
| GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT));
|
| }
|
|
|
|
|