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

Unified Diff: gpu/command_buffer/client/gles2_demo.cc

Issue 7604027: Expose DXT3 and DXT5 through ANGLE (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 4 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 | « gpu/GLES2/gl2ext.h ('k') | gpu/command_buffer/client/gles2_demo_cc.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/client/gles2_demo.cc
diff --git a/gpu/command_buffer/client/gles2_demo.cc b/gpu/command_buffer/client/gles2_demo.cc
index 7dde7f6349a274cd0b28dfb161ba52a8d14ca7b9..974f18717c345c31593b5dc14e1b758f92a207d6 100644
--- a/gpu/command_buffer/client/gles2_demo.cc
+++ b/gpu/command_buffer/client/gles2_demo.cc
@@ -19,12 +19,14 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
#include "base/shared_memory.h"
+#include "gpu/command_buffer/service/context_group.h"
#include "gpu/command_buffer/service/gpu_scheduler.h"
#include "gpu/command_buffer/service/command_buffer_service.h"
#include "gpu/command_buffer/client/gles2_implementation.h"
#include "gpu/command_buffer/client/gles2_lib.h"
#include "gpu/command_buffer/client/gles2_demo_c.h"
#include "gpu/command_buffer/client/gles2_demo_cc.h"
+#include "ui/gfx/gl/gl_implementation.h"
#include "ui/gfx/gl/gl_surface.h"
using base::SharedMemory;
@@ -52,13 +54,20 @@ GLES2Demo::GLES2Demo() {
}
bool GLES2Demo::Setup(void* hwnd, int32 size) {
+#if defined(OS_WIN)
+ InitializeGLBindings(gfx::kGLImplementationEGLGLES2);
+#else
+ InitializeGLBindings(gfx::kGLImplementationDesktopGL);
+#endif
+
scoped_ptr<CommandBufferService> command_buffer(new CommandBufferService);
if (!command_buffer->Initialize(size))
return NULL;
+ gpu::gles2::ContextGroup::Ref group(new gpu::gles2::ContextGroup());
GpuScheduler* gpu_scheduler = GpuScheduler::Create(command_buffer.get(),
NULL,
- NULL);
+ group.get());
if (!gpu_scheduler->Initialize(reinterpret_cast<HWND>(hwnd),
gfx::Size(),
false,
« no previous file with comments | « gpu/GLES2/gl2ext.h ('k') | gpu/command_buffer/client/gles2_demo_cc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698