| Index: ui/gl/test/gl_image_test_template.h
|
| diff --git a/ui/gl/test/gl_image_test_template.h b/ui/gl/test/gl_image_test_template.h
|
| index 9bee385a9f87db5de8211d5562b3993701420e6a..342ae37ee38c92d74054b67d372e9adcf7b8699f 100644
|
| --- a/ui/gl/test/gl_image_test_template.h
|
| +++ b/ui/gl/test/gl_image_test_template.h
|
| @@ -17,6 +17,7 @@
|
| #include "ui/gfx/buffer_types.h"
|
| #include "ui/gl/gl_bindings.h"
|
| #include "ui/gl/gl_context.h"
|
| +#include "ui/gl/gl_helper.h"
|
| #include "ui/gl/gl_image.h"
|
| #include "ui/gl/gl_implementation.h"
|
| #include "ui/gl/gl_surface.h"
|
| @@ -89,7 +90,7 @@ TYPED_TEST_CASE_P(GLImageCopyTest);
|
|
|
| TYPED_TEST_P(GLImageCopyTest, CopyTexImage) {
|
| const Size image_size(256, 256);
|
| - const uint8_t image_color[] = {0xff, 0xff, 0, 0xff};
|
| + const uint8_t image_color[] = {0x10, 0x20, 0, 0xff};
|
| const uint8_t texture_color[] = {0, 0, 0xff, 0xff};
|
|
|
| GLuint framebuffer =
|
| @@ -145,15 +146,14 @@ TYPED_TEST_P(GLImageCopyTest, CopyTexImage) {
|
| );
|
| // clang-format on
|
|
|
| - GLuint vertex_shader =
|
| - GLTestHelper::LoadShader(GL_VERTEX_SHADER, kVertexShader);
|
| + GLuint vertex_shader = GLHelper::LoadShader(GL_VERTEX_SHADER, kVertexShader);
|
| bool is_gles = GetGLImplementation() == kGLImplementationEGLGLES2;
|
| - GLuint fragment_shader = GLTestHelper::LoadShader(
|
| + GLuint fragment_shader = GLHelper::LoadShader(
|
| GL_FRAGMENT_SHADER,
|
| base::StringPrintf("%s%s", is_gles ? kShaderFloatPrecision : "",
|
| kFragmentShader)
|
| .c_str());
|
| - GLuint program = GLTestHelper::SetupProgram(vertex_shader, fragment_shader);
|
| + GLuint program = GLHelper::SetupProgram(vertex_shader, fragment_shader);
|
| EXPECT_NE(program, 0u);
|
| glUseProgram(program);
|
|
|
|
|