Skip to content

Fix BUILD.gn for Fuchsia platform build.#2692

Merged
zoddicus merged 1 commit intoKhronosGroup:masterfrom
digit-google:fuchsia-fixes
Jul 3, 2019
Merged

Fix BUILD.gn for Fuchsia platform build.#2692
zoddicus merged 1 commit intoKhronosGroup:masterfrom
digit-google:fuchsia-fixes

Conversation

@digit-google
Copy link
Copy Markdown
Contributor

In order for the Fuchsia source tree to update its
version of SPIRV-Tools to a newer upstream, the
BUILD.gn needs to be slightly altered to take care
of the fact that it can be used with a different
GN //build set of rules and configs than the
Chromium one.

This is done by using |build_with_chromium|, already
defined by //build_overrides/build.gni, to guard
Chromium-specific statements.

  • Add a target to generate spirv-opt which is used by
    Fuchsia to optimize shaders at build time for some of
    its graphics libraries.

@CLAassistant
Copy link
Copy Markdown

CLAassistant commented Jun 21, 2019

CLA assistant check
All committers have signed the CLA.

@digit-google
Copy link
Copy Markdown
Contributor Author

For the record, I've signed the CLA (multiple times). Does anyone knows why this is ignored? Thanks.

BUILD.gn Outdated
configs += [ ":spvtools_internal_config" ]
}

}
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mmm, this should not be here !? I'll upload a fix.

@zoddicus
Copy link
Copy Markdown
Contributor

For the record, I've signed the CLA (multiple times). Does anyone knows why this is ignored? Thanks.

If you have signed it since it originally posed, you may have to click the link about re-checking it.

For me atleast, this often this occurs when I have set the patch author in git as a different account then my GitHub one. Make sure that the user.email in your .git/config is set to the account associated with your GitHub account. You may have to amend the patch to update the author.

@digit-google
Copy link
Copy Markdown
Contributor Author

For the record, I've signed the CLA (multiple times). Does anyone knows why this is ignored? Thanks.

If you have signed it since it originally posed, you may have to click the link about re-checking it.

For me atleast, this often this occurs when I have set the patch author in git as a different account then my GitHub one. Make sure that the user.email in your .git/config is set to the account associated with your GitHub account. You may have to amend the patch to update the author.

Thank you, that's very likely to be the cause for this problem. My github email uses a +github@google.com suffix to help filtering emails :-/ This explains why the rechecks didn't do anything.

I will have to to amend my patch then. Wow!

Copy link
Copy Markdown
Contributor

@zoddicus zoddicus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please hold off on landing this until the chromium roll issue for your similar patch against shaderc is resolved.

@digit-google
Copy link
Copy Markdown
Contributor Author

I totally understand and agree. Thanks and sorry.

@zoddicus
Copy link
Copy Markdown
Contributor

I totally understand and agree. Thanks and sorry.

Does this PR need any changes, like the shaderc one did?

@digit-google
Copy link
Copy Markdown
Contributor Author

Yes, I'm preparing a patch. Sorry about that...

@zoddicus
Copy link
Copy Markdown
Contributor

zoddicus commented Jul 3, 2019

I think this still needs a fresh version with the correct author for the CLA check.

@digit-google
Copy link
Copy Markdown
Contributor Author

Ah yes, there was a typo in the ameneded author name in the latest commit (I used @google.cm instead of @google.com) and couldn't see it clearly. I was really puzzled why this wasn't working. I'll fix it. Thanks!

In order for the Fuchsia source tree to update its
version of SPIRV-Tools to a newer upstream, the
BUILD.gn needs to be slightly altered to take care
of the fact that it can be used with a different
GN //build set of rules and configs than the
Chromium one.

This is done by using |build_with_chromium|, already
defined by //build_overrides/build.gni, to guard
Chromium-specific statements.

+ Add a target to generate spirv-opt which is used by
  Fuchsia to optimize shaders at build time for some
  of its graphics libraries.
@zoddicus zoddicus merged commit a6bfc26 into KhronosGroup:master Jul 3, 2019
dneto0 pushed a commit to dneto0/SPIRV-Tools that referenced this pull request Sep 14, 2024
Roll third_party/re2/ 848dfb7e1..e356bd3f8 (6 commits)

google/re2@848dfb7...e356bd3

$ git log 848dfb7e1..e356bd3f8 --date=short --no-merges --format='%ad %ae %s'
2019-07-07 junyer Make RE2::Set canonicalize DFA states.
2019-07-05 junyer Fix SimplifyStringSet() for really reals. And the test.
2019-07-04 junyer Don't let Prefilter::OrStrings() return NULL.
2019-07-04 junyer Fix SimplifyStringSet() properly. Ensure test coverage.
2019-07-04 junyer Fix a typographical error.
2019-07-04 junyer Stop SimplifyStringSet() from finding "" in everything.

Roll third_party/spirv-cross/ 9a6e2534e..53ab2144b (7 commits)

KhronosGroup/SPIRV-Cross@9a6e253...53ab214

$ git log 9a6e2534e..53ab2144b --date=short --no-merges --format='%ad %ae %s'
2019-07-08 post Fall back to complex loop if non-trivial continue block is found.
2019-07-08 post Add test shaders for NonUniformEXT propagation.
2019-07-08 post Propagate NonUniformEXT to dependent expressions.
2019-07-05 post Add simple test for extended debug operations.
2019-07-04 lifeng.pan Parse SPIR-V debug information extended instructions, as well as OpNoLine.
2019-07-03 post Don't use scalar dot().
2019-07-03 post MSL/HLSL: Support scalar reflect and refract.

Roll third_party/spirv-headers/ 123dc27..29c1114 (1 commit)

KhronosGroup/SPIRV-Headers@123dc27...29c1114

$ git log 123dc27..29c1114 --date=short --no-merges --format='%ad %ae %s'
2019-06-15 antiagainst Reserve ID 23 for MLIR SPIR-V Serializer

Roll third_party/spirv-tools/ 9702d47..b8ab808 (5 commits)

KhronosGroup/SPIRV-Tools@9702d47...b8ab808

$ git log 9702d47..b8ab808 --date=short --no-merges --format='%ad %ae %s'
2019-07-07 afdx Shrinker for spirv-fuzz (KhronosGroup#2708)
2019-07-04 stevenperron Perform merge return with single return in loop. (KhronosGroup#2714)
2019-07-04 stevenperron Do not inline OpKill Instructions (KhronosGroup#2713)
2019-07-04 afdx Refactor reducer options (KhronosGroup#2709)
2019-07-03 52076061+digit-google Fix BUILD.gn for Fuchsia platform build. (KhronosGroup#2692)

Created with:
  roll-dep third_party/effcee third_party/glslang third_party/googletest third_party/re2 third_party/spirv-cross third_party/spirv-headers third_party/spirv-tools
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants