| 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 <algorithm> | 8 #include <algorithm> |
| 9 #include <list> | 9 #include <list> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 850 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 861 ErrorState* error_state, const char* function_name, | 861 ErrorState* error_state, const char* function_name, |
| 862 GLenum format, GLenum type); | 862 GLenum format, GLenum type); |
| 863 | 863 |
| 864 // Note that internal_format is only checked in relation to the format | 864 // Note that internal_format is only checked in relation to the format |
| 865 // parameter, so that this function may be used to validate texSubImage2D. | 865 // parameter, so that this function may be used to validate texSubImage2D. |
| 866 bool ValidateTextureParameters( | 866 bool ValidateTextureParameters( |
| 867 ErrorState* error_state, const char* function_name, | 867 ErrorState* error_state, const char* function_name, |
| 868 GLenum format, GLenum type, GLenum internal_format, GLint level); | 868 GLenum format, GLenum type, GLenum internal_format, GLint level); |
| 869 | 869 |
| 870 // base::trace_event::MemoryDumpProvider implementation. | 870 // base::trace_event::MemoryDumpProvider implementation. |
| 871 bool OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd) override; | 871 bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args, |
| 872 base::trace_event::ProcessMemoryDump* pmd) override; |
| 872 | 873 |
| 873 private: | 874 private: |
| 874 friend class Texture; | 875 friend class Texture; |
| 875 friend class TextureRef; | 876 friend class TextureRef; |
| 876 | 877 |
| 877 // Helper for Initialize(). | 878 // Helper for Initialize(). |
| 878 scoped_refptr<TextureRef> CreateDefaultAndBlackTextures( | 879 scoped_refptr<TextureRef> CreateDefaultAndBlackTextures( |
| 879 GLenum target, | 880 GLenum target, |
| 880 GLuint* black_texture); | 881 GLuint* black_texture); |
| 881 | 882 |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 959 private: | 960 private: |
| 960 DecoderTextureState* texture_state_; | 961 DecoderTextureState* texture_state_; |
| 961 base::TimeTicks begin_time_; | 962 base::TimeTicks begin_time_; |
| 962 DISALLOW_COPY_AND_ASSIGN(ScopedTextureUploadTimer); | 963 DISALLOW_COPY_AND_ASSIGN(ScopedTextureUploadTimer); |
| 963 }; | 964 }; |
| 964 | 965 |
| 965 } // namespace gles2 | 966 } // namespace gles2 |
| 966 } // namespace gpu | 967 } // namespace gpu |
| 967 | 968 |
| 968 #endif // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_ | 969 #endif // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_ |
| OLD | NEW |