diff options
| author | Ady Abraham <adyabr@google.com> | 2021-12-22 23:14:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-12-22 23:14:05 +0000 |
| commit | e2af3c01f41d141ae85d20b1aef125ddba1084d4 (patch) | |
| tree | e71323119aa21e84b4f3fa5c15e2dc78bf387286 /hwc3/ComposerCommandEngine.cpp | |
| parent | a245b727dc1cb61887eca0d042a349972802550a (diff) | |
| parent | 169defd014b8d5ea2e424c8c80ea1b53a906199d (diff) | |
Merge "hwc3: DisplayCommand.colorTransform is just a matrix"
Diffstat (limited to 'hwc3/ComposerCommandEngine.cpp')
| -rw-r--r-- | hwc3/ComposerCommandEngine.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hwc3/ComposerCommandEngine.cpp b/hwc3/ComposerCommandEngine.cpp index cd4925a..b272172 100644 --- a/hwc3/ComposerCommandEngine.cpp +++ b/hwc3/ComposerCommandEngine.cpp @@ -68,7 +68,7 @@ void ComposerCommandEngine::dispatchDisplayCommand(const DisplayCommand& command dispatchLayerCommand(command.display, layerCmd); } - DISPATCH_DISPLAY_COMMAND(command, colorTransform, SetColorTransform); + DISPATCH_DISPLAY_COMMAND(command, colorTransformMatrix, SetColorTransform); DISPATCH_DISPLAY_COMMAND(command, clientTarget, SetClientTarget); DISPATCH_DISPLAY_COMMAND(command, virtualDisplayOutputBuffer, SetOutputBuffer); // TODO: (b/196171661) SDR & HDR blending @@ -128,8 +128,8 @@ int32_t ComposerCommandEngine::executeValidateDisplayInternal(int64_t display) { } void ComposerCommandEngine::executeSetColorTransform(int64_t display, - const ColorTransformPayload& command) { - auto err = mHal->setColorTransform(display, command.matrix, command.hint); + const std::vector<float>& matrix) { + auto err = mHal->setColorTransform(display, matrix); if (err) { LOG(ERROR) << __func__ << ": err " << err; mWriter->setError(mCommandIndex, err); |