From 0a51b48e2071ccfe5702f08da7a36543bac382b0 Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Mon, 6 Feb 2017 12:45:29 -0500 Subject: Get linux vulkan running on Intel NUC This CL includes a few things. First, it creates two CIPD assets, a Debug and Release version of the Linux Vulkan Intel Driver. The driver is still young, so the Debug version helps us submit better bugs to the developers. The current version is Mesa 13.04: ftp://ftp.freedesktop.org/pub/mesa/13.0.4/ Second, it fixes the GN flavor to not purge out all environment variables - a leftover from the GYP -> GN migration. Third, it sets environment variables on both Test and Perf such that the vulkan sdk, libraries and drivers all linked in from their homes in CIPD. BUG=skia:6133 Change-Id: I9a999e24a0203ab7a9f4733bee1110b79e616935 Reviewed-on: https://skia-review.googlesource.com/7994 Reviewed-by: Eric Boren Commit-Queue: Kevin Lubick --- .../example.expected/buildbotless_trybot_gerrit.json | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_gerrit.json') diff --git a/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_gerrit.json b/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_gerrit.json index d865d970e2..62acb3c3cb 100644 --- a/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_gerrit.json +++ b/infra/bots/recipe_modules/compile/example.expected/buildbotless_trybot_gerrit.json @@ -109,7 +109,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, "name": "fetch-gn" }, @@ -122,7 +125,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, "name": "gn gen" }, @@ -134,7 +140,10 @@ ], "cwd": "[CUSTOM_C:\\_B_WORK]\\skia", "env": { - "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]" + "BUILDTYPE": "Debug", + "CHROME_HEADLESS": "1", + "PATH": "%(PATH)s;RECIPE_PACKAGE_REPO[depot_tools]", + "SKIA_OUT": "[CUSTOM_C:\\_B_WORK]\\skia\\out\\Build-Win-MSVC-x86-Debug" }, "name": "ninja" }, -- cgit v1.2.3