Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1566)

Unified Diff: cc/output/static_geometry_binding.cc

Issue 1065463002: cc: Remove GLC macro (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/output/shader.cc ('k') | cc/resources/resource_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/static_geometry_binding.cc
diff --git a/cc/output/static_geometry_binding.cc b/cc/output/static_geometry_binding.cc
index 683db2dd9594988da625c3e63280727db13c9ba8..e4af11d9491f5f16cb3c56a0dc98a795d5ba8195 100644
--- a/cc/output/static_geometry_binding.cc
+++ b/cc/output/static_geometry_binding.cc
@@ -4,7 +4,6 @@
#include "cc/output/static_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"
@@ -47,17 +46,16 @@ StaticGeometryBinding::StaticGeometryBinding(gpu::gles2::GLES2Interface* gl,
quad_indices[i] = y;
}
- GLC(gl_, gl_->GenBuffers(1, &quad_vertices_vbo_));
- GLC(gl_, gl_->GenBuffers(1, &quad_elements_vbo_));
+ gl_->GenBuffers(1, &quad_vertices_vbo_);
+ gl_->GenBuffers(1, &quad_elements_vbo_);
- GLC(gl_, gl_->BindBuffer(GL_ARRAY_BUFFER, quad_vertices_vbo_));
- GLC(gl_, gl_->BufferData(GL_ARRAY_BUFFER, sizeof(GeometryBindingQuad) * 8,
- quads, GL_STATIC_DRAW));
+ gl_->BindBuffer(GL_ARRAY_BUFFER, quad_vertices_vbo_);
+ gl_->BufferData(GL_ARRAY_BUFFER, sizeof(GeometryBindingQuad) * 8, quads,
+ GL_STATIC_DRAW);
- GLC(gl_, gl_->BindBuffer(GL_ELEMENT_ARRAY_BUFFER, quad_elements_vbo_));
- GLC(gl_, gl_->BufferData(GL_ELEMENT_ARRAY_BUFFER,
- sizeof(GeometryBindingQuadIndex) * 8, &quad_indices,
- GL_STATIC_DRAW));
+ gl_->BindBuffer(GL_ELEMENT_ARRAY_BUFFER, quad_elements_vbo_);
+ gl_->BufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(GeometryBindingQuadIndex) * 8,
+ &quad_indices, GL_STATIC_DRAW);
}
StaticGeometryBinding::~StaticGeometryBinding() {
« no previous file with comments | « cc/output/shader.cc ('k') | cc/resources/resource_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698