Revert "Tonemap in RecordingCanvas"
This reverts commit 9776d3e35718efd9ea08400fe0dbea61dc6386ce.
Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_master&target=errorprone&lkgb=9546489&lkbb=9546754&fkbb=9546547, bug b/267342770
Change-Id: I58f6a0350287a92199a9426f3d3d908a279821d8
diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
index 2245aae..59e4b7a 100644
--- a/libs/hwui/Android.bp
+++ b/libs/hwui/Android.bp
@@ -536,7 +536,6 @@
"RootRenderNode.cpp",
"SkiaCanvas.cpp",
"SkiaInterpolator.cpp",
- "Tonemapper.cpp",
"VectorDrawable.cpp",
],
@@ -595,6 +594,7 @@
"ProfileData.cpp",
"ProfileDataContainer.cpp",
"Readback.cpp",
+ "Tonemapper.cpp",
"TreeInfo.cpp",
"WebViewFunctorManager.cpp",
"protos/graphicsstats.proto",
diff --git a/libs/hwui/CanvasTransform.h b/libs/hwui/CanvasTransform.h
index 291f4cf..c46a2d3 100644
--- a/libs/hwui/CanvasTransform.h
+++ b/libs/hwui/CanvasTransform.h
@@ -45,4 +45,4 @@
SkColor transformColor(ColorTransform transform, SkColor color);
SkColor transformColorInverse(ColorTransform transform, SkColor color);
-} // namespace android::uirenderer
+} // namespace android::uirenderer;
\ No newline at end of file
diff --git a/libs/hwui/RecordingCanvas.cpp b/libs/hwui/RecordingCanvas.cpp
index bbe79d9..3f21940 100644
--- a/libs/hwui/RecordingCanvas.cpp
+++ b/libs/hwui/RecordingCanvas.cpp
@@ -43,7 +43,6 @@
#include "SkRegion.h"
#include "SkTextBlob.h"
#include "SkVertices.h"
-#include "Tonemapper.h"
#include "VectorDrawable.h"
#include "pipeline/skia/AnimatedDrawables.h"
#include "pipeline/skia/FunctorDrawable.h"
@@ -335,9 +334,7 @@
SkPaint paint;
BitmapPalette palette;
void draw(SkCanvas* c, const SkMatrix&) const {
- SkPaint newPaint = paint;
- tonemapPaint(image->imageInfo(), c->imageInfo(), -1, newPaint);
- c->drawImage(image.get(), x, y, sampling, &newPaint);
+ c->drawImage(image.get(), x, y, sampling, &paint);
}
};
struct DrawImageRect final : Op {
@@ -359,9 +356,7 @@
SkCanvas::SrcRectConstraint constraint;
BitmapPalette palette;
void draw(SkCanvas* c, const SkMatrix&) const {
- SkPaint newPaint = paint;
- tonemapPaint(image->imageInfo(), c->imageInfo(), -1, newPaint);
- c->drawImageRect(image.get(), src, dst, sampling, &newPaint, constraint);
+ c->drawImageRect(image.get(), src, dst, sampling, &paint, constraint);
}
};
struct DrawImageLattice final : Op {
@@ -394,10 +389,8 @@
auto flags =
(0 == fs) ? nullptr : pod<SkCanvas::Lattice::RectType>(
this, (xs + ys) * sizeof(int) + fs * sizeof(SkColor));
- SkPaint newPaint = paint;
- tonemapPaint(image->imageInfo(), c->imageInfo(), -1, newPaint);
- c->drawImageLattice(image.get(), {xdivs, ydivs, flags, xs, ys, &src, colors}, dst, filter,
- &newPaint);
+ c->drawImageLattice(image.get(), {xdivs, ydivs, flags, xs, ys, &src, colors}, dst,
+ filter, &paint);
}
};
diff --git a/libs/hwui/Tonemapper.cpp b/libs/hwui/Tonemapper.cpp
index 0d39f0e..a7e76b6 100644
--- a/libs/hwui/Tonemapper.cpp
+++ b/libs/hwui/Tonemapper.cpp
@@ -18,10 +18,7 @@
#include <SkRuntimeEffect.h>
#include <log/log.h>
-// libshaders only exists on Android devices
-#ifdef __ANDROID__
#include <shaders/shaders.h>
-#endif
#include "utils/Color.h"
@@ -29,8 +26,6 @@
namespace {
-// custom tonemapping only exists on Android devices
-#ifdef __ANDROID__
class ColorFilterRuntimeEffectBuilder : public SkRuntimeEffectBuilder {
public:
explicit ColorFilterRuntimeEffectBuilder(sk_sp<SkRuntimeEffect> effect)
@@ -64,21 +59,20 @@
return effectBuilder.makeColorFilter();
}
-static ui::Dataspace extractTransfer(ui::Dataspace dataspace) {
- return static_cast<ui::Dataspace>(dataspace & HAL_DATASPACE_TRANSFER_MASK);
+static bool extractTransfer(ui::Dataspace dataspace) {
+ return dataspace & HAL_DATASPACE_TRANSFER_MASK;
}
static bool isHdrDataspace(ui::Dataspace dataspace) {
const auto transfer = extractTransfer(dataspace);
- return transfer == ui::Dataspace::TRANSFER_ST2084 || transfer == ui::Dataspace::TRANSFER_HLG;
+ return transfer == HAL_DATASPACE_TRANSFER_ST2084 || transfer == HAL_DATASPACE_TRANSFER_HLG;
}
static ui::Dataspace getDataspace(const SkImageInfo& image) {
return static_cast<ui::Dataspace>(
ColorSpaceToADataSpace(image.colorSpace(), image.colorType()));
}
-#endif
} // namespace
@@ -86,8 +80,6 @@
// shader and tag it on the supplied paint.
void tonemapPaint(const SkImageInfo& source, const SkImageInfo& destination, float maxLuminanceNits,
SkPaint& paint) {
-// custom tonemapping only exists on Android devices
-#ifdef __ANDROID__
const auto sourceDataspace = getDataspace(source);
const auto destinationDataspace = getDataspace(destination);
@@ -110,9 +102,6 @@
paint.setColorFilter(colorFilter);
}
}
-#else
- return;
-#endif
}
} // namespace android::uirenderer