diff options
| author | tfarina <tfarina@chromium.org> | 2015-10-29 05:50:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-29 12:51:20 +0000 |
| commit | df856e02c830fb37ca5afceac7a12b4bddf37a84 (patch) | |
| tree | 61983bf3545c61f167673bdd1c8b19084bfe3472 /gpu/command_buffer/service/texture_manager.cc | |
| parent | 69a0876721e24f35ba1f7c6338ed07ca684f5cb1 (diff) | |
| download | chromium_src-df856e02c830fb37ca5afceac7a12b4bddf37a84.zip chromium_src-df856e02c830fb37ca5afceac7a12b4bddf37a84.tar.gz chromium_src-df856e02c830fb37ca5afceac7a12b4bddf37a84.tar.bz2 | |
ui/gl: Move GLImage into gl namespace.
BUG=461575
R=piman@chromium.org,sievers@chromium.org,
TBR=fsamuel@chromium.org
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1421903006
Cr-Commit-Position: refs/heads/master@{#356825}
Diffstat (limited to 'gpu/command_buffer/service/texture_manager.cc')
| -rw-r--r-- | gpu/command_buffer/service/texture_manager.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gpu/command_buffer/service/texture_manager.cc b/gpu/command_buffer/service/texture_manager.cc index ec0aec1..d883622 100644 --- a/gpu/command_buffer/service/texture_manager.cc +++ b/gpu/command_buffer/service/texture_manager.cc @@ -1240,7 +1240,7 @@ bool Texture::ClearLevel( void Texture::SetLevelImage(GLenum target, GLint level, - gfx::GLImage* image, + gl::GLImage* image, ImageState state) { DCHECK_GE(level, 0); size_t face_index = GLES2Util::GLTargetToFaceIndex(target); @@ -1258,9 +1258,9 @@ void Texture::SetLevelImage(GLenum target, UpdateHasImages(); } -gfx::GLImage* Texture::GetLevelImage(GLint target, - GLint level, - ImageState* state) const { +gl::GLImage* Texture::GetLevelImage(GLint target, + GLint level, + ImageState* state) const { if (target != GL_TEXTURE_2D && target != GL_TEXTURE_EXTERNAL_OES && target != GL_TEXTURE_RECTANGLE_ARB) { return NULL; @@ -1279,7 +1279,7 @@ gfx::GLImage* Texture::GetLevelImage(GLint target, return NULL; } -gfx::GLImage* Texture::GetLevelImage(GLint target, GLint level) const { +gl::GLImage* Texture::GetLevelImage(GLint target, GLint level) const { return GetLevelImage(target, level, nullptr); } @@ -1725,7 +1725,7 @@ GLsizei TextureManager::ComputeMipMapCount(GLenum target, void TextureManager::SetLevelImage(TextureRef* ref, GLenum target, GLint level, - gfx::GLImage* image, + gl::GLImage* image, Texture::ImageState state) { DCHECK(ref); ref->texture()->SetLevelImage(target, level, image, state); |