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

Side by Side Diff: content/common/gpu/client/webgraphicscontext3d_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: Add kGLImplementationMockGL case to gl_image_android.cc. 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" 5 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
6 6
7 #include "third_party/khronos/GLES2/gl2.h" 7 #include "third_party/khronos/GLES2/gl2.h"
8 #ifndef GL_GLEXT_PROTOTYPES 8 #ifndef GL_GLEXT_PROTOTYPES
9 #define GL_GLEXT_PROTOTYPES 1 9 #define GL_GLEXT_PROTOTYPES 1
10 #endif 10 #endif
(...skipping 1539 matching lines...) Expand 10 before | Expand all | Expand 10 after
1550 } 1550 }
1551 1551
1552 void WebGraphicsContext3DCommandBufferImpl::deleteVertexArrayOES( 1552 void WebGraphicsContext3DCommandBufferImpl::deleteVertexArrayOES(
1553 WebGLId array) { 1553 WebGLId array) {
1554 gl_->DeleteVertexArraysOES(1, &array); 1554 gl_->DeleteVertexArraysOES(1, &array);
1555 } 1555 }
1556 1556
1557 DELEGATE_TO_GL_1R(isVertexArrayOES, IsVertexArrayOES, WebGLId, WGC3Dboolean) 1557 DELEGATE_TO_GL_1R(isVertexArrayOES, IsVertexArrayOES, WebGLId, WGC3Dboolean)
1558 DELEGATE_TO_GL_1(bindVertexArrayOES, BindVertexArrayOES, WebGLId) 1558 DELEGATE_TO_GL_1(bindVertexArrayOES, BindVertexArrayOES, WebGLId)
1559 1559
1560 DELEGATE_TO_GL_2(bindTexImage2DCHROMIUM, BindTexImage2DCHROMIUM,
1561 WGC3Denum, WGC3Dint)
1562 DELEGATE_TO_GL_2(releaseTexImage2DCHROMIUM, ReleaseTexImage2DCHROMIUM,
1563 WGC3Denum, WGC3Dint)
1564
1560 GrGLInterface* WebGraphicsContext3DCommandBufferImpl::onCreateGrGLInterface() { 1565 GrGLInterface* WebGraphicsContext3DCommandBufferImpl::onCreateGrGLInterface() {
1561 return webkit_glue::CreateCommandBufferSkiaGLBinding(); 1566 return webkit_glue::CreateCommandBufferSkiaGLBinding();
1562 } 1567 }
1563 1568
1564 namespace { 1569 namespace {
1565 1570
1566 WGC3Denum convertReason(gpu::error::ContextLostReason reason) { 1571 WGC3Denum convertReason(gpu::error::ContextLostReason reason) {
1567 switch (reason) { 1572 switch (reason) {
1568 case gpu::error::kGuilty: 1573 case gpu::error::kGuilty:
1569 return GL_GUILTY_CONTEXT_RESET_ARB; 1574 return GL_GUILTY_CONTEXT_RESET_ARB;
(...skipping 21 matching lines...) Expand all
1591 swap_client_->OnViewContextSwapBuffersAborted(); 1596 swap_client_->OnViewContextSwapBuffersAborted();
1592 } 1597 }
1593 1598
1594 void WebGraphicsContext3DCommandBufferImpl::OnErrorMessage( 1599 void WebGraphicsContext3DCommandBufferImpl::OnErrorMessage(
1595 const std::string& message, int id) { 1600 const std::string& message, int id) {
1596 if (error_message_callback_) { 1601 if (error_message_callback_) {
1597 WebKit::WebString str = WebKit::WebString::fromUTF8(message.c_str()); 1602 WebKit::WebString str = WebKit::WebString::fromUTF8(message.c_str());
1598 error_message_callback_->onErrorMessage(str, id); 1603 error_message_callback_->onErrorMessage(str, id);
1599 } 1604 }
1600 } 1605 }
OLDNEW
« no previous file with comments | « content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h ('k') | content/common/gpu/gpu_channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698