Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Unified Diff: cc/resources/resource.h

Issue 21159007: cc: Adding support for RGBA_4444 tile textures (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: deprecate GLenum format throughout cc Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/resources/resource.h
diff --git a/cc/resources/resource.h b/cc/resources/resource.h
index 1c658223649375835534122493f4e399a51f6e95..44c039967349d65696bd6bb7442c93e70003b7cb 100644
--- a/cc/resources/resource.h
+++ b/cc/resources/resource.h
@@ -15,23 +15,24 @@ namespace cc {
class CC_EXPORT Resource {
public:
Resource() : id_(0) {}
- Resource(unsigned id, gfx::Size size, GLenum format)
+ Resource(unsigned id,
+ gfx::Size size,
+ ResourceProvider::TextureFormat format)
: id_(id),
size_(size),
format_(format) {}
ResourceProvider::ResourceId id() const { return id_; }
gfx::Size size() const { return size_; }
- GLenum format() const { return format_; }
-
+ ResourceProvider::TextureFormat format() const { return format_; }
size_t bytes() const;
- static size_t BytesPerPixel(GLenum format);
- static size_t MemorySizeBytes(gfx::Size size, GLenum format);
+ static size_t MemorySizeBytes(
+ gfx::Size size, ResourceProvider::TextureFormat type);
protected:
void set_id(ResourceProvider::ResourceId id) { id_ = id; }
- void set_dimensions(gfx::Size size, GLenum format) {
+ void set_dimensions(gfx::Size size, ResourceProvider::TextureFormat format) {
size_ = size;
format_ = format;
}
@@ -39,7 +40,7 @@ class CC_EXPORT Resource {
private:
ResourceProvider::ResourceId id_;
gfx::Size size_;
- GLenum format_;
+ ResourceProvider::TextureFormat format_;
DISALLOW_COPY_AND_ASSIGN(Resource);
};

Powered by Google App Engine
This is Rietveld 408576698