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 | 4c4b387afb2e775fcac3b81a249bb7646515dffa (patch) | |
| tree | 893af3f7521ad4aa204449dc58132b21177e41fb /include/private | |
| parent | 2e123245811a1f31c080a29728fcc1655045f011 (diff) | |
| parent | 6ebed6600464d507a651d99792baa3a23a4f0766 (diff) | |
| download | frameworks_native-4c4b387afb2e775fcac3b81a249bb7646515dffa.zip frameworks_native-4c4b387afb2e775fcac3b81a249bb7646515dffa.tar.gz frameworks_native-4c4b387afb2e775fcac3b81a249bb7646515dffa.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)); } |