Fix the compilation errors in the demo and resolve the issue of the p…

…lusdarker program failing to compile in WebGL.
Tencent · Oct 29, 2024 · b8d02a8 · b8d02a8
1 parent 624fb1f
commit b8d02a8
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/include/tgfx/layers/ImageLayer.h b/include/tgfx/layers/ImageLayer.h
@@ -18,7 +18,6 @@
 
 #pragma once
 
-#include "layers/contents/ImageContent.h"
 #include "tgfx/core/Image.h"
 #include "tgfx/layers/Layer.h"
 

diff --git a/include/tgfx/layers/Layer.h b/include/tgfx/layers/Layer.h
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <memory>
-#include "core/utils/UniqueID.h"
 #include "tgfx/core/BlendMode.h"
 #include "tgfx/core/Canvas.h"
 #include "tgfx/core/ImageFilter.h"

diff --git a/src/gpu/opengl/GLBlend.cpp b/src/gpu/opengl/GLBlend.cpp
@@ -315,9 +315,9 @@ static void BlendHandler_PlusDarker(FragmentShaderBuilder* fsBuilder, const char
                                     const char* dstColor, const char* outputColor) {
   // MAX(0, (1 - ((Da * (1 - Dc) + Sa * (1 - Sc)))
   // https://developer.apple.com/documentation/coregraphics/cgblendmode/kcgblendmodeplusdarker
-  fsBuilder->codeAppendf("%s.rgb = clamp(1.0 + %s.rgb + %s.rgb - %s.a - %s.a, 0, 1);", outputColor,
+  fsBuilder->codeAppendf("%s.rgb = clamp(1.0 + %s.rgb + %s.rgb - %s.a - %s.a, 0.0, 1.0);", outputColor,
                          srcColor, dstColor, dstColor, srcColor);
-  fsBuilder->codeAppendf("%s.rgb *= (%s.a != 0.0) ? 1.0 : 0.0;", outputColor, outputColor);
+  fsBuilder->codeAppendf("%s.rgb *= (%s.a > 0.0) ? 1.0 : 0.0;", outputColor, outputColor);
 }
 
 using BlendHandler = void (*)(FragmentShaderBuilder* fsBuilder, const char* srcColor,

diff --git a/src/layers/ImageLayer.cpp b/src/layers/ImageLayer.cpp
@@ -16,6 +16,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
+#include "layers/contents/ImageContent.h"
 #include "tgfx/layers/ImageLayer.h"
 
 namespace tgfx {