root
/
aseprite
mirror of https://github.com/aseprite/aseprite.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Use make_shader() helper function to create ColorSelector shaders

This commit is contained in:
David Capello 2024-03-11 17:48:11 -03:00
parent 7905acf38a
commit a0e469624a
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/app/ui/color_selector.cpp
View File

@ -655,35 +655,22 @@ bool ColorSelector::buildEffects()
if (!m_mainEffect) { if (!m_mainEffect) {
if (const char* code = getMainAreaShader()) if (const char* code = getMainAreaShader())
m_mainEffect = buildEffect(code); m_mainEffect = make_shader(code);
} }
if (!m_bottomEffect) { if (!m_bottomEffect) {
if (const char* code = getBottomBarShader()) if (const char* code = getBottomBarShader())
m_bottomEffect = buildEffect(code); m_bottomEffect = make_shader(code);
} }
if (!m_alphaEffect) { if (!m_alphaEffect) {
if (const char* code = getAlphaBarShader()) if (const char* code = getAlphaBarShader())
m_alphaEffect = buildEffect(code); m_alphaEffect = make_shader(code);
} }
return (m_mainEffect && m_bottomEffect && m_alphaEffect); 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() void ColorSelector::resetBottomEffect()
{ {
m_bottomEffect.reset(); m_bottomEffect.reset();

1
src/app/ui/color_selector.h
View File

@ -121,7 +121,6 @@ namespace app {
#if SK_ENABLE_SKSL #if SK_ENABLE_SKSL
static const char* getAlphaBarShader(); static const char* getAlphaBarShader();
bool buildEffects(); bool buildEffects();
sk_sp<SkRuntimeEffect> buildEffect(const char* code);
#endif #endif
// Internal flag used to lock the modification of m_color. // Internal flag used to lock the modification of m_color.