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

Side by Side Diff: content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc

Issue 7538008: Delete copy_texture_to_parent_texture from GPU command buffer code. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #if defined(ENABLE_GPU) 5 #if defined(ENABLE_GPU)
6 6
7 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h" 7 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h"
8 8
9 #include <GLES2/gl2.h> 9 #include <GLES2/gl2.h>
10 #ifndef GL_GLEXT_PROTOTYPES 10 #ifndef GL_GLEXT_PROTOTYPES
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 125
126 if (render_directly_to_web_view) { 126 if (render_directly_to_web_view) {
127 RenderView* renderview = RenderView::FromWebView(web_view); 127 RenderView* renderview = RenderView::FromWebView(web_view);
128 if (!renderview) 128 if (!renderview)
129 return false; 129 return false;
130 130
131 web_view_ = web_view; 131 web_view_ = web_view;
132 context_ = RendererGLContext::CreateViewContext( 132 context_ = RendererGLContext::CreateViewContext(
133 host, 133 host,
134 renderview->routing_id(), 134 renderview->routing_id(),
135 !attributes.noExtensions,
135 share_group, 136 share_group,
136 preferred_extensions, 137 preferred_extensions,
137 attribs, 138 attribs,
138 active_url); 139 active_url);
139 if (context_) { 140 if (context_) {
140 context_->SetSwapBuffersCallback( 141 context_->SetSwapBuffersCallback(
141 NewCallback(this, 142 NewCallback(this,
142 &WebGraphicsContext3DCommandBufferImpl::OnSwapBuffersComplete)); 143 &WebGraphicsContext3DCommandBufferImpl::OnSwapBuffersComplete));
143 } 144 }
144 } else { 145 } else {
145 context_ = RendererGLContext::CreateOffscreenContext( 146 context_ = RendererGLContext::CreateOffscreenContext(
146 host, 147 host,
147 gfx::Size(1, 1), 148 gfx::Size(1, 1),
149 !attributes.noExtensions,
148 share_group, 150 share_group,
149 preferred_extensions, 151 preferred_extensions,
150 attribs, 152 attribs,
151 active_url); 153 active_url);
152 web_view_ = NULL; 154 web_view_ = NULL;
153 } 155 }
154 if (!context_) 156 if (!context_)
155 return false; 157 return false;
156 158
157 gl_ = context_->GetImplementation(); 159 gl_ = context_->GetImplementation();
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 target, level, xoffset, yoffset, width, height, format, type, access); 358 target, level, xoffset, yoffset, width, height, format, type, access);
357 } 359 }
358 360
359 void WebGraphicsContext3DCommandBufferImpl::unmapTexSubImage2DCHROMIUM( 361 void WebGraphicsContext3DCommandBufferImpl::unmapTexSubImage2DCHROMIUM(
360 const void* mem) { 362 const void* mem) {
361 gl_->UnmapTexSubImage2DCHROMIUM(mem); 363 gl_->UnmapTexSubImage2DCHROMIUM(mem);
362 } 364 }
363 365
364 void WebGraphicsContext3DCommandBufferImpl::copyTextureToParentTextureCHROMIUM( 366 void WebGraphicsContext3DCommandBufferImpl::copyTextureToParentTextureCHROMIUM(
365 WebGLId texture, WebGLId parentTexture) { 367 WebGLId texture, WebGLId parentTexture) {
366 TRACE_EVENT0("gpu", "WebGfxCtx3DCmdBfrImpl::copyTextureToCompositor"); 368 NOTIMPLEMENTED();
367 gl_->CopyTextureToParentTextureCHROMIUM(texture, parentTexture);
368 gl_->Flush();
369 } 369 }
370 370
371 void WebGraphicsContext3DCommandBufferImpl:: 371 void WebGraphicsContext3DCommandBufferImpl::
372 rateLimitOffscreenContextCHROMIUM() { 372 rateLimitOffscreenContextCHROMIUM() {
373 gl_->RateLimitOffscreenContextCHROMIUM(); 373 gl_->RateLimitOffscreenContextCHROMIUM();
374 } 374 }
375 375
376 WebKit::WebString WebGraphicsContext3DCommandBufferImpl:: 376 WebKit::WebString WebGraphicsContext3DCommandBufferImpl::
377 getRequestableExtensionsCHROMIUM() { 377 getRequestableExtensionsCHROMIUM() {
378 return WebKit::WebString::fromUTF8( 378 return WebKit::WebString::fromUTF8(
(...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after
1058 context_lost_callback_->onContextLost(); 1058 context_lost_callback_->onContextLost();
1059 } 1059 }
1060 1060
1061 RenderView* renderview = 1061 RenderView* renderview =
1062 web_view_ ? RenderView::FromWebView(web_view_) : NULL; 1062 web_view_ ? RenderView::FromWebView(web_view_) : NULL;
1063 if (renderview) 1063 if (renderview)
1064 renderview->OnViewContextSwapBuffersAborted(); 1064 renderview->OnViewContextSwapBuffersAborted();
1065 } 1065 }
1066 1066
1067 #endif // defined(ENABLE_GPU) 1067 #endif // defined(ENABLE_GPU)
OLDNEW
« no previous file with comments | « content/renderer/gpu/renderer_gl_context.cc ('k') | content/renderer/render_widget_fullscreen_pepper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698