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

Add Win Clang Vulkan builds.

Browse Source 
Fix Clang compiler warning.

Change-Id: Ic6f5b161058d1ed2df45e12b72dbff3b486ec986
Reviewed-on: https://skia-review.googlesource.com/56740
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
This commit is contained in:
Ben Wagner 2017-10-06 14:50:29 -04:00 committed by Skia Commit-Bot
parent 3cd0bef0fd
commit eeadcc1b5c
3 changed files with 96 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infra/bots/jobs.json
View File

@ -67,8 +67,10 @@
"Build-Win-Clang-arm64-Release-Android",
"Build-Win-Clang-x86_64-Debug",
"Build-Win-Clang-x86_64-Debug-GDI",
"Build-Win-Clang-x86_64-Debug-Vulkan",
"Build-Win-Clang-x86_64-Release",
"Build-Win-Clang-x86_64-Release-GDI",
"Build-Win-Clang-x86_64-Release-Vulkan",
"Build-Win-MSVC-x86-Debug",
"Build-Win-MSVC-x86-Debug-ANGLE",
"Build-Win-MSVC-x86-Debug-Exceptions",

92
infra/bots/tasks.json
View File

@ -413,6 +413,12 @@
"Build-Win-Clang-x86_64-Debug-GDI"
]
},
"Build-Win-Clang-x86_64-Debug-Vulkan": {
"priority": 0.8,
"tasks": [
"Build-Win-Clang-x86_64-Debug-Vulkan"
]
},
"Build-Win-Clang-x86_64-Release": {
"priority": 0.8,
"tasks": [
@ -425,6 +431,12 @@
"Build-Win-Clang-x86_64-Release-GDI"
]
},
"Build-Win-Clang-x86_64-Release-Vulkan": {
"priority": 0.8,
"tasks": [
"Build-Win-Clang-x86_64-Release-Vulkan"
]
},
"Build-Win-MSVC-x86-Debug": {
"priority": 0.8,
"tasks": [
@ -4654,6 +4666,46 @@
"isolate": "compile_skia.isolate",
"priority": 0.8
},
"Build-Win-Clang-x86_64-Debug-Vulkan": {
"cipd_packages": [
{
"name": "skia/bots/win_toolchain",
"path": "t",
"version": "version:6"
},
{
"name": "skia/bots/clang_win",
"path": "clang_win",
"version": "version:0"
},
{
"name": "skia/bots/win_vulkan_sdk",
"path": "win_vulkan_sdk",
"version": "version:2"
}
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
"os:Windows-2008ServerR2-SP1",
"pool:Skia"
],
"extra_args": [
"--workdir",
"../../..",
"compile",
"repository=<(REPO)",
"buildername=Build-Win-Clang-x86_64-Debug-Vulkan",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
"patch_storage=<(PATCH_STORAGE)",
"patch_issue=<(ISSUE)",
"patch_set=<(PATCHSET)"
],
"isolate": "compile_skia.isolate",
"priority": 0.8
},
"Build-Win-Clang-x86_64-Release": {
"cipd_packages": [
{
@ -4724,6 +4776,46 @@
"isolate": "compile_skia.isolate",
"priority": 0.8
},
"Build-Win-Clang-x86_64-Release-Vulkan": {
"cipd_packages": [
{
"name": "skia/bots/win_toolchain",
"path": "t",
"version": "version:6"
},
{
"name": "skia/bots/clang_win",
"path": "clang_win",
"version": "version:0"
},
{
"name": "skia/bots/win_vulkan_sdk",
"path": "win_vulkan_sdk",
"version": "version:2"
}
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
"os:Windows-2008ServerR2-SP1",
"pool:Skia"
],
"extra_args": [
"--workdir",
"../../..",
"compile",
"repository=<(REPO)",
"buildername=Build-Win-Clang-x86_64-Release-Vulkan",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
"patch_storage=<(PATCH_STORAGE)",
"patch_issue=<(ISSUE)",
"patch_set=<(PATCHSET)"
],
"isolate": "compile_skia.isolate",
"priority": 0.8
},
"Build-Win-MSVC-x86-Debug": {
"cipd_packages": [
{

4
tools/viewer/sk_app/win/VulkanWindowContext_win.cpp
View File

@ -44,8 +44,8 @@ WindowContext* NewVulkanForWin(HWND hwnd, const DisplayParams& params) {
return surface;
};
auto canPresent = [hwnd] (VkInstance instance, VkPhysicalDevice physDev,
uint32_t queueFamilyIndex) {
auto canPresent = [] (VkInstance instance, VkPhysicalDevice physDev,
uint32_t queueFamilyIndex) {
static PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR
getPhysicalDeviceWin32PresentationSupportKHR = nullptr;
if (!getPhysicalDeviceWin32PresentationSupportKHR) {