AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[debugger] Fix missing audit trails

Browse Source 
Change-Id: I337aebf72715339ec0280bab0916968ccbe7f481
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/528516
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Auto-Submit: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
This commit is contained in:
Kevin Lubick 2022-04-07 15:16:14 -04:00 committed by SkCQ
parent 8397365524
commit d3d0ee3dc2
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BUILD.gn
View File

@ -1004,7 +1004,7 @@ optional("gpu") {
cflags_objcc += [ "-fobjc-arc" ] cflags_objcc += [ "-fobjc-arc" ]
} }
if (is_debug) { if (is_debug || skia_build_for_debugger) {
public_defines += [ "SK_ENABLE_DUMP_GPU" ] public_defines += [ "SK_ENABLE_DUMP_GPU" ]
} }
} }
@ -1375,6 +1375,10 @@ skia_component("skia") {
sources += skia_sksl_sources sources += skia_sksl_sources
} }
if (skia_build_for_debugger) {
defines += [ "SK_BUILD_FOR_DEBUGGER" ]
}
if (is_win) { if (is_win) {
sources += [ sources += [
"src/ports/SkDebug_win.cpp", "src/ports/SkDebug_win.cpp",

1
gn/skia.gni
View File

@ -127,6 +127,7 @@ declare_args() {
skia_enable_direct3d_debug_layer = skia_enable_gpu_debug_layers skia_enable_direct3d_debug_layer = skia_enable_gpu_debug_layers
skia_enable_metal_debug_info = skia_enable_gpu_debug_layers skia_enable_metal_debug_info = skia_enable_gpu_debug_layers
skia_use_vma = skia_use_vulkan skia_use_vma = skia_use_vulkan
skia_build_for_debugger = false
} }
declare_args() { declare_args() {

6
modules/canvaskit/BUILD.gn
View File

@ -382,10 +382,4 @@ skia_wasm_lib("canvaskit") {
if (!skia_canvaskit_enable_font) { if (!skia_canvaskit_enable_font) {
defines += [ "CK_NO_FONTS" ] defines += [ "CK_NO_FONTS" ]
} }
if (skia_canvaskit_enable_debugger) {
defines += [
"SK_BUILD_FOR_DEBUGGER",
"SK_ENABLE_DUMP_GPU",
]
}
} }

4
modules/canvaskit/Makefile
View File

@ -171,7 +171,7 @@ with_debugger:
mkdir build mkdir build
cp ../../out/canvaskit_wasm_debug/canvaskit.js ./build/ cp ../../out/canvaskit_wasm_debug/canvaskit.js ./build/
cp ../../out/canvaskit_wasm_debug/canvaskit.wasm ./build/ cp ../../out/canvaskit_wasm_debug/canvaskit.wasm ./build/
mkdir ${SKIA_INFRA_ROOT}/debugger-app/wasm_libs/local_build/ - mkdir ${SKIA_INFRA_ROOT}/debugger-app/wasm_libs/local_build/
cp ./build/canvaskit.js ${SKIA_INFRA_ROOT}/debugger-app/wasm_libs/local_build/ cp ./build/canvaskit.js ${SKIA_INFRA_ROOT}/debugger-app/wasm_libs/local_build/
cp ./build/canvaskit.wasm ${SKIA_INFRA_ROOT}/debugger-app/wasm_libs/local_build/ cp ./build/canvaskit.wasm ${SKIA_INFRA_ROOT}/debugger-app/wasm_libs/local_build/
cp ./npm_build/types/index.d.ts ${SKIA_INFRA_ROOT}/debugger-app/wasm_libs/local_build/canvaskit.d.ts cp ./npm_build/types/index.d.ts ${SKIA_INFRA_ROOT}/debugger-app/wasm_libs/local_build/canvaskit.d.ts
@ -182,7 +182,7 @@ with_debugger_release:
mkdir build mkdir build
cp ../../out/canvaskit_wasm/canvaskit.js ./build/ cp ../../out/canvaskit_wasm/canvaskit.js ./build/
cp ../../out/canvaskit_wasm/canvaskit.wasm ./build/ cp ../../out/canvaskit_wasm/canvaskit.wasm ./build/
mkdir ${SKIA_INFRA_ROOT}/debugger-app/wasm_libs/local_build/ - mkdir ${SKIA_INFRA_ROOT}/debugger-app/wasm_libs/local_build/
cp ./build/canvaskit.js ${SKIA_INFRA_ROOT}/debugger-app/wasm_libs/local_build/ cp ./build/canvaskit.js ${SKIA_INFRA_ROOT}/debugger-app/wasm_libs/local_build/
cp ./build/canvaskit.wasm ${SKIA_INFRA_ROOT}/debugger-app/wasm_libs/local_build/ cp ./build/canvaskit.wasm ${SKIA_INFRA_ROOT}/debugger-app/wasm_libs/local_build/
cp ./npm_build/types/index.d.ts ${SKIA_INFRA_ROOT}/debugger-app/wasm_libs/local_build/canvaskit.d.ts cp ./npm_build/types/index.d.ts ${SKIA_INFRA_ROOT}/debugger-app/wasm_libs/local_build/canvaskit.d.ts

1
modules/canvaskit/compile.sh
View File

@ -229,6 +229,7 @@ echo "Compiling"
skia_use_wuffs=true \ skia_use_wuffs=true \
skia_use_zlib=true \ skia_use_zlib=true \
skia_enable_gpu=${ENABLE_GPU} \ skia_enable_gpu=${ENABLE_GPU} \
skia_build_for_debugger=${DEBUGGER_ENABLED} \
\ \
${GN_SHAPER} \ ${GN_SHAPER} \
${GN_FONT} \ ${GN_FONT} \