Index: compositor/texture_data.h |
diff --git a/compositor/texture_data.h b/compositor/texture_data.h |
index 56f50b8c49c141942363b275471ace96ec689bcb..38216ead76f0afba1dabffb09d7ed9cd851cf28f 100644 |
--- a/compositor/texture_data.h |
+++ b/compositor/texture_data.h |
@@ -10,7 +10,7 @@ namespace window_manager { |
class TextureData { |
public: |
virtual ~TextureData() {} |
- GLuint texture() const { return texture_; } |
+ unsigned texture() const { return texture_; } |
Daniel Erat
2011/04/02 14:54:36
"unsigned" makes me nervous. please use uint32_t
marcheu
2011/04/04 19:55:58
GLuint is actually defined as an unsigned, but I s
|
bool has_alpha() const { return has_alpha_; } |
void set_has_alpha(bool has_alpha) { has_alpha_ = has_alpha; } |
@@ -19,11 +19,11 @@ class TextureData { |
protected: |
// TextureData is not allowed to be instantiated. |
TextureData() : texture_(0), has_alpha_(true) {} |
- void set_texture(GLuint texture) { texture_ = texture; } |
- const GLuint* texture_ptr() { return &texture_; } |
+ void set_texture(unsigned texture) { texture_ = texture; } |
+ const unsigned* texture_ptr() { return &texture_; } |
private: |
- GLuint texture_; |
+ unsigned texture_; |
bool has_alpha_; |
DISALLOW_COPY_AND_ASSIGN(TextureData); |
}; |