| 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 1058 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1069 // operations are also implemented in decoder at the moment. | 1069 // operations are also implemented in decoder at the moment. |
| 1070 static bool CombineAdjacentRects(const gfx::Rect& rect1, | 1070 static bool CombineAdjacentRects(const gfx::Rect& rect1, |
| 1071 const gfx::Rect& rect2, | 1071 const gfx::Rect& rect2, |
| 1072 gfx::Rect* result); | 1072 gfx::Rect* result); |
| 1073 | 1073 |
| 1074 // Get / set the current generation number of this manager. This generation | 1074 // Get / set the current generation number of this manager. This generation |
| 1075 // number changes whenever the service_id of one or more Textures change. | 1075 // number changes whenever the service_id of one or more Textures change. |
| 1076 uint32_t GetServiceIdGeneration() const; | 1076 uint32_t GetServiceIdGeneration() const; |
| 1077 void IncrementServiceIdGeneration(); | 1077 void IncrementServiceIdGeneration(); |
| 1078 | 1078 |
| 1079 GLenum AdjustTexInternalFormat(GLenum format) const; | 1079 static GLenum AdjustTexInternalFormat(const gles2::FeatureInfo* feature_info, |
| 1080 GLenum AdjustTexFormat(GLenum format) const; | 1080 GLenum format); |
| 1081 static GLenum AdjustTexFormat(const gles2::FeatureInfo* feature_info, |
| 1082 GLenum format); |
| 1081 | 1083 |
| 1082 private: | 1084 private: |
| 1083 friend class Texture; | 1085 friend class Texture; |
| 1084 friend class TextureRef; | 1086 friend class TextureRef; |
| 1085 | 1087 |
| 1086 // Helper for Initialize(). | 1088 // Helper for Initialize(). |
| 1087 scoped_refptr<TextureRef> CreateDefaultAndBlackTextures( | 1089 scoped_refptr<TextureRef> CreateDefaultAndBlackTextures( |
| 1088 GLenum target, | 1090 GLenum target, |
| 1089 GLuint* black_texture); | 1091 GLuint* black_texture); |
| 1090 | 1092 |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1187 private: | 1189 private: |
| 1188 DecoderTextureState* texture_state_; | 1190 DecoderTextureState* texture_state_; |
| 1189 base::TimeTicks begin_time_; | 1191 base::TimeTicks begin_time_; |
| 1190 DISALLOW_COPY_AND_ASSIGN(ScopedTextureUploadTimer); | 1192 DISALLOW_COPY_AND_ASSIGN(ScopedTextureUploadTimer); |
| 1191 }; | 1193 }; |
| 1192 | 1194 |
| 1193 } // namespace gles2 | 1195 } // namespace gles2 |
| 1194 } // namespace gpu | 1196 } // namespace gpu |
| 1195 | 1197 |
| 1196 #endif // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_ | 1198 #endif // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_ |
| OLD | NEW |