| commit | 1351a5954f99df4d3bd280fc4d313e5a8841c17d | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins <[email protected]> | Wed Feb 02 22:03:33 2022 +0000 |
| committer | Kevin Lubick <[email protected]> | Thu Feb 03 13:10:09 2022 +0000 |
| tree | ca4148bf7465bcf0cad53a288746968d895a1f3a | |
| parent | 1f2435f46b48a19b3818df20085af685119cb8e0 [diff] [blame] |
Revert "[fuzzer] Remove GL from (now-Vulkan) build" This reverts commit 805acda3f3aa3d9fc85c84bac5aa52c472ec3bb1. Reason for revert: Looks to be breaking the Android roll. See https://android-build.googleplex.com/builds/pending/P29733268/aosp_bramble-userdebug/latest/view/logs/build_error.log Original change's description: > [fuzzer] Remove GL from (now-Vulkan) build > > The fuzzer runs against the Vulkan version of Swiftshader. > There are no libGL.so (etc) on the fuzz runtime, so we > want to avoid linking against those. > > The GL code that is #ifdef'd out is still necessary to > avoid timeouts on TSAN with our NVIDIA jobs. > https://skia-review.googlesource.com/c/skia/+/502638 > > Procedure for testing this locally (and iterating): > 1. In oss-fuzz checkout, run > `python infra/helper.py shell skia` > to pull up local interactive version of Docker > fuzzer build image. > 2. Run `compile` in fuzzer shell. Stop after > the swiftshader compiles and is copied into /out > with Ctrl + C. > 3. Comment out the swiftshader compilation part [1] > (no need to re-do this when modifying Skia code). > `apt-get install nano -y` > `nano ../build.sh` > 4. Make change to Skia repo using normal methods. > 5. Run the following in the Skia repo > `git diff origin main > foo.patch` > Copy the patch into the Docker shell using Ctrl+C > and nano. > 6. Apply the patch inside the Docker shell > `git apply foo.patch` > and re-compile (which should skip right to > building the fuzzer libs) > `compile` > 7. Repeat 4-7 or make small changes directly in > the Docker shell via nano. > 8. When compilation and link succeeds, run > `ldd /out/api_mock_gpu_canvas` > to verify GL and friends were not dynamically linked. > > [1] https://github.com/google/oss-fuzz/pull/7214/files#diff-76f13875e33875cdd372f1f0933206be599cd87952f1bd1eaa57ca928ee9e3e1R49-R53 > > Change-Id: Idf569820527c1304b0e5a68fd36295be89dfa2a0 > Bug: oss-fuzz:44132 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/503016 > Reviewed-by: Brian Osman <[email protected]> > Commit-Queue: Kevin Lubick <[email protected]> Bug: oss-fuzz:44132 Change-Id: I3832417c60ff425572717d37dc9609419922b18e No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/503351 Bot-Commit: Rubber Stamper <[email protected]> Reviewed-by: Brian Osman <[email protected]>
diff --git a/dm/DMGpuTestProcs.cpp b/dm/DMGpuTestProcs.cpp index 7f8d303..e8ea03b 100644 --- a/dm/DMGpuTestProcs.cpp +++ b/dm/DMGpuTestProcs.cpp
@@ -15,11 +15,8 @@ #endif using sk_gpu_test::GrContextFactory; -using sk_gpu_test::ContextInfo; - -#ifdef SK_GL using sk_gpu_test::GLTestContext; -#endif +using sk_gpu_test::ContextInfo; namespace skiatest {