Skip to content

Re-format source tree - NFC.#1018

Merged
dnovillo merged 1 commit intoKhronosGroup:masterfrom
dnovillo:clang-format
Nov 28, 2017
Merged

Re-format source tree - NFC.#1018
dnovillo merged 1 commit intoKhronosGroup:masterfrom
dnovillo:clang-format

Conversation

@dnovillo
Copy link
Copy Markdown
Contributor

Re-formatted the source tree with the command:

$ /usr/bin/clang-format -style=file -i
$(find include source tools test utils -name '.cpp' -or -name '.h')

This required a fix to source/val/decoration.h. It was not including
spirv.h, which broke builds when the #include headers were re-ordered by
clang-format.

2------h
)").substr(1);
)")
.substr(1);
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

This doesn't look right.

TEST_F(BinaryVersion, LinkerChoosesMaxSpirvVersion) {
spvtest::Binaries binaries = {
{
SpvMagicNumber,
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

This seems to be intentional format. Consider turning auto-format off.

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.

Done, though I would rather let clang-format do its thing and not have many exceptions.

30H2S2----20H1S1----D2
)").substr(1));
)")
.substr(1));
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

This doesn't look right.

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.

This one is borderline for me. There's too many lines that would need to be disabled and it's easier to just let clang-format decide here.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I agree it does not look good, but it is in an part of the code that people are going to read very often. Since it happens in a few different file in a lot of places, I don't think it is worth fixing until some needs to actually change those files. I suggest just letting clang-format do its thing.

Copy link
Copy Markdown
Collaborator

@s-perron s-perron left a comment

Choose a reason for hiding this comment

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

I'm assuming clang-format is being run correctly. Everything LGTM.

30H2S2----20H1S1----D2
)").substr(1));
)")
.substr(1));
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I agree it does not look good, but it is in an part of the code that people are going to read very often. Since it happens in a few different file in a lot of places, I don't think it is worth fixing until some needs to actually change those files. I suggest just letting clang-format do its thing.

@dnovillo
Copy link
Copy Markdown
Contributor Author

dnovillo commented Nov 27, 2017 via email

This fixes the lack of uint32_t definition in source/val/decoration.h.
@dnovillo dnovillo merged commit 491b112 into KhronosGroup:master Nov 28, 2017
@dnovillo
Copy link
Copy Markdown
Contributor Author

Re-based, pushed to master as commit 491b112

@dnovillo dnovillo mentioned this pull request Nov 28, 2017
dneto0 pushed a commit to dneto0/SPIRV-Tools that referenced this pull request Sep 14, 2024
Roll third_party/glslang/ 1f0fcbe..8e26c5f (26 commits)

$ git log 1f0fcbe..8e26c5f --date=short --no-merges --format='%ad %ae %s'
2020-03-25 neslisah.torosdagli@amd.com switch format update
2020-03-24 neslisah.torosdagli@amd.com copyright notice changes removed from unchanged files
2020-03-24 neslisah.torosdagli@amd.com copyright notice changes removed from unchanged files
2020-03-24 neslisah.torosdagli@amd.com copyright notice changes removed from unchanged files
2020-03-24 neslisah.torosdagli@amd.com spirv.hpp reverted to commit f368dcb
2020-03-24 neslisah.torosdagli@amd.com .travis updated to origin, rayQueryCheck removed
2020-03-23 neslisah.torosdagli@amd.com const rayFlag defs used in the test cases in stead of numerical values
2020-03-23 neslisah.torosdagli@amd.com compute and fragment shader test_cases added for rayQuery
2020-03-23 neslisah.torosdagli@amd.com rayQuery test cases added
2020-03-23 neslisah.torosdagli@amd.com rayQueryEXT function parameter
2020-03-23 neslisah.torosdagli@amd.com rayQueryEXT assignment is allowed.
2020-03-23 neslisah.torosdagli@amd.com test names updated
2020-03-23 kainino@chromium.org update README
2020-03-23 kainino@chromium.org Fix build on CMake 2.8, and fix Web build
2020-03-23 neslisah.torosdagli@amd.com wait time increased for the install
2020-03-23 neslisah.torosdagli@amd.com rayQuery test cases disabled
2020-03-20 neslisah.torosdagli@amd.com GL_EXT_ray_query glslang updates, and test cases added.
2020-03-19 neslisah.torosdagli@amd.com comment update, rayQueryEXT is writable, readonly check removed.
2020-03-19 ntorosda@amd.com GL_EXT_ray_query updates
2020-03-18 cepheus@frii.com Fix KhronosGroup#2132: constant matrix constructor from single non-scalar argument
2020-03-19 neslisah.torosdagli@amd.com comment update, rayQueryEXT is writable, readonly check removed.
2020-03-19 ntorosda@amd.com GL_EXT_ray_query updates
2020-03-18 cepheus@frii.com Fix KhronosGroup#2132: constant matrix constructor from single non-scalar argument
2020-03-19 neslisah.torosdagli@amd.com comment update, rayQueryEXT is writable, readonly check removed.
2020-03-19 neslisah.torosdagli@amd.com GL_EXT_ray_query updates
2020-03-19 ntorosda@amd.com GL_EXT_ray_query updates
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.

3 participants