diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-10-21 16:22:15 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-21 16:22:15 -0700 |
| commit | 2f4ce2ecd08e06ff02c69d3ddca9943f8e9f7955 (patch) | |
| tree | d222a9da0040c6980be5ae09d2f1ea1368d76997 /services | |
| parent | 9ec98cd134a3d698bc3ee7a62c02c7818e8b02af (diff) | |
| parent | f9e4551367909582706643559daa70e38e28aeb9 (diff) | |
| download | frameworks_base-2f4ce2ecd08e06ff02c69d3ddca9943f8e9f7955.zip frameworks_base-2f4ce2ecd08e06ff02c69d3ddca9943f8e9f7955.tar.gz frameworks_base-2f4ce2ecd08e06ff02c69d3ddca9943f8e9f7955.tar.bz2 | |
Merge "Fix software GL renderer."
Diffstat (limited to 'services')
| -rw-r--r-- | services/surfaceflinger/Layer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 28552f6..d3b0dbf 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -284,8 +284,8 @@ void Layer::onDraw(const Region& clip) const glMatrixMode(GL_TEXTURE); glLoadMatrixf(mTextureMatrix); glMatrixMode(GL_MODELVIEW); - glEnable(GL_TEXTURE_EXTERNAL_OES); glDisable(GL_TEXTURE_2D); + glEnable(GL_TEXTURE_EXTERNAL_OES); } else { glBindTexture(GL_TEXTURE_2D, mFlinger->getProtectedTexName()); glMatrixMode(GL_TEXTURE); |