diff options
| author | Mathias Agopian <mathias@google.com> | 2009-06-24 18:31:21 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-06-24 18:31:21 -0700 |
| commit | f31868e59fbf59a8d479587c80b648fb37a166fc (patch) | |
| tree | 5a0aa67a76d6b0e48041f557eefd764e57eb97cf /include/private | |
| parent | c6603951d45fc9b0d1776fec9444b6f31af92840 (diff) | |
| parent | ecf2b68d834d334de218dc427615b4ca05c0293a (diff) | |
| download | frameworks_base-f31868e59fbf59a8d479587c80b648fb37a166fc.zip frameworks_base-f31868e59fbf59a8d479587c80b648fb37a166fc.tar.gz frameworks_base-f31868e59fbf59a8d479587c80b648fb37a166fc.tar.bz2 | |
merge master in master_gl
Diffstat (limited to 'include/private')
| -rw-r--r-- | include/private/opengles/gl_context.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/private/opengles/gl_context.h b/include/private/opengles/gl_context.h index 3b40677..523aed0 100644 --- a/include/private/opengles/gl_context.h +++ b/include/private/opengles/gl_context.h @@ -458,7 +458,7 @@ struct matrix_stack_t { void validate(); matrixf_t& top() { return stack[depth]; } const matrixf_t& top() const { return stack[depth]; } - const uint32_t top_ops() const { return ops[depth]; } + uint32_t top_ops() const { return ops[depth]; } inline bool isRigidBody() const { return !(ops[depth] & ~(OP_TRANSLATE|OP_UNIFORM_SCALE|OP_ROTATE)); } |