From 7d6cd05105f332529eba18f22e9381e96aa41984 Mon Sep 17 00:00:00 2001 From: "dongseong.hwang@intel.com" Date: Tue, 25 Jun 2013 00:30:25 +0000 Subject: Build fix for gpu/demos. Review URL: https://chromiumcodereview.appspot.com/17483002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208317 0039d316-1c4b-4281-b951-d872f2087c98 --- gpu/demos/compressed_textures/compressed_textures.cc | 1 + gpu/demos/framework/window.cc | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'gpu') diff --git a/gpu/demos/compressed_textures/compressed_textures.cc b/gpu/demos/compressed_textures/compressed_textures.cc index 2624723..4c32bd2 100644 --- a/gpu/demos/compressed_textures/compressed_textures.cc +++ b/gpu/demos/compressed_textures/compressed_textures.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include #include +#include #include #include #include diff --git a/gpu/demos/framework/window.cc b/gpu/demos/framework/window.cc index b2fb5f8..fd288c7 100644 --- a/gpu/demos/framework/window.cc +++ b/gpu/demos/framework/window.cc @@ -71,7 +71,7 @@ bool Window::CreateRenderContext(gfx::AcceleratedWidget hwnd) { { TransferBufferManager* manager = new TransferBufferManager(); transfer_buffer_manager_.reset(manager); - EXPECT_TRUE(manager->Initialize()); + manager->Initialize(); } command_buffer_.reset( new CommandBufferService(transfer_buffer_manager_.get())); @@ -80,7 +80,7 @@ bool Window::CreateRenderContext(gfx::AcceleratedWidget hwnd) { } scoped_refptr group(new gpu::gles2::ContextGroup( - NULL, NULL, true)); + NULL, NULL, NULL, true)); decoder_.reset(gpu::gles2::GLES2Decoder::Create(group.get())); if (!decoder_.get()) @@ -133,7 +133,8 @@ bool Window::CreateRenderContext(gfx::AcceleratedWidget hwnd) { NULL, transfer_buffer_.get(), false, - true)); + true, + NULL)); ::gles2::SetGLContext(gles2_implementation_.get()); -- cgit v1.1