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

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

Issue 16293004: Update gpu/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased 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
Index: gpu/command_buffer/service/texture_manager.h
diff --git a/gpu/command_buffer/service/texture_manager.h b/gpu/command_buffer/service/texture_manager.h
index 2d4640ee4baa67a0a7cec454a78e03109da0e9ce..76acd155b3b6d0159c3b96dc5d948ef1ba9b8a67 100644
--- a/gpu/command_buffer/service/texture_manager.h
+++ b/gpu/command_buffer/service/texture_manager.h
@@ -501,12 +501,12 @@ class GPU_EXPORT TextureManager {
// True if this texture meets all the GLES2 criteria for rendering.
// See section 3.8.2 of the GLES2 spec.
bool CanRender(const TextureRef* ref) const {
- return ref->texture()->CanRender(feature_info_);
+ return ref->texture()->CanRender(feature_info_.get());
}
// Returns true if mipmaps can be generated by GL.
bool CanGenerateMipmaps(const TextureRef* ref) const {
- return ref->texture()->CanGenerateMipmaps(feature_info_);
+ return ref->texture()->CanGenerateMipmaps(feature_info_.get());
}
// Sets the Texture's target
@@ -587,13 +587,13 @@ class GPU_EXPORT TextureManager {
TextureRef* GetDefaultTextureInfo(GLenum target) {
switch (target) {
case GL_TEXTURE_2D:
- return default_textures_[kTexture2D];
+ return default_textures_[kTexture2D].get();
case GL_TEXTURE_CUBE_MAP:
- return default_textures_[kCubeMap];
+ return default_textures_[kCubeMap].get();
case GL_TEXTURE_EXTERNAL_OES:
- return default_textures_[kExternalOES];
+ return default_textures_[kExternalOES].get();
case GL_TEXTURE_RECTANGLE_ARB:
- return default_textures_[kRectangleARB];
+ return default_textures_[kRectangleARB].get();
default:
NOTREACHED();
return NULL;
« no previous file with comments | « gpu/command_buffer/service/shader_manager_unittest.cc ('k') | gpu/command_buffer/service/texture_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698