From a0e469624a2b47d23c8a118ab92538fe9df2b727 Mon Sep 17 00:00:00 2001
From: David Capello <david@igara.com>
Date: Mon, 11 Mar 2024 17:48:11 -0300
Subject: [PATCH] Use make_shader() helper function to create ColorSelector
 shaders

---
 src/app/ui/color_selector.cpp | 19 +++----------------
 src/app/ui/color_selector.h   |  1 -
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/app/ui/color_selector.cpp b/src/app/ui/color_selector.cpp
index 53703c26f..b82b97e4e 100644
--- a/src/app/ui/color_selector.cpp
+++ b/src/app/ui/color_selector.cpp
@@ -655,35 +655,22 @@ bool ColorSelector::buildEffects()
 
   if (!m_mainEffect) {
     if (const char* code = getMainAreaShader())
-      m_mainEffect = buildEffect(code);
+      m_mainEffect = make_shader(code);
   }
 
   if (!m_bottomEffect) {
     if (const char* code = getBottomBarShader())
-      m_bottomEffect = buildEffect(code);
+      m_bottomEffect = make_shader(code);
   }
 
   if (!m_alphaEffect) {
     if (const char* code = getAlphaBarShader())
-      m_alphaEffect = buildEffect(code);
+      m_alphaEffect = make_shader(code);
   }
 
   return (m_mainEffect && m_bottomEffect && m_alphaEffect);
 }
 
-sk_sp<SkRuntimeEffect> ColorSelector::buildEffect(const char* code)
-{
-  auto result = SkRuntimeEffect::MakeForShader(SkString(code));
-  if (!result.errorText.isEmpty()) {
-    LOG(ERROR, "Shader error: %s\n", result.errorText.c_str());
-    std::printf("Shader error: %s\n", result.errorText.c_str());
-    return nullptr;
-  }
-  else {
-    return result.effect;
-  }
-}
-
 void ColorSelector::resetBottomEffect()
 {
   m_bottomEffect.reset();
diff --git a/src/app/ui/color_selector.h b/src/app/ui/color_selector.h
index 438cd591b..0d2047459 100644
--- a/src/app/ui/color_selector.h
+++ b/src/app/ui/color_selector.h
@@ -121,7 +121,6 @@ namespace app {
 #if SK_ENABLE_SKSL
     static const char* getAlphaBarShader();
     bool buildEffects();
-    sk_sp<SkRuntimeEffect> buildEffect(const char* code);
 #endif
 
     // Internal flag used to lock the modification of m_color.