diff options
Diffstat (limited to 'webkit/gpu')
4 files changed, 23 insertions, 1 deletions
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc index e766332..46403d7 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(); diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h index 6dd92aa..d4b0b3a 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h @@ -461,6 +461,9 @@ class WebGraphicsContext3DInProcessCommandBufferImpl WGC3Denum target, WGC3Dint width, WGC3Dint height, WGC3Duint ioSurfaceId, WGC3Duint plane); + virtual void bindTexImage2DCHROMIUM(WGC3Denum target, WGC3Dint imageId); + virtual void releaseTexImage2DCHROMIUM(WGC3Denum target, WGC3Dint imageId); + virtual void texStorage2DEXT( WGC3Denum target, WGC3Dint levels, WGC3Duint internalformat, WGC3Dint width, WGC3Dint height); diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc index 6decabf..ff11852 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc @@ -1698,6 +1698,16 @@ void WebGraphicsContext3DInProcessImpl::copyTextureCHROMIUM( NOTIMPLEMENTED(); } +void WebGraphicsContext3DInProcessImpl::bindTexImage2DCHROMIUM( + WGC3Denum target, WGC3Dint imageId) { + NOTIMPLEMENTED(); +} + +void WebGraphicsContext3DInProcessImpl::releaseTexImage2DCHROMIUM( + WGC3Denum target, WGC3Dint imageId) { + NOTIMPLEMENTED(); +} + GrGLInterface* WebGraphicsContext3DInProcessImpl::onCreateGrGLInterface() { return gfx::CreateInProcessSkiaGLBinding(); } diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_impl.h index 0b248ce..eb0ed57 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_impl.h +++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.h @@ -489,6 +489,9 @@ class WebGraphicsContext3DInProcessImpl : public WebGraphicsContext3D { virtual void consumeTextureCHROMIUM(WGC3Denum target, const WGC3Dbyte* mailbox); + virtual void bindTexImage2DCHROMIUM(WGC3Denum target, WGC3Dint imageId); + virtual void releaseTexImage2DCHROMIUM(WGC3Denum target, WGC3Dint imageId); + protected: virtual GrGLInterface* onCreateGrGLInterface(); |