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 | ffa5a5a3dbef79dc6958c629080b1a6438a7b637 (patch) | |
| tree | 6f55b73c1d1f654914b17f9b9243fd8734f135c4 /include/private | |
| parent | 949070dd74be18ee3dcc87dd32f47f65374e3d53 (diff) | |
| parent | 5277103db9033226814edc8fcba6f4ba4e846678 (diff) | |
| download | frameworks_base-ffa5a5a3dbef79dc6958c629080b1a6438a7b637.zip frameworks_base-ffa5a5a3dbef79dc6958c629080b1a6438a7b637.tar.gz frameworks_base-ffa5a5a3dbef79dc6958c629080b1a6438a7b637.tar.bz2 | |
am 5277103d: Merge change 5035 into donut
Merge commit '5277103db9033226814edc8fcba6f4ba4e846678'
* commit '5277103db9033226814edc8fcba6f4ba4e846678':
add glTexParameteri() and fix glTexParameteriv()
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 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)); } |