commit d0aef4dfe5ac80a1b51d5002a24c51d2ff56a15e
author Adam Bodnar <abodnar@google.com> Thu Jul 11 10:35:42 2019 -0700
committer Adam Bodnar <abodnar@google.com> Wed Aug 14 15:06:45 2019 -0700
tree 1eaacde4229640b9742a27c68f521f3bebaf1d11
parent 656089c2ce9ac7d93d49e9e152fd68686c0bd2fc

Add more HWC vs RenderEngine tests to composer vts

Bug: 133411821
Test: build, boot, VtsHalGraphicsComposerV2_2TargetTest
Change-Id: I19322f75b098813b1e4acf31cb6bae9e15fb8915

graphics/composer/2.2/utils/vts/ReadbackVts.cpp

diff --git a/graphics/composer/2.2/utils/vts/ReadbackVts.cpp b/graphics/composer/2.2/utils/vts/ReadbackVts.cpp
index d479aa7..7bb9121 100644
--- a/graphics/composer/2.2/utils/vts/ReadbackVts.cpp
+++ b/graphics/composer/2.2/utils/vts/ReadbackVts.cpp
@@ -81,14 +81,14 @@
             static_cast<float>(mDisplayFrame.left), static_cast<float>(mDisplayFrame.top),
             static_cast<float>(mDisplayFrame.right), static_cast<float>(mDisplayFrame.bottom));
 
-    const mat4 translation = mat4::translate(vec4(
-            (mTransform & Transform::FLIP_H ? -1.0f : 0.0f) * mDisplayFrame.right,
-            (mTransform & Transform::FLIP_V ? -1.0f : 0.0f) * mDisplayFrame.bottom, 0.0f, 1.0f));
+    const mat4 translation = mat4::translate(
+            vec4((mTransform & Transform::FLIP_H ? -mDisplayFrame.right : 0.0f),
+                 (mTransform & Transform::FLIP_V ? -mDisplayFrame.bottom : 0.0f), 0.0f, 1.0f));
 
     const mat4 scale = mat4::scale(vec4(mTransform & Transform::FLIP_H ? -1.0f : 1.0f,
                                         mTransform & Transform::FLIP_V ? -1.0f : 1.0f, 1.0f, 1.0f));
 
-    layerSettings.geometry.positionTransform = translation * scale;
+    layerSettings.geometry.positionTransform = scale * translation;
 
     return layerSettings;
 }
@@ -296,9 +296,9 @@
     layerSettings.source.buffer.buffer =
             new GraphicBuffer(mBufferHandle, GraphicBuffer::CLONE_HANDLE, mWidth, mHeight,
                               static_cast<int32_t>(mFormat), 1, mUsage, mStride);
-    // TODO(b/136483187): Why does this break the premultiply test
-    // layerSettings.source.buffer.usePremultipliedAlpha =
-    //      mBlendMode == IComposerClient::BlendMode::PREMULTIPLIED;
+
+    layerSettings.source.buffer.usePremultipliedAlpha =
+            mBlendMode == IComposerClient::BlendMode::PREMULTIPLIED;
 
     const float scaleX = (mSourceCrop.right - mSourceCrop.left) / (mWidth);
     const float scaleY = (mSourceCrop.bottom - mSourceCrop.top) / (mHeight);