OLD | NEW |
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 1507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1518 DELEGATE_TO_GL_3(getQueryivEXT, GetQueryivEXT, WGC3Denum, WGC3Denum, WGC3Dint*) | 1518 DELEGATE_TO_GL_3(getQueryivEXT, GetQueryivEXT, WGC3Denum, WGC3Denum, WGC3Dint*) |
1519 DELEGATE_TO_GL_3(getQueryObjectuivEXT, GetQueryObjectuivEXT, | 1519 DELEGATE_TO_GL_3(getQueryObjectuivEXT, GetQueryObjectuivEXT, |
1520 WebGLId, WGC3Denum, WGC3Duint*) | 1520 WebGLId, WGC3Denum, WGC3Duint*) |
1521 | 1521 |
1522 DELEGATE_TO_GL_6(copyTextureCHROMIUM, CopyTextureCHROMIUM, WGC3Denum, | 1522 DELEGATE_TO_GL_6(copyTextureCHROMIUM, CopyTextureCHROMIUM, WGC3Denum, |
1523 WebGLId, WebGLId, WGC3Dint, WGC3Denum, WGC3Denum); | 1523 WebGLId, WebGLId, WGC3Dint, WGC3Denum, WGC3Denum); |
1524 | 1524 |
1525 DELEGATE_TO_GL_3(bindUniformLocationCHROMIUM, BindUniformLocationCHROMIUM, | 1525 DELEGATE_TO_GL_3(bindUniformLocationCHROMIUM, BindUniformLocationCHROMIUM, |
1526 WebGLId, WGC3Dint, const WGC3Dchar*) | 1526 WebGLId, WGC3Dint, const WGC3Dchar*) |
1527 | 1527 |
1528 DELEGATE_TO_GL(shallowFlushCHROMIUM,ShallowFlushCHROMIUM); | 1528 DELEGATE_TO_GL(shallowFlushCHROMIUM, ShallowFlushCHROMIUM); |
| 1529 DELEGATE_TO_GL(shallowFinishCHROMIUM, ShallowFinishCHROMIUM); |
1529 | 1530 |
1530 DELEGATE_TO_GL_1(waitSyncPoint, WaitSyncPointCHROMIUM, GLuint) | 1531 DELEGATE_TO_GL_1(waitSyncPoint, WaitSyncPointCHROMIUM, GLuint) |
1531 | 1532 |
1532 static void SignalSyncPointCallback( | 1533 static void SignalSyncPointCallback( |
1533 scoped_ptr< | 1534 scoped_ptr< |
1534 WebKit::WebGraphicsContext3D::WebGraphicsSyncPointCallback> callback) { | 1535 WebKit::WebGraphicsContext3D::WebGraphicsSyncPointCallback> callback) { |
1535 callback->onSyncPointReached(); | 1536 callback->onSyncPointReached(); |
1536 } | 1537 } |
1537 | 1538 |
1538 void WebGraphicsContext3DCommandBufferImpl::signalSyncPoint( | 1539 void WebGraphicsContext3DCommandBufferImpl::signalSyncPoint( |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1660 | 1661 |
1661 void WebGraphicsContext3DCommandBufferImpl::OnErrorMessage( | 1662 void WebGraphicsContext3DCommandBufferImpl::OnErrorMessage( |
1662 const std::string& message, int id) { | 1663 const std::string& message, int id) { |
1663 if (error_message_callback_) { | 1664 if (error_message_callback_) { |
1664 WebKit::WebString str = WebKit::WebString::fromUTF8(message.c_str()); | 1665 WebKit::WebString str = WebKit::WebString::fromUTF8(message.c_str()); |
1665 error_message_callback_->onErrorMessage(str, id); | 1666 error_message_callback_->onErrorMessage(str, id); |
1666 } | 1667 } |
1667 } | 1668 } |
1668 | 1669 |
1669 } // namespace content | 1670 } // namespace content |
OLD | NEW |