Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't provide system vulkan header paths to Skia. #7003

Merged
merged 1 commit into from
Nov 28, 2018
Merged

Don't provide system vulkan header paths to Skia. #7003

merged 1 commit into from
Nov 28, 2018

Conversation

chinmaygarde
Copy link
Member

Skia privately brings in its own copy. https://skia-review.googlesource.com/c/skia/+/172147

@chinmaygarde
Copy link
Member Author

Not that this PR is to the skia-master branch.

@chinmaygarde
Copy link
Member Author

@liyuqian Are the Cirrus bots wired to take into account the branch from the PR? Or is this still running off of master? I wasn't expecting these jobs to have been triggered.

@chinmaygarde chinmaygarde merged commit 93f75f2 into flutter:skia-master Nov 28, 2018
@chinmaygarde chinmaygarde deleted the novkheader branch November 28, 2018 23:31
@liyuqian
Copy link
Contributor

My impression is that Cirrus uses whatever branch your local change is based on. If your local change is based on skia-master, then it uses skia-master. If your local change is based on master, then it uses master. If your local change is based on an old master branch, then it uses that old master branch.

@liyuqian
Copy link
Contributor

BTW, can we also remove flutter/vulkan/skia_vulkan_header.h from our repo since it's no longer used?

@chinmaygarde
Copy link
Member Author

No. We still need that header because the embedder implementation needs the Vulkan headers. We just dont need to forward these over to Skia.

@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Dec 11, 2018
Closed
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Dec 11, 2018
Closed
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Dec 11, 2018
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 11, 2018
@engine-flutter-autoroll
93f75f2 Don't provide system vulkan header paths to Skia. (flutter/en…
bb891da 
…gine#7003)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 11, 2018
@engine-flutter-autoroll
93f75f2 Don't provide system vulkan header paths to Skia. (flutter/en…
0845052 
…gine#7003)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Dec 11, 2018
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 11, 2018
@engine-flutter-autoroll
93f75f2 Don't provide system vulkan header paths to Skia. (flutter/en…
f02b8e3 
…gine#7003)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 11, 2018
@engine-flutter-autoroll
93f75f2 Don't provide system vulkan header paths to Skia. (flutter/en…
bb97818 
…gine#7003)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 11, 2018
@engine-flutter-autoroll
93f75f2 Don't provide system vulkan header paths to Skia. (flutter/en…
f9c0ab6 
…gine#7003)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 11, 2018
@engine-flutter-autoroll
93f75f2 Don't provide system vulkan header paths to Skia. (flutter/en…
2a9f07c 
…gine#7003)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 11, 2018
@engine-flutter-autoroll
93f75f2 Don't provide system vulkan header paths to Skia. (flutter/en…
00b069f 
…gine#7003)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 11, 2018
@engine-flutter-autoroll
93f75f2 Don't provide system vulkan header paths to Skia. (flutter/en…
aaa95de 
…gine#7003)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 11, 2018
@engine-flutter-autoroll
93f75f2 Don't provide system vulkan header paths to Skia. (flutter/en…
9c408be 
…gine#7003)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 11, 2018
@engine-flutter-autoroll
93f75f2 Don't provide system vulkan header paths to Skia. (flutter/en…
57257ac 
…gine#7003)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Dec 12, 2018
@engine-flutter-autoroll
93f75f2 Don't provide system vulkan header paths to Skia. (flutter/en…
7536417 
…gine#7003)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jason-simmons jason-simmons jason-simmons approved these changes

Assignees
No one assigned
Labels
cla: yes
Projects
None yet
Milestone
No milestone
4 participants
@chinmaygarde @liyuqian @jason-simmons @googlebot