diff options
| author | Mathias Agopian <mathias@google.com> | 2013-08-14 22:42:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-14 22:42:52 +0000 |
| commit | 56f825e7ab9f83706a74dcd4825c7bc839e49ae4 (patch) | |
| tree | 2b9ce897a97bf75e7e6ee2bda38f4be6bf417134 /libs/gui | |
| parent | 5025593d0ee6bf6d03121d9c42623bae0f131c9d (diff) | |
| parent | 3f84483382be2d528918cc1a6fbc6a7d68e0b181 (diff) | |
| download | frameworks_native-56f825e7ab9f83706a74dcd4825c7bc839e49ae4.zip frameworks_native-56f825e7ab9f83706a74dcd4825c7bc839e49ae4.tar.gz frameworks_native-56f825e7ab9f83706a74dcd4825c7bc839e49ae4.tar.bz2 | |
Merge "SurfaceFlinger now uses GLES 2.x when available" into klp-dev
Diffstat (limited to 'libs/gui')
| -rw-r--r-- | libs/gui/GLConsumer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/gui/GLConsumer.cpp b/libs/gui/GLConsumer.cpp index 482317f..0a2afbf 100644 --- a/libs/gui/GLConsumer.cpp +++ b/libs/gui/GLConsumer.cpp @@ -89,8 +89,8 @@ static void mtxMul(float out[16], const float a[16], const float b[16]); Mutex GLConsumer::sStaticInitLock; sp<GraphicBuffer> GLConsumer::sReleasedTexImageBuffer; -GLConsumer::GLConsumer(const sp<IGraphicBufferConsumer>& bq, GLuint tex, - GLenum texTarget, bool useFenceSync, bool isControlledByApp) : +GLConsumer::GLConsumer(const sp<IGraphicBufferConsumer>& bq, uint32_t tex, + uint32_t texTarget, bool useFenceSync, bool isControlledByApp) : ConsumerBase(bq, isControlledByApp), mCurrentTransform(0), mCurrentScalingMode(NATIVE_WINDOW_SCALING_MODE_FREEZE), @@ -523,7 +523,7 @@ status_t GLConsumer::detachFromContext() { return OK; } -status_t GLConsumer::attachToContext(GLuint tex) { +status_t GLConsumer::attachToContext(uint32_t tex) { ATRACE_CALL(); ST_LOGV("attachToContext"); Mutex::Autolock lock(mMutex); @@ -554,7 +554,7 @@ status_t GLConsumer::attachToContext(GLuint tex) { // We need to bind the texture regardless of whether there's a current // buffer. - glBindTexture(mTexTarget, tex); + glBindTexture(mTexTarget, GLuint(tex)); if (mCurrentTextureBuf != NULL) { // The EGLImageKHR that was associated with the slot was destroyed when @@ -689,7 +689,7 @@ bool GLConsumer::isExternalFormat(uint32_t format) return false; } -GLenum GLConsumer::getCurrentTextureTarget() const { +uint32_t GLConsumer::getCurrentTextureTarget() const { return mTexTarget; } |