Build skiko with skia@m132 (#1021)

Schahen · web-flow · commit eb1f04ec99d5 · 2025-02-05T16:15:49.000+01:00
diff --git a/skiko/gradle.properties b/skiko/gradle.properties
@@ -2,7 +2,7 @@ kotlin.code.style=official
 deploy.version=0.0.0
 
 
-dependencies.skia=m126-6fd3120c1b
+dependencies.skia=m132-9b3c42e2f9-1
 
 # you can override general skia dependencies by passing platform-specific property: 
 # dependencies.skia.android-arm64
diff --git a/skiko/src/awtMain/cpp/windows/InternalDirectXApi.cc b/skiko/src/awtMain/cpp/windows/InternalDirectXApi.cc
@@ -12,13 +12,13 @@
 #include "window_util.h"
 
 #include "SkColorSpace.h"
-#include "GrBackendSurface.h"
-#include "GrDirectContext.h"
+#include "ganesh/GrBackendSurface.h"
+#include "ganesh/GrDirectContext.h"
 #include "SkSurface.h"
 #include "../common/interop.hh"
 
-#include "d3d/GrD3DTypes.h"
-#include "d3d/GrD3DBackendContext.h"
+#include "ganesh/d3d/GrD3DTypes.h"
+#include "ganesh/d3d/GrD3DBackendContext.h"
 
 class DirectXOffscreenDevice
 {
@@ -427,4 +427,4 @@ extern "C"
 
 } // extern "C"
 
-#endif // SK_DIRECT3D
+#endif // SK_DIRECT3D
diff --git a/skiko/src/awtMain/cpp/windows/direct3DContext.cc b/skiko/src/awtMain/cpp/windows/direct3DContext.cc
@@ -4,8 +4,8 @@
 #include <jawt_md.h>
 #include "jni_helpers.h"
 
-#include "GrBackendSurface.h"
-#include "GrDirectContext.h"
+#include "ganesh/GrBackendSurface.h"
+#include "ganesh/GrDirectContext.h"
 #include "SkSurface.h"
 #include "exceptions_handler.h"
 
diff --git a/skiko/src/awtMain/cpp/windows/directXRedrawer.cc b/skiko/src/awtMain/cpp/windows/directXRedrawer.cc
@@ -7,16 +7,16 @@
 #include "window_util.h"
 
 #include "SkColorSpace.h"
-#include "GrBackendSurface.h"
-#include "GrDirectContext.h"
+#include "ganesh/GrBackendSurface.h"
+#include "ganesh/GrDirectContext.h"
 #include "SkSurface.h"
 #include "include/gpu/ganesh/SkSurfaceGanesh.h"
 #include "../common/interop.hh"
 #include "DCompLibrary.h"
 
-#include "d3d/GrD3DTypes.h"
+#include "ganesh/d3d/GrD3DTypes.h"
 #include <d3d12sdklayers.h>
-#include "d3d/GrD3DBackendContext.h"
+#include "ganesh/d3d/GrD3DBackendContext.h"
 #include <d3d12.h>
 #include <dxgi1_4.h>
 #include <dxgi1_6.h>
diff --git a/skiko/src/awtMain/objectiveC/macos/MetalApi.mm b/skiko/src/awtMain/objectiveC/macos/MetalApi.mm
@@ -8,8 +8,8 @@
 #import <Metal/Metal.h>
 #import <QuartzCore/CAMetalLayer.h>
 
-#import "GrBackendSurface.h"
-#import "GrDirectContext.h"
+#import "ganesh/GrBackendSurface.h"
+#import "ganesh/GrDirectContext.h"
 #import "ganesh/mtl/GrMtlBackendContext.h"
 #import "ganesh/mtl/GrMtlDirectContext.h"
 #import "ganesh/mtl/GrMtlBackendSurface.h"
diff --git a/skiko/src/awtMain/objectiveC/macos/MetalContextHandler.mm b/skiko/src/awtMain/objectiveC/macos/MetalContextHandler.mm
@@ -5,8 +5,8 @@
 
 #import <QuartzCore/CAMetalLayer.h>
 #import <Metal/Metal.h>
-#import "GrDirectContext.h"
-#import "gpu/GrBackendSurface.h"
+#import "ganesh/GrDirectContext.h"
+#import "gpu/ganesh/GrBackendSurface.h"
 #import "ganesh/mtl/GrMtlBackendContext.h"
 #import "ganesh/mtl/GrMtlDirectContext.h"
 #import "ganesh/mtl/GrMtlBackendSurface.h"
@@ -91,4 +91,4 @@ JNIEXPORT void JNICALL Java_org_jetbrains_skiko_context_MetalContextHandler_fini
 }
 
 } // extern C
