aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Brian Osman <brianosman@google.com>2017-07-25 09:59:24 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-07-25 14:27:33 +0000
commit10b6ad13f996d2f522bc057d17acea58e43a7f0b (patch)
tree2e0e4315e9bceca5f259f033b9c7fdf1490d3343
parent6af2a668f4343bc0db87d27d28b0edc60f5cd6b9 (diff)
sRGB color filter
Bug: skia: Change-Id: I9f04b8ce778349218ccd55673bdd1d16a192383c Reviewed-on: https://skia-review.googlesource.com/26422 Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Mike Klein <mtklein@chromium.org>
-rw-r--r--gn/effects.gni2
-rw-r--r--include/effects/SkToSRGBColorFilter.h42
-rw-r--r--src/effects/SkToSRGBColorFilter.cpp59
3 files changed, 103 insertions, 0 deletions
diff --git a/gn/effects.gni b/gn/effects.gni
index 1e86d2fd9f..f3a480d2cc 100644
--- a/gn/effects.gni
+++ b/gn/effects.gni
@@ -56,6 +56,7 @@ skia_effects_sources = [
"$_src/effects/SkTableColorFilter.cpp",
"$_src/effects/SkTableMaskFilter.cpp",
"$_src/effects/SkTileImageFilter.cpp",
+ "$_src/effects/SkToSRGBColorFilter.cpp",
"$_src/effects/SkXfermodeImageFilter.cpp",
"$_src/shaders/SkPerlinNoiseShader.cpp",
@@ -112,5 +113,6 @@ skia_effects_sources = [
"$_include/effects/SkTableColorFilter.h",
"$_include/effects/SkTableMaskFilter.h",
"$_include/effects/SkTileImageFilter.h",
+ "$_include/effects/SkToSRGBColorFilter.h",
"$_include/effects/SkXfermodeImageFilter.h",
]
diff --git a/include/effects/SkToSRGBColorFilter.h b/include/effects/SkToSRGBColorFilter.h
new file mode 100644
index 0000000000..c4d51446ef
--- /dev/null
+++ b/include/effects/SkToSRGBColorFilter.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2017 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkToSRGBColorFilter_DEFINED
+#define SkToSRGBColorFilter_DEFINED
+
+#include "SkColorFilter.h"
+#include "SkRefCnt.h"
+
+class SkColorSpace;
+class SkRasterPipeline;
+
+/**
+ * Color filter that converts from supplied color space to sRGB (both gamut and transfer function).
+ */
+class SK_API SkToSRGBColorFilter : public SkColorFilter {
+public:
+ static sk_sp<SkColorFilter> Make(sk_sp<SkColorSpace> srcColorSpace);
+
+#if SK_SUPPORT_GPU
+ sk_sp<GrFragmentProcessor> asFragmentProcessor(GrContext*, SkColorSpace*) const override;
+#endif
+
+ SK_TO_STRING_OVERRIDE()
+ SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkToSRGBColorFilter)
+
+private:
+ void flatten(SkWriteBuffer&) const override;
+ SkToSRGBColorFilter(sk_sp<SkColorSpace>);
+ void onAppendStages(SkRasterPipeline*, SkColorSpace*, SkArenaAlloc*,
+ bool shaderIsOpaque) const override;
+
+ sk_sp<SkColorSpace> fSrcColorSpace;
+
+ typedef SkColorFilter INHERITED;
+};
+
+#endif
diff --git a/src/effects/SkToSRGBColorFilter.cpp b/src/effects/SkToSRGBColorFilter.cpp
new file mode 100644
index 0000000000..7b6b3e6b84
--- /dev/null
+++ b/src/effects/SkToSRGBColorFilter.cpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2017 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkToSRGBColorFilter.h"
+#include "SkPM4f.h"
+#include "SkColorPriv.h"
+#include "SkColorSpace.h"
+#include "SkColorSpace_Base.h"
+#include "SkRasterPipeline.h"
+#include "SkString.h"
+
+#if SK_SUPPORT_GPU
+#include "GrContext.h"
+#include "effects/GrNonlinearColorSpaceXformEffect.h"
+#include "glsl/GrGLSLFragmentProcessor.h"
+#include "glsl/GrGLSLFragmentShaderBuilder.h"
+#endif
+
+void SkToSRGBColorFilter::onAppendStages(SkRasterPipeline* p,
+ SkColorSpace* dst,
+ SkArenaAlloc* scratch,
+ bool shaderIsOpaque) const {
+ // TODO
+}
+
+sk_sp<SkColorFilter> SkToSRGBColorFilter::Make(sk_sp<SkColorSpace> srcColorSpace) {
+ return sk_sp<SkColorFilter>(new SkToSRGBColorFilter(std::move(srcColorSpace)));
+}
+
+SkToSRGBColorFilter::SkToSRGBColorFilter(sk_sp<SkColorSpace> srcColorSpace)
+ : fSrcColorSpace(std::move(srcColorSpace)) {}
+
+sk_sp<SkFlattenable> SkToSRGBColorFilter::CreateProc(SkReadBuffer&) {
+ // TODO
+ return nullptr;
+}
+
+void SkToSRGBColorFilter::flatten(SkWriteBuffer&) const {
+ // TODO
+}
+
+#ifndef SK_IGNORE_TO_STRING
+void SkToSRGBColorFilter::toString(SkString* str) const {
+ // TODO
+ str->append("SkToSRGBColorFilter ");
+}
+#endif
+
+#if SK_SUPPORT_GPU
+sk_sp<GrFragmentProcessor> SkToSRGBColorFilter::asFragmentProcessor(GrContext*,
+ SkColorSpace*) const {
+ return GrNonlinearColorSpaceXformEffect::Make(fSrcColorSpace.get(),
+ SkColorSpace::MakeSRGB().get());
+}
+#endif