| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 CC_RESOURCES_RESOURCE_PROVIDER_H_ | 5 #ifndef CC_RESOURCES_RESOURCE_PROVIDER_H_ |
| 6 #define CC_RESOURCES_RESOURCE_PROVIDER_H_ | 6 #define CC_RESOURCES_RESOURCE_PROVIDER_H_ |
| 7 | 7 |
| 8 #include <deque> | 8 #include <deque> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 DISALLOW_COPY_AND_ASSIGN(ScopedSamplerGL); | 239 DISALLOW_COPY_AND_ASSIGN(ScopedSamplerGL); |
| 240 }; | 240 }; |
| 241 | 241 |
| 242 class CC_EXPORT ScopedWriteLockGL { | 242 class CC_EXPORT ScopedWriteLockGL { |
| 243 public: | 243 public: |
| 244 ScopedWriteLockGL(ResourceProvider* resource_provider, | 244 ScopedWriteLockGL(ResourceProvider* resource_provider, |
| 245 ResourceProvider::ResourceId resource_id); | 245 ResourceProvider::ResourceId resource_id); |
| 246 ~ScopedWriteLockGL(); | 246 ~ScopedWriteLockGL(); |
| 247 | 247 |
| 248 unsigned texture_id() const { return texture_id_; } | 248 unsigned texture_id() const { return texture_id_; } |
| 249 ResourceFormat format() const { return format_; } |
| 249 | 250 |
| 250 private: | 251 private: |
| 251 ResourceProvider* resource_provider_; | 252 ResourceProvider* resource_provider_; |
| 252 ResourceProvider::ResourceId resource_id_; | 253 ResourceProvider::ResourceId resource_id_; |
| 253 unsigned texture_id_; | 254 unsigned texture_id_; |
| 255 ResourceFormat format_; |
| 254 | 256 |
| 255 DISALLOW_COPY_AND_ASSIGN(ScopedWriteLockGL); | 257 DISALLOW_COPY_AND_ASSIGN(ScopedWriteLockGL); |
| 256 }; | 258 }; |
| 257 | 259 |
| 258 class CC_EXPORT ScopedReadLockSoftware { | 260 class CC_EXPORT ScopedReadLockSoftware { |
| 259 public: | 261 public: |
| 260 ScopedReadLockSoftware(ResourceProvider* resource_provider, | 262 ScopedReadLockSoftware(ResourceProvider* resource_provider, |
| 261 ResourceProvider::ResourceId resource_id); | 263 ResourceProvider::ResourceId resource_id); |
| 262 ~ScopedReadLockSoftware(); | 264 ~ScopedReadLockSoftware(); |
| 263 | 265 |
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 548 return format_gl_data_format[format]; | 550 return format_gl_data_format[format]; |
| 549 } | 551 } |
| 550 | 552 |
| 551 inline GLenum GLInternalFormat(ResourceFormat format) { | 553 inline GLenum GLInternalFormat(ResourceFormat format) { |
| 552 return GLDataFormat(format); | 554 return GLDataFormat(format); |
| 553 } | 555 } |
| 554 | 556 |
| 555 } // namespace cc | 557 } // namespace cc |
| 556 | 558 |
| 557 #endif // CC_RESOURCES_RESOURCE_PROVIDER_H_ | 559 #endif // CC_RESOURCES_RESOURCE_PROVIDER_H_ |
| OLD | NEW |