-#endif
+#endif
diff --git a/skiko/src/awtMain/objectiveC/macos/MetalRedrawer.mm b/skiko/src/awtMain/objectiveC/macos/MetalRedrawer.mm
@@ -8,8 +8,8 @@
 #import <Metal/Metal.h>
 #import <QuartzCore/CAMetalLayer.h>
 
-#import "GrBackendSurface.h"
-#import "GrDirectContext.h"
+#import "ganesh/GrBackendSurface.h"
+#import "ganesh/GrDirectContext.h"
 #import "ganesh/mtl/GrMtlBackendContext.h"
 #import "ganesh/mtl/GrMtlDirectContext.h"
 #import "ganesh/mtl/GrMtlTypes.h"
diff --git a/skiko/src/awtMain/objectiveC/macos/MetalSwingRedrawer.mm b/skiko/src/awtMain/objectiveC/macos/MetalSwingRedrawer.mm
@@ -5,8 +5,8 @@
 
 #import <QuartzCore/CAMetalLayer.h>
 #import <Metal/Metal.h>
-#import "GrDirectContext.h"
-#import "gpu/GrBackendSurface.h"
+#import "ganesh/GrDirectContext.h"
+#import "gpu/ganesh/GrBackendSurface.h"
 #import "ganesh/mtl/GrMtlBackendContext.h"
 #import "ganesh/mtl/GrMtlDirectContext.h"
 #import "ganesh/mtl/GrMtlBackendSurface.h"
@@ -67,4 +67,4 @@ JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_swing_MetalSwingRedrawer_makeMe
 }
 
 } // extern C
-#endif
+#endif
diff --git a/skiko/src/jvmMain/cpp/common/BackendRenderTarget.cc b/skiko/src/jvmMain/cpp/common/BackendRenderTarget.cc
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <jni.h>
 #include <ganesh/gl/GrGLBackendSurface.h>
-#include "GrBackendSurface.h"
+#include "ganesh/GrBackendSurface.h"
 #ifdef SK_METAL
 #include "ganesh/mtl/GrMtlBackendSurface.h"
 #include "ganesh/mtl/GrMtlTypes.h"
@@ -38,7 +38,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_BackendRenderTargetKt
 #endif
 
 #ifdef SK_DIRECT3D
-#include "d3d/GrD3DTypes.h"
+#include "ganesh/d3d/GrD3DTypes.h"
 
 extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_BackendRenderTargetKt__1nMakeDirect3D
   (JNIEnv* env, jclass jclass, jint width, jint height, jlong texturePtr, jint format, jint sampleCnt, jint levelCnt) {
@@ -52,4 +52,4 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_BackendRenderTargetKt
     GrBackendRenderTarget* instance = new GrBackendRenderTarget(width, height, texResInfo);
     return reinterpret_cast<jlong>(instance);
 }
-#endif //SK_DIRECT3D
+#endif //SK_DIRECT3D
diff --git a/skiko/src/jvmMain/cpp/common/DirectContext.cc b/skiko/src/jvmMain/cpp/common/DirectContext.cc
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <jni.h>
-#include "GrDirectContext.h"
+#include "ganesh/GrDirectContext.h"
 #include "ganesh/gl/GrGLDirectContext.h"
 
 extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_DirectContextKt__1nMakeGL
@@ -25,7 +25,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_DirectContextKt__1nMa
 #endif
 
 #ifdef SK_DIRECT3D
