| Index: cc/texture.h
|
| diff --git a/cc/texture.h b/cc/texture.h
|
| index 8d0def354495aab9e2cf023a8781a6bec9c03cdf..b55e6e7aad60b6cb3aeb4d8729da78bc11ce412c 100644
|
| --- a/cc/texture.h
|
| +++ b/cc/texture.h
|
| @@ -12,19 +12,19 @@
|
|
|
| namespace cc {
|
|
|
| -class CCTexture {
|
| +class Texture {
|
| public:
|
| - CCTexture() : m_id(0) { }
|
| - CCTexture(unsigned id, IntSize size, GC3Denum format)
|
| + Texture() : m_id(0) { }
|
| + Texture(unsigned id, IntSize size, GC3Denum format)
|
| : m_id(id)
|
| , m_size(size)
|
| , m_format(format) { }
|
|
|
| - CCResourceProvider::ResourceId id() const { return m_id; }
|
| + ResourceProvider::ResourceId id() const { return m_id; }
|
| const IntSize& size() const { return m_size; }
|
| GC3Denum format() const { return m_format; }
|
|
|
| - void setId(CCResourceProvider::ResourceId id) { m_id = id; }
|
| + void setId(ResourceProvider::ResourceId id) { m_id = id; }
|
| void setDimensions(const IntSize&, GC3Denum format);
|
|
|
| size_t bytes() const;
|
| @@ -32,7 +32,7 @@ public:
|
| static size_t memorySizeBytes(const IntSize&, GC3Denum format);
|
|
|
| private:
|
| - CCResourceProvider::ResourceId m_id;
|
| + ResourceProvider::ResourceId m_id;
|
| IntSize m_size;
|
| GC3Denum m_format;
|
| };
|
|
|