diff options
5 files changed, 3 insertions, 5 deletions
diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/DisplayColorProfile.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/DisplayColorProfile.h index 9c80cacf6f..a74c5fe207 100644 --- a/services/surfaceflinger/CompositionEngine/include/compositionengine/DisplayColorProfile.h +++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/DisplayColorProfile.h @@ -36,7 +36,7 @@ class HdrCapabilities; namespace compositionengine { /** - * Encapsulates all the state and functionality for how colors should be + * Encapsulates all the states and functionality for how colors should be * transformed for a display */ class DisplayColorProfile { diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/Output.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/Output.h index 40ebf4414d..422a79978e 100644 --- a/services/surfaceflinger/CompositionEngine/include/compositionengine/Output.h +++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/Output.h @@ -61,7 +61,7 @@ struct GpuCompositionResult; } // namespace impl /** - * Encapsulates all the state involved with composing layers for an output + * Encapsulates all the states involved with composing layers for an output */ class Output { public: diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/OutputLayerCompositionState.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/OutputLayerCompositionState.h index 7b0af3a248..6c419da716 100644 --- a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/OutputLayerCompositionState.h +++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/OutputLayerCompositionState.h @@ -90,7 +90,7 @@ struct OutputLayerCompositionState { // The source crop for this layer on this output FloatRect sourceCrop; - // The buffer transform to use for this layer o on this output. + // The buffer transform to use for this layer on this output. Hwc2::Transform bufferTransform{static_cast<Hwc2::Transform>(0)}; // The dataspace for this layer diff --git a/services/surfaceflinger/FrontEnd/RequestedLayerState.cpp b/services/surfaceflinger/FrontEnd/RequestedLayerState.cpp index 0e49b754f5..b1a18aefb5 100644 --- a/services/surfaceflinger/FrontEnd/RequestedLayerState.cpp +++ b/services/surfaceflinger/FrontEnd/RequestedLayerState.cpp @@ -98,7 +98,6 @@ RequestedLayerState::RequestedLayerState(const LayerCreationArgs& args) z = 0; layerStack = ui::DEFAULT_LAYER_STACK; transformToDisplayInverse = false; - dataspace = ui::Dataspace::UNKNOWN; desiredHdrSdrRatio = 1.f; currentHdrSdrRatio = 1.f; dataspaceRequested = false; diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 4c2da91afe..f587e9db39 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -4326,7 +4326,6 @@ void Layer::updateSnapshot(bool updateGeometry) { prepareBasicGeometryCompositionState(); prepareGeometryCompositionState(); snapshot->roundedCorner = getRoundedCornerState(); - snapshot->stretchEffect = getStretchEffect(); snapshot->transformedBounds = mScreenBounds; if (mEffectiveShadowRadius > 0.f) { snapshot->shadowSettings = mFlinger->mDrawingState.globalShadowSettings; |