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

Side by Side Diff: content/common/gpu/client/webgraphicscontext3d_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: Fix the compilation issue for Mac and Win 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 "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 1584 matching lines...) Expand 10 before | Expand all | Expand 10 after
1595 gl_->DeleteQueriesEXT(1, &query); 1595 gl_->DeleteQueriesEXT(1, &query);
1596 } 1596 }
1597 1597
1598 DELEGATE_TO_GL_1R(isQueryEXT, IsQueryEXT, WebGLId, WGC3Dboolean) 1598 DELEGATE_TO_GL_1R(isQueryEXT, IsQueryEXT, WebGLId, WGC3Dboolean)
1599 DELEGATE_TO_GL_2(beginQueryEXT, BeginQueryEXT, WGC3Denum, WebGLId) 1599 DELEGATE_TO_GL_2(beginQueryEXT, BeginQueryEXT, WGC3Denum, WebGLId)
1600 DELEGATE_TO_GL_1(endQueryEXT, EndQueryEXT, WGC3Denum) 1600 DELEGATE_TO_GL_1(endQueryEXT, EndQueryEXT, WGC3Denum)
1601 DELEGATE_TO_GL_3(getQueryivEXT, GetQueryivEXT, WGC3Denum, WGC3Denum, WGC3Dint*) 1601 DELEGATE_TO_GL_3(getQueryivEXT, GetQueryivEXT, WGC3Denum, WGC3Denum, WGC3Dint*)
1602 DELEGATE_TO_GL_3(getQueryObjectuivEXT, GetQueryObjectuivEXT, 1602 DELEGATE_TO_GL_3(getQueryObjectuivEXT, GetQueryObjectuivEXT,
1603 WebGLId, WGC3Denum, WGC3Duint*) 1603 WebGLId, WGC3Denum, WGC3Duint*)
1604 1604
1605 DELEGATE_TO_GL_5(copyTextureCHROMIUM, CopyTextureCHROMIUM, WGC3Denum, 1605 DELEGATE_TO_GL_6(copyTextureCHROMIUM, CopyTextureCHROMIUM, WGC3Denum,
1606 WebGLId, WebGLId, WGC3Dint, WGC3Denum); 1606 WebGLId, WebGLId, WGC3Dint, WGC3Denum, WGC3Denum);
1607 // This copyTextureCHROMIUM(...) has five parameters and delegates the call to
1608 // CopyTextureCHROMIUM(...) with the sixth parameter set to GL_UNSIGNED_BYTE
1609 // to bridge the parameter differences.
Ken Russell (switch to Gerrit) 2013/04/12 01:55:29 Please add a line like: TODO(jun.a.jiang): remove
1610 void WebGraphicsContext3DCommandBufferImpl::copyTextureCHROMIUM(
1611 WGC3Denum target, WebGLId source_id, WebGLId dest_id, WGC3Dint level,
1612 WGC3Denum internal_format) {
1613 gl_->CopyTextureCHROMIUM(target, source_id, dest_id, level, internal_format,
1614 GL_UNSIGNED_BYTE);
1615 }
1607 1616
1608 DELEGATE_TO_GL_3(bindUniformLocationCHROMIUM, BindUniformLocationCHROMIUM, 1617 DELEGATE_TO_GL_3(bindUniformLocationCHROMIUM, BindUniformLocationCHROMIUM,
1609 WebGLId, WGC3Dint, const WGC3Dchar*) 1618 WebGLId, WGC3Dint, const WGC3Dchar*)
1610 1619
1611 DELEGATE_TO_GL(shallowFlushCHROMIUM,ShallowFlushCHROMIUM); 1620 DELEGATE_TO_GL(shallowFlushCHROMIUM,ShallowFlushCHROMIUM);
1612 1621
1613 DELEGATE_TO_GL_1(waitSyncPoint, WaitSyncPointCHROMIUM, GLuint) 1622 DELEGATE_TO_GL_1(waitSyncPoint, WaitSyncPointCHROMIUM, GLuint)
1614 1623
1615 void WebGraphicsContext3DCommandBufferImpl::genMailboxCHROMIUM( 1624 void WebGraphicsContext3DCommandBufferImpl::genMailboxCHROMIUM(
1616 WGC3Dbyte* name) { 1625 WGC3Dbyte* name) {
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
1744 1753
1745 void WebGraphicsContext3DCommandBufferImpl::OnErrorMessage( 1754 void WebGraphicsContext3DCommandBufferImpl::OnErrorMessage(
1746 const std::string& message, int id) { 1755 const std::string& message, int id) {
1747 if (error_message_callback_) { 1756 if (error_message_callback_) {
1748 WebKit::WebString str = WebKit::WebString::fromUTF8(message.c_str()); 1757 WebKit::WebString str = WebKit::WebString::fromUTF8(message.c_str());
1749 error_message_callback_->onErrorMessage(str, id); 1758 error_message_callback_->onErrorMessage(str, id);
1750 } 1759 }
1751 } 1760 }
1752 1761
1753 } // namespace content 1762 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698