-#include "d3d/GrD3DBackendContext.h"
+#include "ganesh/d3d/GrD3DBackendContext.h"
 
 extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_DirectContextKt__1nMakeDirect3D
   (JNIEnv* env, jclass jclass, jlong adapterPtr, jlong devicePtr, jlong queuePtr) {
diff --git a/skiko/src/jvmMain/cpp/common/ImageFilter.cc b/skiko/src/jvmMain/cpp/common/ImageFilter.cc
@@ -156,7 +156,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilterKt__1nMake
 
 extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilterKt__1nMakeRuntimeShader
   (JNIEnv* env, jclass jclass, jlong runtimeShaderBuilderPtr, jstring childShaderName, jlong inputPtr) {
-    SkRuntimeShaderBuilder* runtimeShaderBuilder = reinterpret_cast<SkRuntimeShaderBuilder*>(static_cast<uintptr_t>(runtimeShaderBuilderPtr));
+    SkRuntimeEffectBuilder* runtimeShaderBuilder = reinterpret_cast<SkRuntimeEffectBuilder*>(static_cast<uintptr_t>(runtimeShaderBuilderPtr));
     SkImageFilter* input = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(inputPtr));
 
     SkImageFilter* ptr = SkImageFilters::RuntimeShader(*runtimeShaderBuilder, skString(env, childShaderName).c_str(), sk_ref_sp(input)).release();
@@ -165,7 +165,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilterKt__1nMake
 
 extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilterKt__1nMakeRuntimeShaderFromArray
   (JNIEnv* env, jclass jclass, jlong runtimeShaderBuilderPtr, jobjectArray childShaderNamesArr, jlongArray inputPtrsArray, jint _inputCount) {
-    SkRuntimeShaderBuilder* runtimeShaderBuilder = reinterpret_cast<SkRuntimeShaderBuilder*>(static_cast<uintptr_t>(runtimeShaderBuilderPtr));
+    SkRuntimeEffectBuilder* runtimeShaderBuilder = reinterpret_cast<SkRuntimeEffectBuilder*>(static_cast<uintptr_t>(runtimeShaderBuilderPtr));
 
     jsize inputCount = env->GetArrayLength(inputPtrsArray);
     jlong* inputPtrs = env->GetLongArrayElements(inputPtrsArray, 0);
diff --git a/skiko/src/jvmMain/cpp/common/Surface.cc b/skiko/src/jvmMain/cpp/common/Surface.cc
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <jni.h>
-#include "GrDirectContext.h"
+#include "ganesh/GrDirectContext.h"
 #include "SkSurface.h"
 #include "interop.hh"
 
diff --git a/skiko/src/jvmMain/cpp/common/render.cc b/skiko/src/jvmMain/cpp/common/render.cc
@@ -7,8 +7,8 @@
 #endif
 
 #include "jni_helpers.h"
-#include "GrBackendSurface.h"
-#include "GrDirectContext.h"
+#include "ganesh/GrBackendSurface.h"
+#include "ganesh/GrDirectContext.h"
 
 #ifdef SK_METAL
 #include "ganesh/mtl/GrMtlDirectContext.h"
@@ -66,4 +66,4 @@ JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_RenderTargetsKt_makeMetalContex
 #endif
 }
 
-}  // extern "C"
+}  // extern "C"
diff --git a/skiko/src/nativeJsMain/cpp/BackendRenderTarget.cc b/skiko/src/nativeJsMain/cpp/BackendRenderTarget.cc
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <stdint.h>
-#include "GrBackendSurface.h"
+#include "ganesh/GrBackendSurface.h"
 #include "common.h"
 #include "ganesh/gl/GrGLDirectContext.h"
 #include "ganesh/gl/GrGLBackendSurface.h"
@@ -39,7 +39,7 @@ SKIKO_EXPORT KNativePointer BackendRenderTarget_nMakeMetal
 }
 
 #ifdef SK_DIRECT3D
-#include "d3d/GrD3DTypes.h"
+#include "ganesh/d3d/GrD3DTypes.h"
 #endif
 
 SKIKO_EXPORT KNativePointer BackendRenderTarget_MakeDirect3D
diff --git a/skiko/src/nativeJsMain/cpp/DirectContext.cc b/skiko/src/nativeJsMain/cpp/DirectContext.cc
@@ -1,5 +1,5 @@
-#include "GrDirectContext.h"
-#include "include/gpu/gl/GrGLInterface.h"
+#include "ganesh/GrDirectContext.h"
+#include "ganesh/gl/GrGLInterface.h"
 #include "common.h"
 #include "ganesh/gl/GrGLDirectContext.h" // TODO: skia update: check if it's correct
 
@@ -9,7 +9,7 @@
 #endif
 
 #ifdef SK_DIRECT3D
-#include "d3d/GrD3DBackendContext.h"
+#include "ganesh/d3d/GrD3DBackendContext.h"
 #endif
 
 SKIKO_EXPORT KNativePointer org_jetbrains_skia_DirectContext__1nMakeGL
