commit f8a873a9172df74b4b985a678b22b328acb08d37
author Vishnu Nair <vishnun@google.com> Wed Jun 15 17:34:34 2022 +0000
committer Vishnu Nair <vishnun@google.com> Wed Jun 15 21:15:38 2022 +0000
tree 287320f1af3b10f56efb74397b1c2c0331bd7f13
parent 17be5263a5a9c2abc5003678949b93b33d82db48

SF: Remove BufferQueueLayer tests

Replace BQL with BSL inside composition
engine tests. While we are at it make BQL
constructor private and build the world.

Bug: 200285148
Test: atest libsurfaceflinger_tests
Change-Id: I28d1c5ff73074c8c7a27ca45ce4c2ca2cc2e385f

services/surfaceflinger/BufferLayer.cpp

diff --git a/services/surfaceflinger/BufferLayer.cpp b/services/surfaceflinger/BufferLayer.cpp
index d9c89cd..fb15f1d 100644
--- a/services/surfaceflinger/BufferLayer.cpp
+++ b/services/surfaceflinger/BufferLayer.cpp
@@ -738,10 +738,14 @@
 }
 
 void BufferLayer::getDrawingTransformMatrix(bool filteringEnabled, float outMatrix[16]) {
-    GLConsumer::computeTransformMatrix(outMatrix,
-                                       mBufferInfo.mBuffer ? mBufferInfo.mBuffer->getBuffer()
-                                                           : nullptr,
-                                       mBufferInfo.mCrop, mBufferInfo.mTransform, filteringEnabled);
+    sp<GraphicBuffer> buffer = getBuffer();
+    if (!buffer) {
+        ALOGE("Buffer should not be null!");
+        return;
+    }
+    GLConsumer::computeTransformMatrix(outMatrix, buffer->getWidth(), buffer->getHeight(),
+                                       buffer->getPixelFormat(), mBufferInfo.mCrop,
+                                       mBufferInfo.mTransform, filteringEnabled);
 }
 
 void BufferLayer::setInitialValuesForClone(const sp<Layer>& clonedFrom) {