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

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

Merge "SF: rename CommandWriterBase and CommandReaderBase"

parents db08d8c0 bea99ba1

services/surfaceflinger/DisplayHardware/AidlComposerHal.h

+6 −5
Original line number Original line Diff line number Diff line
@@ -34,7 +34,8 @@ 




#include <aidl/android/hardware/graphics/composer3/IComposer.h>

#include <aidl/android/hardware/graphics/composer3/IComposer.h>

#include <aidl/android/hardware/graphics/composer3/IComposerClient.h>

#include <aidl/android/hardware/graphics/composer3/IComposerClient.h>

#include <android/hardware/graphics/composer3/command-buffer.h>

#include <android/hardware/graphics/composer3/ComposerClientReader.h>

#include <android/hardware/graphics/composer3/ComposerClientWriter.h>





#include <aidl/android/hardware/graphics/composer3/Composition.h>

#include <aidl/android/hardware/graphics/composer3/Composition.h>
@@ -43,8 +44,8 @@ 




namespace android::Hwc2 {

namespace android::Hwc2 {





using AidlCommandWriterBase = aidl::android::hardware::graphics::composer3::CommandWriterBase;

using aidl::android::hardware::graphics::composer3::ComposerClientReader;

using AidlCommandReaderBase = aidl::android::hardware::graphics::composer3::CommandReaderBase;

using aidl::android::hardware::graphics::composer3::ComposerClientWriter;





class AidlIComposerCallbackWrapper;

class AidlIComposerCallbackWrapper;
@@ -220,8 +221,8 @@ private: 
    // 1. Tightly coupling this cache to the max size of BufferQueue

    // 1. Tightly coupling this cache to the max size of BufferQueue

    // 2. Adding an additional slot for the layer caching feature in SurfaceFlinger (see: Planner.h)

    // 2. Adding an additional slot for the layer caching feature in SurfaceFlinger (see: Planner.h)

    static const constexpr uint32_t kMaxLayerBufferCount = BufferQueue::NUM_BUFFER_SLOTS + 1;

    static const constexpr uint32_t kMaxLayerBufferCount = BufferQueue::NUM_BUFFER_SLOTS + 1;

    AidlCommandWriterBase mWriter;

    ComposerClientWriter mWriter;

    AidlCommandReaderBase mReader;

    ComposerClientReader mReader;





    // Aidl interface

    // Aidl interface

    using AidlIComposer = aidl::android::hardware::graphics::composer3::IComposer;

    using AidlIComposer = aidl::android::hardware::graphics::composer3::IComposer;