summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
Diffstat (limited to 'gpu')
-rw-r--r--gpu/demos/compressed_textures/compressed_textures.cc1
-rw-r--r--gpu/demos/framework/window.cc7
2 files changed, 5 insertions, 3 deletions
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 <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
+#include <GLES2/gl2extchromium.h>
#include <math.h>
#include <stdio.h>
#include <string>
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<gpu::gles2::ContextGroup> 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());