commit be61c05d897bef024fde7a9f9d7b6c35855bb982
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jan 04 16:33:44 2013 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Jan 04 16:33:44 2013 +0000
tree c4c8aa73cf01bbe0907b01e90aa0abc9e626f86b
parent 90533be035236c9ff0fc3a9944eae2ec160bc60d

Fix Android texture cacheID issue (npot flag not generated correctly)

https://codereview.appspot.com/7042046/



git-svn-id: http://skia.googlecode.com/svn/trunk@7018 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/GrTexture.cpp

diff --git a/src/gpu/GrTexture.cpp b/src/gpu/GrTexture.cpp
index 8aabc2f..614d771 100644
--- a/src/gpu/GrTexture.cpp
+++ b/src/gpu/GrTexture.cpp
@@ -136,8 +136,8 @@
                                                const GrTextureDesc& desc) {
     GrResourceKey::ResourceFlags flags = 0;
     bool tiled = NULL != params && params->isTiled();
-    if (tiled & !gpu->getCaps().npotTextureTileSupport()) {
-        if (!GrIsPow2(desc.fWidth) || GrIsPow2(desc.fHeight)) {
+    if (tiled && !gpu->getCaps().npotTextureTileSupport()) {
+        if (!GrIsPow2(desc.fWidth) || !GrIsPow2(desc.fHeight)) {
             flags |= kStretchToPOT_TextureFlag;
             if (params->isBilerp()) {
                 flags |= kFilter_TextureFlag;