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

Unified Diff: gpu/command_buffer/service/context_state.h

Issue 14844004: gpu: Refactor to support cross-channel shared textures (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix accidentally reverted behavior Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/service/context_group.cc ('k') | gpu/command_buffer/service/framebuffer_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/context_state.h
diff --git a/gpu/command_buffer/service/context_state.h b/gpu/command_buffer/service/context_state.h
index af43eac45181b2e377016562069144ce48b160a6..e2bc012169eaa381089f6096e9d39185af4b90cf 100644
--- a/gpu/command_buffer/service/context_state.h
+++ b/gpu/command_buffer/service/context_state.h
@@ -36,21 +36,21 @@ struct GPU_EXPORT TextureUnit {
GLenum bind_target;
// texture currently bound to this unit's GL_TEXTURE_2D with glBindTexture
- scoped_refptr<Texture> bound_texture_2d;
+ scoped_refptr<TextureRef> bound_texture_2d;
// texture currently bound to this unit's GL_TEXTURE_CUBE_MAP with
// glBindTexture
- scoped_refptr<Texture> bound_texture_cube_map;
+ scoped_refptr<TextureRef> bound_texture_cube_map;
// texture currently bound to this unit's GL_TEXTURE_EXTERNAL_OES with
// glBindTexture
- scoped_refptr<Texture> bound_texture_external_oes;
+ scoped_refptr<TextureRef> bound_texture_external_oes;
// texture currently bound to this unit's GL_TEXTURE_RECTANGLE_ARB with
// glBindTexture
- scoped_refptr<Texture> bound_texture_rectangle_arb;
+ scoped_refptr<TextureRef> bound_texture_rectangle_arb;
- scoped_refptr<Texture> GetInfoForSamplerType(
+ scoped_refptr<TextureRef> GetInfoForSamplerType(
GLenum type) {
DCHECK(type == GL_SAMPLER_2D || type == GL_SAMPLER_CUBE ||
type == GL_SAMPLER_EXTERNAL_OES || type == GL_SAMPLER_2D_RECT_ARB);
@@ -69,7 +69,7 @@ struct GPU_EXPORT TextureUnit {
return NULL;
}
- void Unbind(Texture* texture) {
+ void Unbind(TextureRef* texture) {
if (bound_texture_2d == texture) {
bound_texture_2d = NULL;
}
« no previous file with comments | « gpu/command_buffer/service/context_group.cc ('k') | gpu/command_buffer/service/framebuffer_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698