Fix some libhwui build warnings
Fixes: 243390200
Test: make
Change-Id: I0150737e744016d56f8f4c4464d90b29b8505344
diff --git a/libs/hwui/renderthread/ReliableSurface.cpp b/libs/hwui/renderthread/ReliableSurface.cpp
index 6df34be..64d38b9 100644
--- a/libs/hwui/renderthread/ReliableSurface.cpp
+++ b/libs/hwui/renderthread/ReliableSurface.cpp
@@ -150,11 +150,11 @@
}
AHardwareBuffer_Desc desc = AHardwareBuffer_Desc{
- .usage = mUsage,
- .format = mFormat,
.width = 1,
.height = 1,
.layers = 1,
+ .format = mFormat,
+ .usage = mUsage,
.rfu0 = 0,
.rfu1 = 0,
};
diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp
index c3c136f..eab3605 100644
--- a/libs/hwui/renderthread/RenderProxy.cpp
+++ b/libs/hwui/renderthread/RenderProxy.cpp
@@ -123,7 +123,7 @@
}
void RenderProxy::allocateBuffers() {
- mRenderThread.queue().post([=]() { mContext->allocateBuffers(); });
+ mRenderThread.queue().post([this]() { mContext->allocateBuffers(); });
}
bool RenderProxy::pause() {
@@ -136,15 +136,16 @@
void RenderProxy::setLightAlpha(uint8_t ambientShadowAlpha, uint8_t spotShadowAlpha) {
mRenderThread.queue().post(
- [=]() { mContext->setLightAlpha(ambientShadowAlpha, spotShadowAlpha); });
+ [=, this]() { mContext->setLightAlpha(ambientShadowAlpha, spotShadowAlpha); });
}
void RenderProxy::setLightGeometry(const Vector3& lightCenter, float lightRadius) {
- mRenderThread.queue().post([=]() { mContext->setLightGeometry(lightCenter, lightRadius); });
+ mRenderThread.queue().post(
+ [=, this]() { mContext->setLightGeometry(lightCenter, lightRadius); });
}
void RenderProxy::setOpaque(bool opaque) {
- mRenderThread.queue().post([=]() { mContext->setOpaque(opaque); });
+ mRenderThread.queue().post([=, this]() { mContext->setOpaque(opaque); });
}
float RenderProxy::setColorMode(ColorMode mode) {
@@ -152,9 +153,9 @@
// an async call since we already know the return value
if (mode == ColorMode::Hdr || mode == ColorMode::Hdr10) {
return mRenderThread.queue().runSync(
- [=]() -> float { return mContext->setColorMode(mode); });
+ [=, this]() -> float { return mContext->setColorMode(mode); });
} else {
- mRenderThread.queue().post([=]() { mContext->setColorMode(mode); });
+ mRenderThread.queue().post([=, this]() { mContext->setColorMode(mode); });
return 1.f;
}
}
@@ -179,7 +180,7 @@
// destroyCanvasAndSurface() needs a fence as when it returns the
// underlying BufferQueue is going to be released from under
// the render thread.
- mRenderThread.queue().runSync([=]() { mContext->destroy(); });
+ mRenderThread.queue().runSync([this]() { mContext->destroy(); });
}
void RenderProxy::destroyFunctor(int functor) {
@@ -300,7 +301,7 @@
}
void RenderProxy::resetProfileInfo() {
- mRenderThread.queue().runSync([=]() {
+ mRenderThread.queue().runSync([this]() {
std::lock_guard lock(mRenderThread.getJankDataMutex());
mContext->resetFrameStats();
});
@@ -355,15 +356,15 @@
}
void RenderProxy::addRenderNode(RenderNode* node, bool placeFront) {
- mRenderThread.queue().post([=]() { mContext->addRenderNode(node, placeFront); });
+ mRenderThread.queue().post([=, this]() { mContext->addRenderNode(node, placeFront); });
}
void RenderProxy::removeRenderNode(RenderNode* node) {
- mRenderThread.queue().post([=]() { mContext->removeRenderNode(node); });
+ mRenderThread.queue().post([=, this]() { mContext->removeRenderNode(node); });
}
void RenderProxy::drawRenderNode(RenderNode* node) {
- mRenderThread.queue().runSync([=]() { mContext->prepareAndDraw(node); });
+ mRenderThread.queue().runSync([=, this]() { mContext->prepareAndDraw(node); });
}
void RenderProxy::setContentDrawBounds(int left, int top, int right, int bottom) {
diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp
index f76ea06..623ee4e 100644
--- a/libs/hwui/renderthread/RenderThread.cpp
+++ b/libs/hwui/renderthread/RenderThread.cpp
@@ -150,7 +150,7 @@
ATRACE_FORMAT("queue mFrameCallbackTask to run after %.2fms",
toFloatMillis(runAt - SteadyClock::now()).count());
queue().postAt(toNsecs_t(runAt.time_since_epoch()).count(),
- [=]() { dispatchFrameCallbacks(); });
+ [this]() { dispatchFrameCallbacks(); });
}
}
diff --git a/libs/hwui/tests/unit/CanvasOpTests.cpp b/libs/hwui/tests/unit/CanvasOpTests.cpp
index 1f6edf3..18c5047 100644
--- a/libs/hwui/tests/unit/CanvasOpTests.cpp
+++ b/libs/hwui/tests/unit/CanvasOpTests.cpp
@@ -225,9 +225,9 @@
TEST(CanvasOp, simpleDrawRect) {
CanvasOpBuffer buffer;
EXPECT_EQ(buffer.size(), 0);
- buffer.push<Op::DrawRect> ({
- .paint = SkPaint{},
- .rect = SkRect::MakeEmpty()
+ buffer.push<Op::DrawRect>({
+ .rect = SkRect::MakeEmpty(),
+ .paint = SkPaint{},
});
CallCountingCanvas canvas;
@@ -242,9 +242,9 @@
EXPECT_EQ(buffer.size(), 0);
SkRegion region;
region.setRect(SkIRect::MakeWH(12, 50));
- buffer.push<Op::DrawRegion> ({
- .paint = SkPaint{},
- .region = region
+ buffer.push<Op::DrawRegion>({
+ .region = region,
+ .paint = SkPaint{},
});
CallCountingCanvas canvas;
@@ -264,9 +264,9 @@
clip.setRect(SkIRect::MakeWH(100, 100));
SkRegion region;
region.setPath(path, clip);
- buffer.push<Op::DrawRegion> ({
- .paint = SkPaint{},
- .region = region
+ buffer.push<Op::DrawRegion>({
+ .region = region,
+ .paint = SkPaint{},
});
CallCountingCanvas canvas;
@@ -279,11 +279,11 @@
TEST(CanvasOp, simpleDrawRoundRect) {
CanvasOpBuffer buffer;
EXPECT_EQ(buffer.size(), 0);
- buffer.push<Op::DrawRoundRect> ({
- .paint = SkPaint{},
- .rect = SkRect::MakeEmpty(),
- .rx = 10,
- .ry = 10
+ buffer.push<Op::DrawRoundRect>({
+ .rect = SkRect::MakeEmpty(),
+ .rx = 10,
+ .ry = 10,
+ .paint = SkPaint{},
});
CallCountingCanvas canvas;
@@ -611,9 +611,9 @@
EXPECT_EQ(0, canvas->sumTotalDrawCalls());
ImmediateModeRasterizer rasterizer{canvas};
- auto op = CanvasOp<Op::DrawRect> {
- .paint = SkPaint{},
- .rect = SkRect::MakeEmpty()
+ auto op = CanvasOp<Op::DrawRect>{
+ .rect = SkRect::MakeEmpty(),
+ .paint = SkPaint{},
};
EXPECT_TRUE(CanvasOpTraits::can_draw<decltype(op)>);
rasterizer.draw(op);