diff options
| author | Patrick Luby <guibmacdev@gmail.com> | 2024-03-16 14:46:29 -0400 |
|---|---|---|
| committer | Patrick Luby <guibomacdev@gmail.com> | 2024-03-16 23:23:18 +0100 |
| commit | 39663a323c3330c18b610fcdc9e9c75ddac770f1 (patch) | |
| tree | 8ca4b6261b734c6ad92b18f5eba12badfd221d27 /external | |
| parent | f58b9659067de7fd8fcd8391b4bf1a2513cedaf7 (diff) | |
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.
Also, reenable XOR drawing unit tests that were previously failing.
Change-Id: Ibd10efa0540f1e87123c341b529c8e3931e1a8fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164933
Tested-by: Jenkins
Reviewed-by: Patrick Luby <guibomacdev@gmail.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/skia/Library_skia.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk index c2163d299327..55af14cd2daf 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 \ |