| OLD | NEW |
| 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 #ifndef GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_ | 5 #ifndef GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_ |
| 6 #define GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_ | 6 #define GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 #include <stdint.h> | 9 #include <stdint.h> |
| 10 | 10 |
| (...skipping 1046 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1057 // operations are also implemented in decoder at the moment. | 1057 // operations are also implemented in decoder at the moment. |
| 1058 static bool CombineAdjacentRects(const gfx::Rect& rect1, | 1058 static bool CombineAdjacentRects(const gfx::Rect& rect1, |
| 1059 const gfx::Rect& rect2, | 1059 const gfx::Rect& rect2, |
| 1060 gfx::Rect* result); | 1060 gfx::Rect* result); |
| 1061 | 1061 |
| 1062 // Get / set the current generation number of this manager. This generation | 1062 // Get / set the current generation number of this manager. This generation |
| 1063 // number changes whenever the service_id of one or more Textures change. | 1063 // number changes whenever the service_id of one or more Textures change. |
| 1064 uint32_t GetServiceIdGeneration() const; | 1064 uint32_t GetServiceIdGeneration() const; |
| 1065 void IncrementServiceIdGeneration(); | 1065 void IncrementServiceIdGeneration(); |
| 1066 | 1066 |
| 1067 GLenum AdjustTexInternalFormat(GLenum format) const; | 1067 static GLenum AdjustTexInternalFormat(const gles2::FeatureInfo* feature_info, |
| 1068 GLenum AdjustTexFormat(GLenum format) const; | 1068 GLenum format); |
| 1069 static GLenum AdjustTexFormat(const gles2::FeatureInfo* feature_info, |
| 1070 GLenum format); |
| 1069 | 1071 |
| 1070 private: | 1072 private: |
| 1071 friend class Texture; | 1073 friend class Texture; |
| 1072 friend class TextureRef; | 1074 friend class TextureRef; |
| 1073 | 1075 |
| 1074 // Helper for Initialize(). | 1076 // Helper for Initialize(). |
| 1075 scoped_refptr<TextureRef> CreateDefaultAndBlackTextures( | 1077 scoped_refptr<TextureRef> CreateDefaultAndBlackTextures( |
| 1076 GLenum target, | 1078 GLenum target, |
| 1077 GLuint* black_texture); | 1079 GLuint* black_texture); |
| 1078 | 1080 |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1175 private: | 1177 private: |
| 1176 DecoderTextureState* texture_state_; | 1178 DecoderTextureState* texture_state_; |
| 1177 base::TimeTicks begin_time_; | 1179 base::TimeTicks begin_time_; |
| 1178 DISALLOW_COPY_AND_ASSIGN(ScopedTextureUploadTimer); | 1180 DISALLOW_COPY_AND_ASSIGN(ScopedTextureUploadTimer); |
| 1179 }; | 1181 }; |
| 1180 | 1182 |
| 1181 } // namespace gles2 | 1183 } // namespace gles2 |
| 1182 } // namespace gpu | 1184 } // namespace gpu |
| 1183 | 1185 |
| 1184 #endif // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_ | 1186 #endif // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_ |
| OLD | NEW |