summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/service/texture_manager.h
diff options
context:
space:
mode:
authortfarina <tfarina@chromium.org>2015-10-29 05:50:45 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-29 12:51:20 +0000
commitdf856e02c830fb37ca5afceac7a12b4bddf37a84 (patch)
tree61983bf3545c61f167673bdd1c8b19084bfe3472 /gpu/command_buffer/service/texture_manager.h
parent69a0876721e24f35ba1f7c6338ed07ca684f5cb1 (diff)
downloadchromium_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.h')
-rw-r--r--gpu/command_buffer/service/texture_manager.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/gpu/command_buffer/service/texture_manager.h b/gpu/command_buffer/service/texture_manager.h
index 62b81d2..a18e278 100644
--- a/gpu/command_buffer/service/texture_manager.h
+++ b/gpu/command_buffer/service/texture_manager.h
@@ -152,15 +152,15 @@ class GPU_EXPORT Texture {
// Set the image for a particular level.
void SetLevelImage(GLenum target,
GLint level,
- gfx::GLImage* image,
+ gl::GLImage* image,
ImageState state);
// Get the image associated with a particular level. Returns NULL if level
// does not exist.
- gfx::GLImage* GetLevelImage(GLint target,
- GLint level,
- ImageState* state) const;
- gfx::GLImage* GetLevelImage(GLint target, GLint level) const;
+ gl::GLImage* GetLevelImage(GLint target,
+ GLint level,
+ ImageState* state) const;
+ gl::GLImage* GetLevelImage(GLint target, GLint level) const;
bool HasImages() const {
return has_images_;
@@ -263,7 +263,7 @@ class GPU_EXPORT Texture {
GLint border;
GLenum format;
GLenum type;
- scoped_refptr<gfx::GLImage> image;
+ scoped_refptr<gl::GLImage> image;
ImageState image_state;
uint32 estimated_size;
};
@@ -809,7 +809,7 @@ class GPU_EXPORT TextureManager : public base::trace_event::MemoryDumpProvider {
void SetLevelImage(TextureRef* ref,
GLenum target,
GLint level,
- gfx::GLImage* image,
+ gl::GLImage* image,
Texture::ImageState state);
size_t GetSignatureSize() const;