diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-02-14 14:58:07 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-02-14 14:58:07 +0000 |
commit | 8441f7503b21c46933d6ee2c8ba5f6b958566f9f (patch) | |
tree | f0a19fe4081c20f36aeae41410cee91e9e92fac7 | |
parent | 92df735b5e394a4ebb74fbbaf410c3a564a35e9d (diff) | |
parent | fa06e6f6071da27d0caaeaa2b64ac5a5a996b117 (diff) | |
download | goldfish-opengl-8441f7503b21c46933d6ee2c8ba5f6b958566f9f.tar.gz |
Merge "Clean up some build warnings" into main
-rw-r--r-- | system/hwc3/HostFrameComposer.cpp | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/system/hwc3/HostFrameComposer.cpp b/system/hwc3/HostFrameComposer.cpp index 8f232dcc..2a88b756 100644 --- a/system/hwc3/HostFrameComposer.cpp +++ b/system/hwc3/HostFrameComposer.cpp @@ -410,20 +410,21 @@ HWC3::Error HostFrameComposer::validateDisplay(Display* display, DisplayChanges* if (!fallBackToClient) { for (const auto& layer : layers) { const auto& layerCompositionType = layer->getCompositionType(); + const auto layerCompositionTypeString = toString(layerCompositionType); std::optional<Composition> layerFallBackTo = std::nullopt; switch (layerCompositionType) { case Composition::CLIENT: case Composition::SIDEBAND: - ALOGV("%s: layer %" PRIu32 " CompositionType %d, fallback to client", + ALOGV("%s: layer %" PRIu32 " CompositionType %s, fallback to client", __FUNCTION__, static_cast<uint32_t>(layer->getId()), - layerCompositionType); + layerCompositionTypeString.c_str()); layerFallBackTo = Composition::CLIENT; break; case Composition::CURSOR: - ALOGV("%s: layer %" PRIu32 " CompositionType %d, fallback to device", + ALOGV("%s: layer %" PRIu32 " CompositionType %s, fallback to device", __FUNCTION__, static_cast<uint32_t>(layer->getId()), - layerCompositionType); + layerCompositionTypeString.c_str()); layerFallBackTo = Composition::DEVICE; break; case Composition::INVALID: @@ -432,8 +433,8 @@ HWC3::Error HostFrameComposer::validateDisplay(Display* display, DisplayChanges* layerFallBackTo = std::nullopt; break; default: - ALOGE("%s: layer %" PRIu32 " has an unknown composition type: %d", __FUNCTION__, - static_cast<uint32_t>(layer->getId()), layerCompositionType); + ALOGE("%s: layer %" PRIu32 " has an unknown composition type: %s", __FUNCTION__, + static_cast<uint32_t>(layer->getId()), layerCompositionTypeString.c_str()); } if (layerFallBackTo == Composition::CLIENT) { fallBackToClient = true; @@ -447,7 +448,6 @@ HWC3::Error HostFrameComposer::validateDisplay(Display* display, DisplayChanges* if (fallBackToClient) { changes.clear(); for (auto& layer : layers) { - const auto& layerId = layer->getId(); if (layer->getCompositionType() == Composition::INVALID) { continue; } @@ -555,15 +555,18 @@ HWC3::Error HostFrameComposer::presentDisplay( std::vector<int64_t> releaseLayerIds; for (auto layer : layers) { + const auto& layerCompositionType = layer->getCompositionType(); + const auto layerCompositionTypeString = toString(layerCompositionType); + // TODO: use local var composisitonType to store getCompositionType() - if (layer->getCompositionType() != Composition::DEVICE && - layer->getCompositionType() != Composition::SOLID_COLOR) { - ALOGE("%s: Unsupported composition types %d layer %u", __FUNCTION__, - layer->getCompositionType(), (uint32_t)layer->getId()); + if (layerCompositionType != Composition::DEVICE && + layerCompositionType != Composition::SOLID_COLOR) { + ALOGE("%s: Unsupported composition type %s layer %u", __FUNCTION__, + layerCompositionTypeString.c_str(), (uint32_t)layer->getId()); continue; } // send layer composition command to host - if (layer->getCompositionType() == Composition::DEVICE) { + if (layerCompositionType == Composition::DEVICE) { releaseLayerIds.emplace_back(layer->getId()); ::android::base::unique_fd fence = layer->getBuffer().getFence(); @@ -586,7 +589,7 @@ HWC3::Error HostFrameComposer::presentDisplay( // solidcolor has no buffer l->cbHandle = 0; } - l->composeMode = (hwc2_composition_t)layer->getCompositionType(); + l->composeMode = (hwc2_composition_t)layerCompositionType; l->displayFrame = AsHwcRect(layer->getDisplayFrame()); l->crop = AsHwcFrect(layer->getSourceCrop()); l->blendMode = static_cast<int32_t>(layer->getBlendMode()); |