| Index: ui/gl/test/gl_test_helper.cc
|
| diff --git a/ui/gl/test/gl_test_helper.cc b/ui/gl/test/gl_test_helper.cc
|
| index 052a1b90338861a7bc73965f99f6097fec3fd32c..89216439ea98f3d66a0cb0c22a49aa07f278ba78 100644
|
| --- a/ui/gl/test/gl_test_helper.cc
|
| +++ b/ui/gl/test/gl_test_helper.cc
|
| @@ -25,65 +25,6 @@ GLuint GLTestHelper::CreateTexture(GLenum target) {
|
| }
|
|
|
| // static
|
| -GLuint GLTestHelper::CompileShader(GLenum type, const char* src) {
|
| - GLuint shader = glCreateShader(type);
|
| - // Load the shader source.
|
| - glShaderSource(shader, 1, &src, nullptr);
|
| - // Compile the shader.
|
| - glCompileShader(shader);
|
| - return shader;
|
| -}
|
| -
|
| -// static
|
| -GLuint GLTestHelper::LoadShader(GLenum type, const char* src) {
|
| - GLuint shader = CompileShader(type, src);
|
| -
|
| - // Check the compile status.
|
| - GLint value = 0;
|
| - glGetShaderiv(shader, GL_COMPILE_STATUS, &value);
|
| - if (!value) {
|
| - char buffer[1024];
|
| - GLsizei length = 0;
|
| - glGetShaderInfoLog(shader, sizeof(buffer), &length, buffer);
|
| - std::string log(buffer, length);
|
| - EXPECT_EQ(1, value) << "Error compiling shader: " << log;
|
| - glDeleteShader(shader);
|
| - shader = 0;
|
| - }
|
| - return shader;
|
| -}
|
| -
|
| -// static
|
| -GLuint GLTestHelper::LinkProgram(GLuint vertex_shader, GLuint fragment_shader) {
|
| - // Create the program object.
|
| - GLuint program = glCreateProgram();
|
| - glAttachShader(program, vertex_shader);
|
| - glAttachShader(program, fragment_shader);
|
| - // Link the program.
|
| - glLinkProgram(program);
|
| - return program;
|
| -}
|
| -
|
| -// static
|
| -GLuint GLTestHelper::SetupProgram(GLuint vertex_shader,
|
| - GLuint fragment_shader) {
|
| - GLuint program = LinkProgram(vertex_shader, fragment_shader);
|
| - // Check the link status.
|
| - GLint linked = 0;
|
| - glGetProgramiv(program, GL_LINK_STATUS, &linked);
|
| - if (!linked) {
|
| - char buffer[1024];
|
| - GLsizei length = 0;
|
| - glGetProgramInfoLog(program, sizeof(buffer), &length, buffer);
|
| - std::string log(buffer, length);
|
| - EXPECT_EQ(1, linked) << "Error linking program: " << log;
|
| - glDeleteProgram(program);
|
| - program = 0;
|
| - }
|
| - return program;
|
| -}
|
| -
|
| -// static
|
| GLuint GLTestHelper::SetupFramebuffer(int width, int height) {
|
| GLuint color_buffer_texture = CreateTexture(GL_TEXTURE_2D);
|
| glBindTexture(GL_TEXTURE_2D, color_buffer_texture);
|
|
|