commit 0ffcf99d3e05cf6405d3aa5fbea281a6b5632c9a
author Patrick Luby <guibmacdev@gmail.com> Sat Mar 16 14:46:29 2024 -0400
committer Patrick Luby <guibomacdev@gmail.com> Sun Mar 17 12:25:57 2024 +0100
tree b92238dc7f52ecb0ac346de0ea17b8a65e5a13fe
parent 78629e74e1e046a9ae4945088e2f7afde6db88d6

tdf#160036 Enable SKSL when using Skia/Raster

Starting with the upgrade of Skia from m111 to m116, SKSL is disabled
by default for Skia/Raster so define SK_RASTER_PIPELINE_OPS_ALL to
enable it.

Change-Id: Ibd10efa0540f1e87123c341b529c8e3931e1a8fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164933
Tested-by: Jenkins
Reviewed-by: Patrick Luby <guibomacdev@gmail.com>
(cherry picked from commit 22dbaf45fb378107ad7daa0d7894939d6e0c7ee3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164877
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Patrick Luby <guibomacdev@gmail.com>

external/skia/Library_skia.mk

diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index c2163d2..55af14c 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_Library_add_defs,skia,\
    -DSK_USER_CONFIG_HEADER="<$(BUILDDIR)/config_host/config_skia.h>" \
    $(if $(filter INTEL,$(CPUNAME)),$(if $(filter WNT,$(OS)),-DSK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSE1,-DSK_CPU_SSE_LEVEL=0)) \
    $(if $(filter X86_64,$(CPUNAME)),-DSK_CPU_SSE_LEVEL=SK_CPU_SSE_LEVEL_SSE2) \
    -DSK_ENABLE_SKSL_IN_RASTER_PIPELINE \
))

# SK_DEBUG controls runtime checks and is controlled by config_skia.h and depends on DBG_UTIL.
@@ -565,6 +566,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
    UnpackedTarball/skia/src/sksl/analysis/SkSLReturnsInputAlpha \
    UnpackedTarball/skia/src/sksl/analysis/SkSLSymbolTableStackBuilder \
    UnpackedTarball/skia/src/sksl/analysis/SkSLSwitchCaseContainsExit \
    UnpackedTarball/skia/src/sksl/analysis/SkSLGetLoopControlFlowInfo \
    UnpackedTarball/skia/src/sksl/analysis/SkSLIsDynamicallyUniformExpression \
    UnpackedTarball/skia/src/sksl/codegen/SkSLGLSLCodeGenerator \
    UnpackedTarball/skia/src/sksl/codegen/SkSLMetalCodeGenerator \
    UnpackedTarball/skia/src/sksl/codegen/SkSLPipelineStageCodeGenerator \
@@ -572,6 +575,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\
    UnpackedTarball/skia/src/sksl/codegen/SkSLSPIRVtoHLSL \
    UnpackedTarball/skia/src/sksl/codegen/SkSLVMCodeGenerator \
    UnpackedTarball/skia/src/sksl/codegen/SkSLWGSLCodeGenerator \
    UnpackedTarball/skia/src/sksl/codegen/SkSLRasterPipelineBuilder \
    UnpackedTarball/skia/src/sksl/codegen/SkSLRasterPipelineCodeGenerator \
    UnpackedTarball/skia/src/sksl/transform/SkSLAddConstToVarModifiers \
    UnpackedTarball/skia/src/sksl/transform/SkSLEliminateDeadFunctions \
    UnpackedTarball/skia/src/sksl/transform/SkSLEliminateDeadGlobalVariables \