diff options
| author | 2009-07-30 12:31:47 -0700 | |
|---|---|---|
| committer | 2009-07-30 12:31:47 -0700 | |
| commit | af3d2be76de0844c38b5560cebd875807d565f5e (patch) | |
| tree | e81600e5f6ee5966ffa2438d3079608dae462b47 /libs/surfaceflinger/LayerBase.cpp | |
| parent | 396dbf45e301625e0712a5c6eb088cae0ff5b8c5 (diff) | |
| parent | 5e631892fb9ac4da83b70ba129ceb6a3f501bad9 (diff) | |
Merge changes 9206,9207
* changes:
Fix a debug statement in BufferMapper
NPOT EGLimage without GL_ARB_texture_non_power_of_two would be improperly scalled
Diffstat (limited to 'libs/surfaceflinger/LayerBase.cpp')
| -rw-r--r-- | libs/surfaceflinger/LayerBase.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/surfaceflinger/LayerBase.cpp b/libs/surfaceflinger/LayerBase.cpp index a841ab3348d1..fbce73ddd3be 100644 --- a/libs/surfaceflinger/LayerBase.cpp +++ b/libs/surfaceflinger/LayerBase.cpp @@ -461,7 +461,8 @@ void LayerBase::drawWithOpenGL(const Region& clip, const Texture& texture) const glRotatef(-90, 0, 0, 1); } - if (!(mFlags & DisplayHardware::NPOT_EXTENSION)) { + if (!(mFlags & (DisplayHardware::NPOT_EXTENSION | + DisplayHardware::DIRECT_TEXTURE))) { // find the smallest power-of-two that will accommodate our surface GLuint tw = 1 << (31 - clz(width)); GLuint th = 1 << (31 - clz(height)); |