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

Add CheckGeneratedFiles recipe check for gpu workarounds

Browse Source 
Followup to https://skia-review.googlesource.com/122800

Bug: chromium: 829614
Change-Id: Idde753e0f8943290208625ba5b6332a5fdc07184
Reviewed-on: https://skia-review.googlesource.com/123536
Commit-Queue: Adrienne Walker <enne@chromium.org>
Commit-Queue: Eric Boren <borenet@google.com>
Auto-Submit: Adrienne Walker <enne@chromium.org>
Reviewed-by: Eric Boren <borenet@google.com>
This commit is contained in:
Adrienne Walker 2018-04-25 11:07:59 -07:00 committed by Skia Commit-Bot
parent d3c84fff65
commit 6f719aeeae
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infra/bots/recipe_modules/flavor/examples/full.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json
View File

@ -36,7 +36,7 @@
"[CUSTOM_/_B_WORK]/skia/bin/gn",
"gen",
"[START_DIR]/build/out/Release",
"--args=is_debug=false skia_compile_processors=true"
"--args=is_debug=false skia_compile_processors=true skia_generate_workarounds=true"
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {

1
infra/bots/recipe_modules/flavor/gn_flavor.py
View File

@ -215,6 +215,7 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
args['skia_ios_profile'] = '"Upstream Testing Provisioning Profile"'
if 'CheckGeneratedFiles' in extra_tokens:
args['skia_compile_processors'] = 'true'
args['skia_generate_workarounds'] = 'true'
if compiler == 'Clang' and 'Win' in os:
args['clang_win'] = '"%s"' % self.m.vars.slave_dir.join('clang_win')
extra_cflags.append('-DDUMMY_clang_win_version=%s' %

2
infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json
View File

@ -188,7 +188,7 @@
"[CUSTOM_/_B_WORK]/skia/bin/gn",
"gen",
"[START_DIR]/build/out/Release",
"--args=is_debug=false skia_compile_processors=true"
"--args=is_debug=false skia_compile_processors=true skia_generate_workarounds=true"
],
"cwd": "[CUSTOM_/_B_WORK]/skia",
"env": {

3
src/gpu/GrDriverBugWorkaroundsAutogen.h
View File

@ -2,8 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// This file is auto-generated from
// ../../tools/build_workaround_header.py
// This file is auto-generated from build_workaround_header.py
// DO NOT EDIT!
#define GPU_DRIVER_BUG_WORKAROUNDS(GPU_OP)\

6
tools/build_workaround_header.py
View File

@ -15,9 +15,9 @@ _LICENSE = """// Copyright 2018 The Chromium Authors. All rights reserved.
"""
_DO_NOT_EDIT_WARNING = ("// This file is auto-generated from\n" +
"// " + __file__ + "\n" +
"// DO NOT EDIT!\n\n")
_DO_NOT_EDIT_WARNING = ("// This file is auto-generated from " +
os.path.basename(__file__) + "\n" +
"// DO NOT EDIT!\n\n")
def merge_files_into_workarounds(files):
workarounds = set()