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

Side by Side Diff: content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h

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 | « no previous file | content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc » ('j') | 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 #ifndef CONTENT_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_ 5 #ifndef CONTENT_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_
6 #define CONTENT_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_ 6 #define CONTENT_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 virtual void endQueryEXT(WGC3Denum target); 567 virtual void endQueryEXT(WGC3Denum target);
568 virtual void getQueryivEXT( 568 virtual void getQueryivEXT(
569 WGC3Denum target, WGC3Denum pname, WGC3Dint* params); 569 WGC3Denum target, WGC3Denum pname, WGC3Dint* params);
570 virtual void getQueryObjectuivEXT( 570 virtual void getQueryObjectuivEXT(
571 WebGLId query, WGC3Denum pname, WGC3Duint* params); 571 WebGLId query, WGC3Denum pname, WGC3Duint* params);
572 572
573 virtual void copyTextureCHROMIUM(WGC3Denum target, WebGLId source_id, 573 virtual void copyTextureCHROMIUM(WGC3Denum target, WebGLId source_id,
574 WebGLId dest_id, WGC3Dint level, 574 WebGLId dest_id, WGC3Dint level,
575 WGC3Denum internal_format); 575 WGC3Denum internal_format);
576 576
577 virtual void copyTextureCHROMIUM(WGC3Denum target, WebGLId source_id,
578 WebGLId dest_id, WGC3Dint level,
579 WGC3Denum internal_format,
580 WGC3Denum dest_type);
581
577 virtual void bindUniformLocationCHROMIUM(WebGLId program, WGC3Dint location, 582 virtual void bindUniformLocationCHROMIUM(WebGLId program, WGC3Dint location,
578 const WGC3Dchar* uniform); 583 const WGC3Dchar* uniform);
579 584
580 virtual void shallowFlushCHROMIUM(); 585 virtual void shallowFlushCHROMIUM();
581 586
582 virtual void genMailboxCHROMIUM(WGC3Dbyte* mailbox); 587 virtual void genMailboxCHROMIUM(WGC3Dbyte* mailbox);
583 virtual void produceTextureCHROMIUM(WGC3Denum target, 588 virtual void produceTextureCHROMIUM(WGC3Denum target,
584 const WGC3Dbyte* mailbox); 589 const WGC3Dbyte* mailbox);
585 virtual void consumeTextureCHROMIUM(WGC3Denum target, 590 virtual void consumeTextureCHROMIUM(WGC3Denum target,
586 const WGC3Dbyte* mailbox); 591 const WGC3Dbyte* mailbox);
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
764 gpu::gles2::GLES2Interface* trace_gl_; 769 gpu::gles2::GLES2Interface* trace_gl_;
765 Error last_error_; 770 Error last_error_;
766 int frame_number_; 771 int frame_number_;
767 bool bind_generates_resources_; 772 bool bind_generates_resources_;
768 bool use_echo_for_swap_ack_; 773 bool use_echo_for_swap_ack_;
769 }; 774 };
770 775
771 } // namespace content 776 } // namespace content
772 777
773 #endif // CONTENT_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_ 778 #endif // CONTENT_COMMON_GPU_CLIENT_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698