diff --git a/skiko/src/nativeJsMain/cpp/ImageFilter.cc b/skiko/src/nativeJsMain/cpp/ImageFilter.cc
@@ -150,7 +150,7 @@ SKIKO_EXPORT KNativePointer org_jetbrains_skia_ImageFilter__1nMakePicture
 
 SKIKO_EXPORT KNativePointer org_jetbrains_skia_ImageFilter__1nMakeRuntimeShader
   (KNativePointer runtimeShaderBuilderPtr, KInteropPointer childShaderName, KNativePointer inputPtr) {
-    SkRuntimeShaderBuilder* runtimeShaderBuilder = reinterpret_cast<SkRuntimeShaderBuilder*>(runtimeShaderBuilderPtr);
+    SkRuntimeEffectBuilder* runtimeShaderBuilder = reinterpret_cast<SkRuntimeEffectBuilder*>(runtimeShaderBuilderPtr);
     sk_sp<SkImageFilter> input = sk_ref_sp<SkImageFilter>(reinterpret_cast<SkImageFilter*>(inputPtr));
 
     SkImageFilter* ptr = SkImageFilters::RuntimeShader(*runtimeShaderBuilder, reinterpret_cast<char *>(childShaderName), input).release();
@@ -159,7 +159,7 @@ SKIKO_EXPORT KNativePointer org_jetbrains_skia_ImageFilter__1nMakeRuntimeShader
 
 SKIKO_EXPORT KNativePointer org_jetbrains_skia_ImageFilter__1nMakeRuntimeShaderFromArray
   (KNativePointer runtimeShaderBuilderPtr, KInteropPointerArray childShaderNamesArr, KNativePointerArray inputPtrsArray, KInt inputCount) {
-    SkRuntimeShaderBuilder* runtimeShaderBuilder = reinterpret_cast<SkRuntimeShaderBuilder*>(runtimeShaderBuilderPtr);
+    SkRuntimeEffectBuilder* runtimeShaderBuilder = reinterpret_cast<SkRuntimeEffectBuilder*>(runtimeShaderBuilderPtr);
 
     KNativePointer* inputPtrs = reinterpret_cast<KNativePointer*>(inputPtrsArray);
     std::vector<sk_sp<SkImageFilter>> inputChildren(inputCount);
diff --git a/skiko/src/nativeJsMain/cpp/Surface.cc b/skiko/src/nativeJsMain/cpp/Surface.cc
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "GrDirectContext.h"
+#include "ganesh/GrDirectContext.h"
 #include "SkSurface.h"
 #include "include/gpu/ganesh/SkSurfaceGanesh.h"
 #include "common.h"
diff --git a/skiko/src/nativeJsMain/cpp/render.cc b/skiko/src/nativeJsMain/cpp/render.cc
@@ -1,7 +1,7 @@
 #include <ganesh/mtl/GrMtlTypes.h>
 
-#include "GrBackendSurface.h"
-#include "GrDirectContext.h"
+#include "ganesh/GrBackendSurface.h"
+#include "ganesh/GrDirectContext.h"
 #include "common.h"
 #include "ganesh/gl/GrGLDirectContext.h"
 #include "ganesh/gl/GrGLBackendSurface.h"
diff --git a/skiko/src/nativeJsTest/cpp/TestHelpers.cc b/skiko/src/nativeJsTest/cpp/TestHelpers.cc
@@ -90,8 +90,8 @@ SKIKO_EXPORT KNativePointer org_jetbrains_skiko_tests_TestHelpers__1nGlContextGe
 #include <GL/glx.h>
 #include <iostream>
 
-#include "include/gpu/gl/GrGLInterface.h"
-#include "include/gpu/gl/egl/GrGLMakeEGLInterface.h"
+#include "ganesh/gl/GrGLInterface.h"
+#include "ganesh/gl/egl/GrGLMakeEGLInterface.h"
 
 struct SkikoTestGlContext {
     Display* display;
@@ -180,4 +180,4 @@ SKIKO_EXPORT KNativePointer org_jetbrains_skiko_tests_TestHelpers__1nCreateTestG
 SKIKO_EXPORT void org_jetbrains_skiko_tests_TestHelpers__1nDeleteTestGlContext(KNativePointer ptr) {}
 SKIKO_EXPORT void org_jetbrains_skiko_tests_TestHelpers__1nMakeGlContextCurrent(KNativePointer ptr) {}
 SKIKO_EXPORT void org_jetbrains_skiko_tests_TestHelpers__1nGlContextSwapBuffers(KNativePointer ptr) {}
-#endif // SKIKO_TEST_GL_INCLUDED
+#endif // SKIKO_TEST_GL_INCLUDED
