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

Unified Diff: cc/resources/video_resource_updater.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/resources/resource_provider.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/video_resource_updater.cc
diff --git a/cc/resources/video_resource_updater.cc b/cc/resources/video_resource_updater.cc
index ed57e6fb9edbf95f7b4277b868f8dce2fe8969ec..c0d6923fcf11724b20d5a06714a14862bbec59d5 100644
--- a/cc/resources/video_resource_updater.cc
+++ b/cc/resources/video_resource_updater.cc
@@ -29,11 +29,9 @@ class SyncPointClientImpl : public media::VideoFrame::SyncPointClient {
public:
explicit SyncPointClientImpl(gpu::gles2::GLES2Interface* gl) : gl_(gl) {}
~SyncPointClientImpl() override {}
- uint32 InsertSyncPoint() override {
- return GLC(gl_, gl_->InsertSyncPointCHROMIUM());
- }
+ uint32 InsertSyncPoint() override { return gl_->InsertSyncPointCHROMIUM(); }
void WaitSyncPoint(uint32 sync_point) override {
- GLC(gl_, gl_->WaitSyncPointCHROMIUM(sync_point));
+ gl_->WaitSyncPointCHROMIUM(sync_point);
}
private:
@@ -108,10 +106,10 @@ VideoResourceUpdater::AllocateResource(const gfx::Size& plane_size,
gpu::gles2::GLES2Interface* gl = context_provider_->ContextGL();
- GLC(gl, gl->GenMailboxCHROMIUM(mailbox.name));
+ gl->GenMailboxCHROMIUM(mailbox.name);
ResourceProvider::ScopedWriteLockGL lock(resource_provider_, resource_id);
- GLC(gl, gl->ProduceTextureDirectCHROMIUM(lock.texture_id(), GL_TEXTURE_2D,
- mailbox.name));
+ gl->ProduceTextureDirectCHROMIUM(lock.texture_id(), GL_TEXTURE_2D,
+ mailbox.name);
}
all_resources_.push_front(
PlaneResource(resource_id, plane_size, format, mailbox));
@@ -447,8 +445,7 @@ void VideoResourceUpdater::RecycleResource(
ContextProvider* context_provider = updater->context_provider_;
if (context_provider && sync_point) {
- GLC(context_provider->ContextGL(),
- context_provider->ContextGL()->WaitSyncPointCHROMIUM(sync_point));
+ context_provider->ContextGL()->WaitSyncPointCHROMIUM(sync_point);
}
if (lost_resource) {
« no previous file with comments | « cc/resources/resource_provider.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698