| Index: cc/output/geometry_binding.cc
|
| diff --git a/cc/output/geometry_binding.cc b/cc/output/geometry_binding.cc
|
| index 88a37deee82924cc137d58510ff739057d66fe40..9a87c7f149e44c6723cd2d2da44fae2e6cdffbea 100644
|
| --- a/cc/output/geometry_binding.cc
|
| +++ b/cc/output/geometry_binding.cc
|
| @@ -4,7 +4,6 @@
|
|
|
| #include "cc/output/geometry_binding.h"
|
|
|
| -#include "cc/output/gl_renderer.h" // For the GLC() macro.
|
| #include "gpu/command_buffer/client/gles2_interface.h"
|
| #include "ui/gfx/geometry/rect_f.h"
|
|
|
| @@ -13,9 +12,9 @@ namespace cc {
|
| void SetupGLContext(gpu::gles2::GLES2Interface* gl,
|
| GLuint quad_elements_vbo,
|
| GLuint quad_vertices_vbo) {
|
| - GLC(gl, gl->BindBuffer(GL_ELEMENT_ARRAY_BUFFER, quad_elements_vbo));
|
| + gl->BindBuffer(GL_ELEMENT_ARRAY_BUFFER, quad_elements_vbo);
|
|
|
| - GLC(gl, gl->BindBuffer(GL_ARRAY_BUFFER, quad_vertices_vbo));
|
| + gl->BindBuffer(GL_ARRAY_BUFFER, quad_vertices_vbo);
|
| // OpenGL defines the last parameter to VertexAttribPointer as type
|
| // "const GLvoid*" even though it is actually an offset into the buffer
|
| // object's data store and not a pointer to the client's address space.
|
| @@ -25,21 +24,15 @@ void SetupGLContext(gpu::gles2::GLES2Interface* gl,
|
| reinterpret_cast<const void*>(5 * sizeof(float)),
|
| };
|
|
|
| - GLC(gl,
|
| - gl->VertexAttribPointer(GeometryBinding::PositionAttribLocation(), 3,
|
| - GL_FLOAT, false, 6 * sizeof(float), offsets[0]));
|
| - GLC(gl,
|
| - gl->VertexAttribPointer(GeometryBinding::TexCoordAttribLocation(), 2,
|
| - GL_FLOAT, false, 6 * sizeof(float), offsets[1]));
|
| - GLC(gl,
|
| - gl->VertexAttribPointer(GeometryBinding::TriangleIndexAttribLocation(), 1,
|
| - GL_FLOAT, false, 6 * sizeof(float), offsets[2]));
|
| - GLC(gl,
|
| - gl->EnableVertexAttribArray(GeometryBinding::PositionAttribLocation()));
|
| - GLC(gl,
|
| - gl->EnableVertexAttribArray(GeometryBinding::TexCoordAttribLocation()));
|
| - GLC(gl, gl->EnableVertexAttribArray(
|
| - GeometryBinding::TriangleIndexAttribLocation()));
|
| + gl->VertexAttribPointer(GeometryBinding::PositionAttribLocation(), 3,
|
| + GL_FLOAT, false, 6 * sizeof(float), offsets[0]);
|
| + gl->VertexAttribPointer(GeometryBinding::TexCoordAttribLocation(), 2,
|
| + GL_FLOAT, false, 6 * sizeof(float), offsets[1]);
|
| + gl->VertexAttribPointer(GeometryBinding::TriangleIndexAttribLocation(), 1,
|
| + GL_FLOAT, false, 6 * sizeof(float), offsets[2]);
|
| + gl->EnableVertexAttribArray(GeometryBinding::PositionAttribLocation());
|
| + gl->EnableVertexAttribArray(GeometryBinding::TexCoordAttribLocation());
|
| + gl->EnableVertexAttribArray(GeometryBinding::TriangleIndexAttribLocation());
|
| }
|
|
|
| GeometryBindingQuad::GeometryBindingQuad() {
|
|
|