Merge "Enable linear filter when scaling bitmaps Bug #5205673"

Romain Guy · Android (Google) Code Review · commit 9b9783ad60d3 · 2011-08-24T11:52:55.000-07:00
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
@@ -1493,7 +1493,8 @@ void OpenGLRenderer::drawBitmap(SkBitmap* bitmap,
         const float y = (int) floorf(dstTop + mSnapshot->transform->getTranslateY() + 0.5f);
 
         GLenum filter = GL_NEAREST;
-        if (u1 > 0.0f || u2 < 1.0f || v1 > 0.0f || v2 < 1.0f) {
+        // Enable linear filtering if the source rectangle is scaled
+        if (srcRight - srcLeft != dstRight - dstLeft || srcBottom - srcTop != dstBottom - dstTop) {
             filter = GL_LINEAR;
         }
         texture->setFilter(filter, filter, true);

Original file line number	Diff line number	Diff line change
`@@ -1493,7 +1493,8 @@ void OpenGLRenderer::drawBitmap(SkBitmap* bitmap,`
`1493`	`1493`	`const float y = (int) floorf(dstTop + mSnapshot->transform->getTranslateY() + 0.5f);`
`1494`	`1494`
`1495`	`1495`	`GLenum filter = GL_NEAREST;`
`1496`		`- if (u1 > 0.0f \|\| u2 < 1.0f \|\| v1 > 0.0f \|\| v2 < 1.0f) {`
	`1496`	`+ // Enable linear filtering if the source rectangle is scaled`
	`1497`	`+ if (srcRight - srcLeft != dstRight - dstLeft \|\| srcBottom - srcTop != dstBottom - dstTop) {`
`1497`	`1498`	`filter = GL_LINEAR;`
`1498`	`1499`	`}`
`1499`	`1500`	`texture->setFilter(filter, filter, true);`