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

Side by Side Diff: webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc

Issue 13613006: Add a new parameter dest_type to the GL_CHROMIUM_copy_texture extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase the patch and solve the merge conflict issue Created 7 years, 8 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
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 "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" 5 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
6 6
7 #include <GLES2/gl2.h> 7 #include <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 1633 matching lines...) Expand 10 before | Expand all | Expand 10 after
1644 gl_->DeleteQueriesEXT(1, &query); 1644 gl_->DeleteQueriesEXT(1, &query);
1645 } 1645 }
1646 1646
1647 DELEGATE_TO_GL_1R(isQueryEXT, IsQueryEXT, WebGLId, WGC3Dboolean) 1647 DELEGATE_TO_GL_1R(isQueryEXT, IsQueryEXT, WebGLId, WGC3Dboolean)
1648 DELEGATE_TO_GL_2(beginQueryEXT, BeginQueryEXT, WGC3Denum, WebGLId) 1648 DELEGATE_TO_GL_2(beginQueryEXT, BeginQueryEXT, WGC3Denum, WebGLId)
1649 DELEGATE_TO_GL_1(endQueryEXT, EndQueryEXT, WGC3Denum) 1649 DELEGATE_TO_GL_1(endQueryEXT, EndQueryEXT, WGC3Denum)
1650 DELEGATE_TO_GL_3(getQueryivEXT, GetQueryivEXT, WGC3Denum, WGC3Denum, WGC3Dint*) 1650 DELEGATE_TO_GL_3(getQueryivEXT, GetQueryivEXT, WGC3Denum, WGC3Denum, WGC3Dint*)
1651 DELEGATE_TO_GL_3(getQueryObjectuivEXT, GetQueryObjectuivEXT, 1651 DELEGATE_TO_GL_3(getQueryObjectuivEXT, GetQueryObjectuivEXT,
1652 WebGLId, WGC3Denum, WGC3Duint*) 1652 WebGLId, WGC3Denum, WGC3Duint*)
1653 1653
1654 DELEGATE_TO_GL_5(copyTextureCHROMIUM, CopyTextureCHROMIUM, WGC3Denum, WGC3Duint, 1654 DELEGATE_TO_GL_6(copyTextureCHROMIUM, CopyTextureCHROMIUM, WGC3Denum, WGC3Duint,
1655 WGC3Duint, WGC3Dint, WGC3Denum) 1655 WGC3Duint, WGC3Dint, WGC3Denum, WGC3Denum)
1656 // This copyTextureCHROMIUM(...) has five parameters and delegates the call to
1657 // CopyTextureCHROMIUM(...) with the sixth parameter set to GL_UNSIGNED_BYTE
1658 // to bridge the parameter differences.
1659 // TODO(jun.a.jiang@intel.com): once all clients switch to call
1660 // the newer copyTextureCHROMIUM(...) with six parameters, this
1661 // function will be removed.
1662 void WebGraphicsContext3DInProcessCommandBufferImpl::copyTextureCHROMIUM(
1663 WGC3Denum target, WGC3Duint source_id, WGC3Duint dest_id, WGC3Dint level,
1664 WGC3Denum internal_format) {
1665 ClearContext();
1666 gl_->CopyTextureCHROMIUM(target, source_id, dest_id, level, internal_format,
1667 GL_UNSIGNED_BYTE);
1668 }
1656 1669
1657 void WebGraphicsContext3DInProcessCommandBufferImpl::insertEventMarkerEXT( 1670 void WebGraphicsContext3DInProcessCommandBufferImpl::insertEventMarkerEXT(
1658 const WGC3Dchar* marker) { 1671 const WGC3Dchar* marker) {
1659 gl_->InsertEventMarkerEXT(0, marker); 1672 gl_->InsertEventMarkerEXT(0, marker);
1660 } 1673 }
1661 1674
1662 void WebGraphicsContext3DInProcessCommandBufferImpl::pushGroupMarkerEXT( 1675 void WebGraphicsContext3DInProcessCommandBufferImpl::pushGroupMarkerEXT(
1663 const WGC3Dchar* marker) { 1676 const WGC3Dchar* marker) {
1664 gl_->PushGroupMarkerEXT(0, marker); 1677 gl_->PushGroupMarkerEXT(0, marker);
1665 } 1678 }
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
1716 1729
1717 DELEGATE_TO_GL_9(asyncTexSubImage2DCHROMIUM, AsyncTexSubImage2DCHROMIUM, 1730 DELEGATE_TO_GL_9(asyncTexSubImage2DCHROMIUM, AsyncTexSubImage2DCHROMIUM,
1718 WGC3Denum, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dsizei, WGC3Dsizei, 1731 WGC3Denum, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dsizei, WGC3Dsizei,
1719 WGC3Denum, WGC3Denum, const void*) 1732 WGC3Denum, WGC3Denum, const void*)
1720 1733
1721 DELEGATE_TO_GL_1(waitAsyncTexImage2DCHROMIUM, WaitAsyncTexImage2DCHROMIUM, 1734 DELEGATE_TO_GL_1(waitAsyncTexImage2DCHROMIUM, WaitAsyncTexImage2DCHROMIUM,
1722 WGC3Denum) 1735 WGC3Denum)
1723 1736
1724 } // namespace gpu 1737 } // namespace gpu
1725 } // namespace webkit 1738 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h ('k') | webkit/gpu/webgraphicscontext3d_in_process_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698