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

Side by Side Diff: gpu/command_buffer/service/context_state.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, 6 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 // This file contains the ContextState class. 5 // This file contains the ContextState class.
6 6
7 #ifndef GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_ 7 #ifndef GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_
8 #define GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_ 8 #define GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_
9 9
10 #include <vector> 10 #include <vector>
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 return bound_texture_external_oes; 63 return bound_texture_external_oes;
64 case GL_SAMPLER_2D_RECT_ARB: 64 case GL_SAMPLER_2D_RECT_ARB:
65 return bound_texture_rectangle_arb; 65 return bound_texture_rectangle_arb;
66 } 66 }
67 67
68 NOTREACHED(); 68 NOTREACHED();
69 return NULL; 69 return NULL;
70 } 70 }
71 71
72 void Unbind(TextureRef* texture) { 72 void Unbind(TextureRef* texture) {
73 if (bound_texture_2d == texture) { 73 if (bound_texture_2d.get() == texture) {
74 bound_texture_2d = NULL; 74 bound_texture_2d = NULL;
75 } 75 }
76 if (bound_texture_cube_map == texture) { 76 if (bound_texture_cube_map.get() == texture) {
77 bound_texture_cube_map = NULL; 77 bound_texture_cube_map = NULL;
78 } 78 }
79 if (bound_texture_external_oes == texture) { 79 if (bound_texture_external_oes.get() == texture) {
80 bound_texture_external_oes = NULL; 80 bound_texture_external_oes = NULL;
81 } 81 }
82 } 82 }
83 }; 83 };
84 84
85 struct Vec4 { 85 struct Vec4 {
86 Vec4() { 86 Vec4() {
87 v[0] = 0.0f; 87 v[0] = 0.0f;
88 v[1] = 0.0f; 88 v[1] = 0.0f;
89 v[2] = 0.0f; 89 v[2] = 0.0f;
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 167
168 private: 168 private:
169 scoped_ptr<ErrorState> error_state_; 169 scoped_ptr<ErrorState> error_state_;
170 }; 170 };
171 171
172 } // namespace gles2 172 } // namespace gles2
173 } // namespace gpu 173 } // namespace gpu
174 174
175 #endif // GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_ 175 #endif // GPU_COMMAND_BUFFER_SERVICE_CONTEXT_STATE_H_
176 176
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/context_group.cc ('k') | gpu/command_buffer/service/context_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698