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

Unified Diff: gpu/command_buffer/tests/gl_manager.cc

Issue 10534173: GPU Program Caching (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: tiny fix for android and windows build Created 8 years, 5 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
Index: gpu/command_buffer/tests/gl_manager.cc
diff --git a/gpu/command_buffer/tests/gl_manager.cc b/gpu/command_buffer/tests/gl_manager.cc
index 14db7734484cd868a4d0afb2fff488b4dfd0a0cb..2ac3535440d7f65ca3a255258932e9cdc9d15339 100644
--- a/gpu/command_buffer/tests/gl_manager.cc
+++ b/gpu/command_buffer/tests/gl_manager.cc
@@ -2,6 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "gpu/command_buffer/tests/gl_manager.h"
+
+#include <vector>
+
#include "base/at_exit.h"
#include "base/bind.h"
#include "gpu/command_buffer/client/gles2_implementation.h"
@@ -12,7 +16,6 @@
#include "gpu/command_buffer/service/context_group.h"
#include "gpu/command_buffer/service/gpu_scheduler.h"
#include "gpu/command_buffer/service/mailbox_manager.h"
-#include "gpu/command_buffer/tests/gl_manager.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gl/gl_context.h"
#include "ui/gl/gl_share_group.h"
@@ -95,7 +98,9 @@ void GLManager::Setup(
if (!context_group) {
context_group = new gles2::ContextGroup(
- mailbox_manager_.get(), kBindGeneratesResource);
+ mailbox_manager_.get(),
+ kBindGeneratesResource,
+ NULL);
}
decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group));

Powered by Google App Engine
This is Rietveld 408576698