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

Unified Diff: webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc

Issue 10543125: gpu: Add support for GLX_EXT_texture_from_pixmap extension. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move CreateGLImage below virtual methods. Created 8 years, 2 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: webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
index e766332a6c18d3cf299f28d8cbf0d311c9aa3947..46403d702f8709c8b4946aaf9976dbc2accdc74d 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
+++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
@@ -414,7 +414,8 @@ bool GLInProcessContext::Initialize(const gfx::Size& size,
bool bind_generates_resource = false;
decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group ?
context_group->decoder_->GetContextGroup() :
- new ::gpu::gles2::ContextGroup(NULL, NULL, bind_generates_resource)));
+ new ::gpu::gles2::ContextGroup(
+ NULL, NULL, NULL, bind_generates_resource)));
gpu_scheduler_.reset(new GpuScheduler(command_buffer_.get(),
decoder_.get(),
@@ -1637,6 +1638,11 @@ void WebGraphicsContext3DInProcessCommandBufferImpl::pushGroupMarkerEXT(
DELEGATE_TO_GL(popGroupMarkerEXT, PopGroupMarkerEXT);
+DELEGATE_TO_GL_2(bindTexImage2DCHROMIUM, BindTexImage2DCHROMIUM,
+ WGC3Denum, WGC3Dint)
+DELEGATE_TO_GL_2(releaseTexImage2DCHROMIUM, ReleaseTexImage2DCHROMIUM,
+ WGC3Denum, WGC3Dint)
+
GrGLInterface* WebGraphicsContext3DInProcessCommandBufferImpl::
onCreateGrGLInterface() {
return webkit_glue::CreateCommandBufferSkiaGLBinding();

Powered by Google App Engine
This is Rietveld 408576698