Unverified Commit eb1f04ec authored by Shagen Ogandzhanian's avatar Shagen Ogandzhanian Committed by GitHub

Build skiko with skia@m132 (#1021)

parent 3c54c1b7
...@@ -2,7 +2,7 @@ kotlin.code.style=official ...@@ -2,7 +2,7 @@ kotlin.code.style=official
deploy.version=0.0.0 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: # you can override general skia dependencies by passing platform-specific property:
# dependencies.skia.android-arm64 # dependencies.skia.android-arm64
......
...@@ -12,13 +12,13 @@ ...@@ -12,13 +12,13 @@
#include "window_util.h" #include "window_util.h"
#include "SkColorSpace.h" #include "SkColorSpace.h"
#include "GrBackendSurface.h" #include "ganesh/GrBackendSurface.h"
#include "GrDirectContext.h" #include "ganesh/GrDirectContext.h"
#include "SkSurface.h" #include "SkSurface.h"
#include "../common/interop.hh" #include "../common/interop.hh"
#include "d3d/GrD3DTypes.h" #include "ganesh/d3d/GrD3DTypes.h"
#include "d3d/GrD3DBackendContext.h" #include "ganesh/d3d/GrD3DBackendContext.h"
class DirectXOffscreenDevice class DirectXOffscreenDevice
{ {
...@@ -427,4 +427,4 @@ extern "C" ...@@ -427,4 +427,4 @@ extern "C"
} // extern "C" } // extern "C"
#endif // SK_DIRECT3D #endif // SK_DIRECT3D
\ No newline at end of file
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
#include <jawt_md.h> #include <jawt_md.h>
#include "jni_helpers.h" #include "jni_helpers.h"
#include "GrBackendSurface.h" #include "ganesh/GrBackendSurface.h"
#include "GrDirectContext.h" #include "ganesh/GrDirectContext.h"
#include "SkSurface.h" #include "SkSurface.h"
#include "exceptions_handler.h" #include "exceptions_handler.h"
......
...@@ -7,16 +7,16 @@ ...@@ -7,16 +7,16 @@
#include "window_util.h" #include "window_util.h"
#include "SkColorSpace.h" #include "SkColorSpace.h"
#include "GrBackendSurface.h" #include "ganesh/GrBackendSurface.h"
#include "GrDirectContext.h" #include "ganesh/GrDirectContext.h"
#include "SkSurface.h" #include "SkSurface.h"
#include "include/gpu/ganesh/SkSurfaceGanesh.h" #include "include/gpu/ganesh/SkSurfaceGanesh.h"
#include "../common/interop.hh" #include "../common/interop.hh"
#include "DCompLibrary.h" #include "DCompLibrary.h"
#include "d3d/GrD3DTypes.h" #include "ganesh/d3d/GrD3DTypes.h"
#include <d3d12sdklayers.h> #include <d3d12sdklayers.h>
#include "d3d/GrD3DBackendContext.h" #include "ganesh/d3d/GrD3DBackendContext.h"
#include <d3d12.h> #include <d3d12.h>
#include <dxgi1_4.h> #include <dxgi1_4.h>
#include <dxgi1_6.h> #include <dxgi1_6.h>
......
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#import <Metal/Metal.h> #import <Metal/Metal.h>
#import <QuartzCore/CAMetalLayer.h> #import <QuartzCore/CAMetalLayer.h>
#import "GrBackendSurface.h" #import "ganesh/GrBackendSurface.h"
#import "GrDirectContext.h" #import "ganesh/GrDirectContext.h"
#import "ganesh/mtl/GrMtlBackendContext.h" #import "ganesh/mtl/GrMtlBackendContext.h"
#import "ganesh/mtl/GrMtlDirectContext.h" #import "ganesh/mtl/GrMtlDirectContext.h"
#import "ganesh/mtl/GrMtlBackendSurface.h" #import "ganesh/mtl/GrMtlBackendSurface.h"
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
#import <QuartzCore/CAMetalLayer.h> #import <QuartzCore/CAMetalLayer.h>
#import <Metal/Metal.h> #import <Metal/Metal.h>
#import "GrDirectContext.h" #import "ganesh/GrDirectContext.h"
#import "gpu/GrBackendSurface.h" #import "gpu/ganesh/GrBackendSurface.h"
#import "ganesh/mtl/GrMtlBackendContext.h" #import "ganesh/mtl/GrMtlBackendContext.h"
#import "ganesh/mtl/GrMtlDirectContext.h" #import "ganesh/mtl/GrMtlDirectContext.h"
#import "ganesh/mtl/GrMtlBackendSurface.h" #import "ganesh/mtl/GrMtlBackendSurface.h"
...@@ -91,4 +91,4 @@ JNIEXPORT void JNICALL Java_org_jetbrains_skiko_context_MetalContextHandler_fini ...@@ -91,4 +91,4 @@ JNIEXPORT void JNICALL Java_org_jetbrains_skiko_context_MetalContextHandler_fini
} }
} // extern C } // extern C
#endif #endif
\ No newline at end of file
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#import <Metal/Metal.h> #import <Metal/Metal.h>
#import <QuartzCore/CAMetalLayer.h> #import <QuartzCore/CAMetalLayer.h>
#import "GrBackendSurface.h" #import "ganesh/GrBackendSurface.h"
#import "GrDirectContext.h" #import "ganesh/GrDirectContext.h"
#import "ganesh/mtl/GrMtlBackendContext.h" #import "ganesh/mtl/GrMtlBackendContext.h"
#import "ganesh/mtl/GrMtlDirectContext.h" #import "ganesh/mtl/GrMtlDirectContext.h"
#import "ganesh/mtl/GrMtlTypes.h" #import "ganesh/mtl/GrMtlTypes.h"
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
#import <QuartzCore/CAMetalLayer.h> #import <QuartzCore/CAMetalLayer.h>
#import <Metal/Metal.h> #import <Metal/Metal.h>
#import "GrDirectContext.h" #import "ganesh/GrDirectContext.h"
#import "gpu/GrBackendSurface.h" #import "gpu/ganesh/GrBackendSurface.h"
#import "ganesh/mtl/GrMtlBackendContext.h" #import "ganesh/mtl/GrMtlBackendContext.h"
#import "ganesh/mtl/GrMtlDirectContext.h" #import "ganesh/mtl/GrMtlDirectContext.h"
#import "ganesh/mtl/GrMtlBackendSurface.h" #import "ganesh/mtl/GrMtlBackendSurface.h"
...@@ -67,4 +67,4 @@ JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_swing_MetalSwingRedrawer_makeMe ...@@ -67,4 +67,4 @@ JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_swing_MetalSwingRedrawer_makeMe
} }
} // extern C } // extern C
#endif #endif
\ No newline at end of file
#include <iostream> #include <iostream>
#include <jni.h> #include <jni.h>
#include <ganesh/gl/GrGLBackendSurface.h> #include <ganesh/gl/GrGLBackendSurface.h>
#include "GrBackendSurface.h" #include "ganesh/GrBackendSurface.h"
#ifdef SK_METAL #ifdef SK_METAL
#include "ganesh/mtl/GrMtlBackendSurface.h" #include "ganesh/mtl/GrMtlBackendSurface.h"
#include "ganesh/mtl/GrMtlTypes.h" #include "ganesh/mtl/GrMtlTypes.h"
...@@ -38,7 +38,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_BackendRenderTargetKt ...@@ -38,7 +38,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_BackendRenderTargetKt
#endif #endif
#ifdef SK_DIRECT3D #ifdef SK_DIRECT3D
#include "d3d/GrD3DTypes.h" #include "ganesh/d3d/GrD3DTypes.h"
extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_BackendRenderTargetKt__1nMakeDirect3D 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) { (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 ...@@ -52,4 +52,4 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_BackendRenderTargetKt
GrBackendRenderTarget* instance = new GrBackendRenderTarget(width, height, texResInfo); GrBackendRenderTarget* instance = new GrBackendRenderTarget(width, height, texResInfo);
return reinterpret_cast<jlong>(instance); return reinterpret_cast<jlong>(instance);
} }
#endif //SK_DIRECT3D #endif //SK_DIRECT3D
\ No newline at end of file
#include <iostream> #include <iostream>
#include <jni.h> #include <jni.h>
#include "GrDirectContext.h" #include "ganesh/GrDirectContext.h"
#include "ganesh/gl/GrGLDirectContext.h" #include "ganesh/gl/GrGLDirectContext.h"
extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_DirectContextKt__1nMakeGL 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 ...@@ -25,7 +25,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_DirectContextKt__1nMa
#endif #endif
#ifdef SK_DIRECT3D #ifdef SK_DIRECT3D
#include "d3d/GrD3DBackendContext.h" #include "ganesh/d3d/GrD3DBackendContext.h"
extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_DirectContextKt__1nMakeDirect3D extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_DirectContextKt__1nMakeDirect3D
(JNIEnv* env, jclass jclass, jlong adapterPtr, jlong devicePtr, jlong queuePtr) { (JNIEnv* env, jclass jclass, jlong adapterPtr, jlong devicePtr, jlong queuePtr) {
......
...@@ -156,7 +156,7 @@ extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilterKt__1nMake ...@@ -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 extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilterKt__1nMakeRuntimeShader
(JNIEnv* env, jclass jclass, jlong runtimeShaderBuilderPtr, jstring childShaderName, jlong inputPtr) { (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* input = reinterpret_cast<SkImageFilter*>(static_cast<uintptr_t>(inputPtr));
SkImageFilter* ptr = SkImageFilters::RuntimeShader(*runtimeShaderBuilder, skString(env, childShaderName).c_str(), sk_ref_sp(input)).release(); 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 ...@@ -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 extern "C" JNIEXPORT jlong JNICALL Java_org_jetbrains_skia_ImageFilterKt__1nMakeRuntimeShaderFromArray
(JNIEnv* env, jclass jclass, jlong runtimeShaderBuilderPtr, jobjectArray childShaderNamesArr, jlongArray inputPtrsArray, jint _inputCount) { (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); jsize inputCount = env->GetArrayLength(inputPtrsArray);
jlong* inputPtrs = env->GetLongArrayElements(inputPtrsArray, 0); jlong* inputPtrs = env->GetLongArrayElements(inputPtrsArray, 0);
......
#include <iostream> #include <iostream>
#include <jni.h> #include <jni.h>
#include "GrDirectContext.h" #include "ganesh/GrDirectContext.h"
#include "SkSurface.h" #include "SkSurface.h"
#include "interop.hh" #include "interop.hh"
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
#endif #endif
#include "jni_helpers.h" #include "jni_helpers.h"
#include "GrBackendSurface.h" #include "ganesh/GrBackendSurface.h"
#include "GrDirectContext.h" #include "ganesh/GrDirectContext.h"
#ifdef SK_METAL #ifdef SK_METAL
#include "ganesh/mtl/GrMtlDirectContext.h" #include "ganesh/mtl/GrMtlDirectContext.h"
...@@ -66,4 +66,4 @@ JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_RenderTargetsKt_makeMetalContex ...@@ -66,4 +66,4 @@ JNIEXPORT jlong JNICALL Java_org_jetbrains_skiko_RenderTargetsKt_makeMetalContex
#endif #endif
} }
} // extern "C" } // extern "C"
\ No newline at end of file
#include <iostream> #include <iostream>
#include <stdint.h> #include <stdint.h>
#include "GrBackendSurface.h" #include "ganesh/GrBackendSurface.h"
#include "common.h" #include "common.h"
#include "ganesh/gl/GrGLDirectContext.h" #include "ganesh/gl/GrGLDirectContext.h"
#include "ganesh/gl/GrGLBackendSurface.h" #include "ganesh/gl/GrGLBackendSurface.h"
...@@ -39,7 +39,7 @@ SKIKO_EXPORT KNativePointer BackendRenderTarget_nMakeMetal ...@@ -39,7 +39,7 @@ SKIKO_EXPORT KNativePointer BackendRenderTarget_nMakeMetal
} }
#ifdef SK_DIRECT3D #ifdef SK_DIRECT3D
#include "d3d/GrD3DTypes.h" #include "ganesh/d3d/GrD3DTypes.h"
#endif #endif
SKIKO_EXPORT KNativePointer BackendRenderTarget_MakeDirect3D SKIKO_EXPORT KNativePointer BackendRenderTarget_MakeDirect3D
......
#include "GrDirectContext.h" #include "ganesh/GrDirectContext.h"
#include "include/gpu/gl/GrGLInterface.h" #include "ganesh/gl/GrGLInterface.h"
#include "common.h" #include "common.h"
#include "ganesh/gl/GrGLDirectContext.h" // TODO: skia update: check if it's correct #include "ganesh/gl/GrGLDirectContext.h" // TODO: skia update: check if it's correct
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#endif #endif
#ifdef SK_DIRECT3D #ifdef SK_DIRECT3D
#include "d3d/GrD3DBackendContext.h" #include "ganesh/d3d/GrD3DBackendContext.h"
#endif #endif
SKIKO_EXPORT KNativePointer org_jetbrains_skia_DirectContext__1nMakeGL SKIKO_EXPORT KNativePointer org_jetbrains_skia_DirectContext__1nMakeGL
......
...@@ -150,7 +150,7 @@ SKIKO_EXPORT KNativePointer org_jetbrains_skia_ImageFilter__1nMakePicture ...@@ -150,7 +150,7 @@ SKIKO_EXPORT KNativePointer org_jetbrains_skia_ImageFilter__1nMakePicture
SKIKO_EXPORT KNativePointer org_jetbrains_skia_ImageFilter__1nMakeRuntimeShader SKIKO_EXPORT KNativePointer org_jetbrains_skia_ImageFilter__1nMakeRuntimeShader
(KNativePointer runtimeShaderBuilderPtr, KInteropPointer childShaderName, KNativePointer inputPtr) { (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)); sk_sp<SkImageFilter> input = sk_ref_sp<SkImageFilter>(reinterpret_cast<SkImageFilter*>(inputPtr));
SkImageFilter* ptr = SkImageFilters::RuntimeShader(*runtimeShaderBuilder, reinterpret_cast<char *>(childShaderName), input).release(); SkImageFilter* ptr = SkImageFilters::RuntimeShader(*runtimeShaderBuilder, reinterpret_cast<char *>(childShaderName), input).release();
...@@ -159,7 +159,7 @@ SKIKO_EXPORT KNativePointer org_jetbrains_skia_ImageFilter__1nMakeRuntimeShader ...@@ -159,7 +159,7 @@ SKIKO_EXPORT KNativePointer org_jetbrains_skia_ImageFilter__1nMakeRuntimeShader
SKIKO_EXPORT KNativePointer org_jetbrains_skia_ImageFilter__1nMakeRuntimeShaderFromArray SKIKO_EXPORT KNativePointer org_jetbrains_skia_ImageFilter__1nMakeRuntimeShaderFromArray
(KNativePointer runtimeShaderBuilderPtr, KInteropPointerArray childShaderNamesArr, KNativePointerArray inputPtrsArray, KInt inputCount) { (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); KNativePointer* inputPtrs = reinterpret_cast<KNativePointer*>(inputPtrsArray);
std::vector<sk_sp<SkImageFilter>> inputChildren(inputCount); std::vector<sk_sp<SkImageFilter>> inputChildren(inputCount);
......
#include <iostream> #include <iostream>
#include "GrDirectContext.h" #include "ganesh/GrDirectContext.h"
#include "SkSurface.h" #include "SkSurface.h"
#include "include/gpu/ganesh/SkSurfaceGanesh.h" #include "include/gpu/ganesh/SkSurfaceGanesh.h"
#include "common.h" #include "common.h"
......
#include <ganesh/mtl/GrMtlTypes.h> #include <ganesh/mtl/GrMtlTypes.h>
#include "GrBackendSurface.h" #include "ganesh/GrBackendSurface.h"
#include "GrDirectContext.h" #include "ganesh/GrDirectContext.h"
#include "common.h" #include "common.h"
#include "ganesh/gl/GrGLDirectContext.h" #include "ganesh/gl/GrGLDirectContext.h"
#include "ganesh/gl/GrGLBackendSurface.h" #include "ganesh/gl/GrGLBackendSurface.h"
......
...@@ -90,8 +90,8 @@ SKIKO_EXPORT KNativePointer org_jetbrains_skiko_tests_TestHelpers__1nGlContextGe ...@@ -90,8 +90,8 @@ SKIKO_EXPORT KNativePointer org_jetbrains_skiko_tests_TestHelpers__1nGlContextGe
#include <GL/glx.h> #include <GL/glx.h>
#include <iostream> #include <iostream>
#include "include/gpu/gl/GrGLInterface.h" #include "ganesh/gl/GrGLInterface.h"
#include "include/gpu/gl/egl/GrGLMakeEGLInterface.h" #include "ganesh/gl/egl/GrGLMakeEGLInterface.h"
struct SkikoTestGlContext { struct SkikoTestGlContext {
Display* display; Display* display;
...@@ -180,4 +180,4 @@ SKIKO_EXPORT KNativePointer org_jetbrains_skiko_tests_TestHelpers__1nCreateTestG ...@@ -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__1nDeleteTestGlContext(KNativePointer ptr) {}
SKIKO_EXPORT void org_jetbrains_skiko_tests_TestHelpers__1nMakeGlContextCurrent(KNativePointer ptr) {} SKIKO_EXPORT void org_jetbrains_skiko_tests_TestHelpers__1nMakeGlContextCurrent(KNativePointer ptr) {}
SKIKO_EXPORT void org_jetbrains_skiko_tests_TestHelpers__1nGlContextSwapBuffers(KNativePointer ptr) {} SKIKO_EXPORT void org_jetbrains_skiko_tests_TestHelpers__1nGlContextSwapBuffers(KNativePointer ptr) {}
#endif // SKIKO_TEST_GL_INCLUDED #endif // SKIKO_TEST_GL_INCLUDED
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment