Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55a87cc1 authored by Ady Abraham's avatar Ady Abraham Committed by Android (Google) Code Review
Browse files

Merge "Revert "composer: adds BufferAhead for the LayerCommand.aidl""

parents f5ad7c56 fac55444
Loading
Loading
Loading
Loading
+0 −44
Original line number Diff line number Diff line
/**
 * Copyright (c) 2022, The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //
///////////////////////////////////////////////////////////////////////////////

// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
//     the interface (from the latest frozen version), the build system will
//     prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.

package android.hardware.graphics.composer3;
@VintfStability
parcelable BufferAheadResult {
  long display;
  android.hardware.graphics.composer3.BufferAheadResult.Layer[] layers;
  @VintfStability
  parcelable Layer {
    long layer;
    boolean presented;
  }
}
+0 −1
Original line number Diff line number Diff line
@@ -39,5 +39,4 @@ enum Capability {
  SKIP_CLIENT_COLOR_TRANSFORM = 2,
  PRESENT_FENCE_IS_NOT_RELIABLE = 3,
  SKIP_VALIDATE = 4,
  BUFFER_AHEAD = 5,
}
+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ union CommandResultPayload {
  android.hardware.graphics.composer3.DisplayRequest displayRequest;
  android.hardware.graphics.composer3.PresentFence presentFence;
  android.hardware.graphics.composer3.ReleaseFences releaseFences;
  android.hardware.graphics.composer3.BufferAheadResult bufferAheadResult;
  android.hardware.graphics.composer3.PresentOrValidate presentOrValidateResult;
  android.hardware.graphics.composer3.ClientTargetPropertyWithNits clientTargetProperty;
}
+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ parcelable LayerCommand {
  long layer;
  @nullable android.hardware.graphics.common.Point cursorPosition;
  @nullable android.hardware.graphics.composer3.Buffer buffer;
  @nullable android.hardware.graphics.composer3.Buffer bufferAhead;
  @nullable android.hardware.graphics.common.Rect[] damage;
  @nullable android.hardware.graphics.composer3.ParcelableBlendMode blendMode;
  @nullable android.hardware.graphics.composer3.Color color;
+0 −46
Original line number Diff line number Diff line
/**
 * Copyright (c) 2022, The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package android.hardware.graphics.composer3;

@VintfStability
parcelable BufferAheadResult {
    /**
     * The display which this commands refers to.
     * @see IComposer.createDisplay
     */
    long display;

    @VintfStability
    parcelable Layer {
        /**
         * The layer which this commands refers to.
         * @see IComposer.createLayer
         */
        long layer;

        /**
         * Represents whether BufferAhead was presented as part of the last
         * present or not.
         */
        boolean presented;
    }

    /**
     * The layers which has BufferAheadResult populated.
     */
    Layer[] layers;
}
Loading