diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-22 22:04:12 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-22 22:04:12 -0700 |
| commit | e4f071b1f3d2da871a1a05446c32c0f324b52f1e (patch) | |
| tree | 217d70fc3a8aff19449868474921f0adb7908e3b | |
| parent | 56f0cc533a38bdb84bc03adcb43515614ab21bae (diff) | |
| parent | f1bd03d1eb0505a32485b1a52c7c8c5ed4e96765 (diff) | |
| download | frameworks_av-e4f071b1f3d2da871a1a05446c32c0f324b52f1e.zip frameworks_av-e4f071b1f3d2da871a1a05446c32c0f324b52f1e.tar.gz frameworks_av-e4f071b1f3d2da871a1a05446c32c0f324b52f1e.tar.bz2 | |
am 5277103d: Merge change 5035 into donut
Merge commit '5277103db9033226814edc8fcba6f4ba4e846678'
* commit '5277103db9033226814edc8fcba6f4ba4e846678':
add glTexParameteri() and fix glTexParameteriv()
| -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 0c7ad46..a85f275 100644 --- a/include/private/opengles/gl_context.h +++ b/include/private/opengles/gl_context.h @@ -456,7 +456,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)); } |