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

Side by Side Diff: webkit/gpu/webgraphicscontext3d_in_process_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
« no previous file with comments | « webkit/gpu/webgraphicscontext3d_in_process_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_impl.h" 5 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 1713 matching lines...) Expand 10 before | Expand all | Expand 10 after
1724 glDeleteQueriesARB(1, &query); 1724 glDeleteQueriesARB(1, &query);
1725 } 1725 }
1726 1726
1727 DELEGATE_TO_GL_1R(isQueryEXT, IsQueryARB, WebGLId, WGC3Dboolean) 1727 DELEGATE_TO_GL_1R(isQueryEXT, IsQueryARB, WebGLId, WGC3Dboolean)
1728 DELEGATE_TO_GL_2(beginQueryEXT, BeginQueryARB, WGC3Denum, WebGLId) 1728 DELEGATE_TO_GL_2(beginQueryEXT, BeginQueryARB, WGC3Denum, WebGLId)
1729 DELEGATE_TO_GL_1(endQueryEXT, EndQueryARB, WGC3Denum) 1729 DELEGATE_TO_GL_1(endQueryEXT, EndQueryARB, WGC3Denum)
1730 DELEGATE_TO_GL_3(getQueryivEXT, GetQueryivARB, WGC3Denum, WGC3Denum, WGC3Dint*) 1730 DELEGATE_TO_GL_3(getQueryivEXT, GetQueryivARB, WGC3Denum, WGC3Denum, WGC3Dint*)
1731 DELEGATE_TO_GL_3(getQueryObjectuivEXT, GetQueryObjectuivARB, 1731 DELEGATE_TO_GL_3(getQueryObjectuivEXT, GetQueryObjectuivARB,
1732 WebGLId, WGC3Denum, WGC3Duint*) 1732 WebGLId, WGC3Denum, WGC3Duint*)
1733 1733
1734 // TODO(jun.a.jiang@intel.com): once all clients switch to call
1735 // the newer copyTextureCHROMIUM(...) with six parameters, this
1736 // function will be removed.
1734 void WebGraphicsContext3DInProcessImpl::copyTextureCHROMIUM( 1737 void WebGraphicsContext3DInProcessImpl::copyTextureCHROMIUM(
1735 WGC3Denum, WGC3Duint, WGC3Duint, WGC3Dint, WGC3Denum) { 1738 WGC3Denum, WGC3Duint, WGC3Duint, WGC3Dint, WGC3Denum) {
1736 NOTIMPLEMENTED(); 1739 NOTIMPLEMENTED();
1737 } 1740 }
1738 1741
1742 void WebGraphicsContext3DInProcessImpl::copyTextureCHROMIUM(
1743 WGC3Denum, WGC3Duint, WGC3Duint, WGC3Dint, WGC3Denum, WGC3Denum) {
1744 NOTIMPLEMENTED();
1745 }
1746
1739 void WebGraphicsContext3DInProcessImpl::bindTexImage2DCHROMIUM( 1747 void WebGraphicsContext3DInProcessImpl::bindTexImage2DCHROMIUM(
1740 WGC3Denum target, WGC3Dint imageId) { 1748 WGC3Denum target, WGC3Dint imageId) {
1741 NOTIMPLEMENTED(); 1749 NOTIMPLEMENTED();
1742 } 1750 }
1743 1751
1744 void WebGraphicsContext3DInProcessImpl::releaseTexImage2DCHROMIUM( 1752 void WebGraphicsContext3DInProcessImpl::releaseTexImage2DCHROMIUM(
1745 WGC3Denum target, WGC3Dint imageId) { 1753 WGC3Denum target, WGC3Dint imageId) {
1746 NOTIMPLEMENTED(); 1754 NOTIMPLEMENTED();
1747 } 1755 }
1748 1756
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
1849 if (length > 1) { 1857 if (length > 1) {
1850 entry->translated_source.reset(new char[length]); 1858 entry->translated_source.reset(new char[length]);
1851 ShGetObjectCode(compiler, entry->translated_source.get()); 1859 ShGetObjectCode(compiler, entry->translated_source.get());
1852 } 1860 }
1853 entry->is_valid = true; 1861 entry->is_valid = true;
1854 return true; 1862 return true;
1855 } 1863 }
1856 1864
1857 } // namespace gpu 1865 } // namespace gpu
1858 } // namespace webkit 1866 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/gpu/webgraphicscontext3d_in_process_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698