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

Side by Side Diff: cc/resources/resource_provider.h

Issue 13870013: Pass texture target to CreateResourceFromExternalTexture (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: GL_TEXTURE_RECTANGLE_ARB in io surface layer 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 | Annotate | Revision Log
« no previous file with comments | « cc/layers/texture_layer_impl.cc ('k') | cc/resources/resource_provider.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 CC_RESOURCES_RESOURCE_PROVIDER_H_ 5 #ifndef CC_RESOURCES_RESOURCE_PROVIDER_H_
6 #define CC_RESOURCES_RESOURCE_PROVIDER_H_ 6 #define CC_RESOURCES_RESOURCE_PROVIDER_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 TextureUsageHint hint); 92 TextureUsageHint hint);
93 93
94 // You can also explicitly create a specific resource type. 94 // You can also explicitly create a specific resource type.
95 ResourceId CreateGLTexture(gfx::Size size, 95 ResourceId CreateGLTexture(gfx::Size size,
96 GLenum format, 96 GLenum format,
97 GLenum texture_pool, 97 GLenum texture_pool,
98 TextureUsageHint hint); 98 TextureUsageHint hint);
99 99
100 ResourceId CreateBitmap(gfx::Size size); 100 ResourceId CreateBitmap(gfx::Size size);
101 // Wraps an external texture into a GL resource. 101 // Wraps an external texture into a GL resource.
102 ResourceId CreateResourceFromExternalTexture(unsigned texture_id); 102 ResourceId CreateResourceFromExternalTexture(
103 unsigned texture_target,
104 unsigned texture_id);
103 105
104 // Wraps an external texture mailbox into a GL resource. 106 // Wraps an external texture mailbox into a GL resource.
105 ResourceId CreateResourceFromTextureMailbox(const TextureMailbox& mailbox); 107 ResourceId CreateResourceFromTextureMailbox(const TextureMailbox& mailbox);
106 108
107 void DeleteResource(ResourceId id); 109 void DeleteResource(ResourceId id);
108 110
109 // Update pixels from image, copying source_rect (in image) to dest_offset (in 111 // Update pixels from image, copying source_rect (in image) to dest_offset (in
110 // the resource). 112 // the resource).
111 void SetPixels(ResourceId id, 113 void SetPixels(ResourceId id,
112 const uint8_t* image, 114 const uint8_t* image,
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 base::ThreadChecker thread_checker_; 401 base::ThreadChecker thread_checker_;
400 402
401 scoped_refptr<Fence> current_read_lock_fence_; 403 scoped_refptr<Fence> current_read_lock_fence_;
402 404
403 DISALLOW_COPY_AND_ASSIGN(ResourceProvider); 405 DISALLOW_COPY_AND_ASSIGN(ResourceProvider);
404 }; 406 };
405 407
406 } // namespace cc 408 } // namespace cc
407 409
408 #endif // CC_RESOURCES_RESOURCE_PROVIDER_H_ 410 #endif // CC_RESOURCES_RESOURCE_PROVIDER_H_
OLDNEW
« no previous file with comments | « cc/layers/texture_layer_impl.cc ('k') | cc/resources/resource_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698