From c8274e941e1c5cfd484cad8a0a83428e6dade9ca Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Sat, 21 Mar 2020 03:20:25 -0400 Subject: [PATCH] Make file formatting comply with POSIX and Unix standards UTF-8, LF, no BOM, and newlines at the end of files --- BUILD.bazel | 4 +-- BUILD.gn | 2 +- SPIRV/Logger.cpp | 2 +- Test/foo.h | 2 +- Test/inc2/foo.h | 2 +- _config.yml | 2 +- glslang/Include/glslang_c_shader_types.h | 2 +- glslang/Include/revision.template | 26 +++++++++---------- glslang/MachineIndependent/intermOut.cpp | 2 +- .../propagateNoContraction.cpp | 2 +- glslang/MachineIndependent/reflection.h | 2 +- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index d70bc7f65..5930608a8 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -85,7 +85,7 @@ genrule( "SPIRV/GLSL.ext.KHR.h", "SPIRV/GLSL.ext.NV.h", "SPIRV/GLSL.std.450.h", - "SPIRV/NonSemanticDebugPrintf.h", + "SPIRV/NonSemanticDebugPrintf.h", "SPIRV/spirv.hpp", ], outs = [ @@ -94,7 +94,7 @@ genrule( "include/SPIRV/GLSL.ext.KHR.h", "include/SPIRV/GLSL.ext.NV.h", "include/SPIRV/GLSL.std.450.h", - "include/SPIRV/NonSemanticDebugPrintf.h", + "include/SPIRV/NonSemanticDebugPrintf.h", "include/SPIRV/spirv.hpp", ], cmd = "mkdir -p $(@D)/include/SPIRV && cp $(SRCS) $(@D)/include/SPIRV/", diff --git a/BUILD.gn b/BUILD.gn index 87c28e9de..49b4b0a33 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -70,7 +70,7 @@ source_set("glslang_sources") { "SPIRV/InReadableOrder.cpp", "SPIRV/Logger.cpp", "SPIRV/Logger.h", - "SPIRV/NonSemanticDebugPrintf.h", + "SPIRV/NonSemanticDebugPrintf.h", "SPIRV/SPVRemapper.cpp", "SPIRV/SPVRemapper.h", "SPIRV/SpvBuilder.cpp", diff --git a/SPIRV/Logger.cpp b/SPIRV/Logger.cpp index 7ea0c6342..cdc8469c4 100644 --- a/SPIRV/Logger.cpp +++ b/SPIRV/Logger.cpp @@ -69,4 +69,4 @@ std::string SpvBuildLogger::getAllMessages() const { } // end spv namespace -#endif \ No newline at end of file +#endif diff --git a/Test/foo.h b/Test/foo.h index 7f79340b6..236277c3f 100644 --- a/Test/foo.h +++ b/Test/foo.h @@ -1 +1 @@ -#error should not be included \ No newline at end of file +#error should not be included diff --git a/Test/inc2/foo.h b/Test/inc2/foo.h index fd09e808c..ea1e5ba11 100644 --- a/Test/inc2/foo.h +++ b/Test/inc2/foo.h @@ -1 +1 @@ -float4 i6; \ No newline at end of file +float4 i6; diff --git a/_config.yml b/_config.yml index c50ff38da..e8b995b95 100644 --- a/_config.yml +++ b/_config.yml @@ -1 +1 @@ -theme: jekyll-theme-merlot \ No newline at end of file +theme: jekyll-theme-merlot diff --git a/glslang/Include/glslang_c_shader_types.h b/glslang/Include/glslang_c_shader_types.h index 575528189..769f4c4a8 100644 --- a/glslang/Include/glslang_c_shader_types.h +++ b/glslang/Include/glslang_c_shader_types.h @@ -1,4 +1,4 @@ -/** +/** This code is based on the glslang_c_interface implementation by Viktor Latypov **/ diff --git a/glslang/Include/revision.template b/glslang/Include/revision.template index 6c13630b2..4a16beeb0 100644 --- a/glslang/Include/revision.template +++ b/glslang/Include/revision.template @@ -1,13 +1,13 @@ -// The file revision.h should be updated to the latest version, somehow, on -// check-in, if glslang has changed. -// -// revision.template is the source for revision.h when using SubWCRev as the -// method of updating revision.h. You don't have to do it this way, the -// requirement is only that revision.h gets updated. -// -// revision.h is under source control so that not all consumers of glslang -// source have to figure out how to create revision.h just to get a build -// going. However, if it is not updated, it can be a version behind. - -#define GLSLANG_REVISION "$WCREV$" -#define GLSLANG_DATE "$WCDATE$" +// The file revision.h should be updated to the latest version, somehow, on +// check-in, if glslang has changed. +// +// revision.template is the source for revision.h when using SubWCRev as the +// method of updating revision.h. You don't have to do it this way, the +// requirement is only that revision.h gets updated. +// +// revision.h is under source control so that not all consumers of glslang +// source have to figure out how to create revision.h just to get a build +// going. However, if it is not updated, it can be a version behind. + +#define GLSLANG_REVISION "$WCREV$" +#define GLSLANG_DATE "$WCDATE$" diff --git a/glslang/MachineIndependent/intermOut.cpp b/glslang/MachineIndependent/intermOut.cpp index 53dc35da8..2a3149f76 100644 --- a/glslang/MachineIndependent/intermOut.cpp +++ b/glslang/MachineIndependent/intermOut.cpp @@ -1537,4 +1537,4 @@ void TIntermediate::output(TInfoSink& infoSink, bool tree) } // end namespace glslang -#endif // not GLSLANG_WEB \ No newline at end of file +#endif // not GLSLANG_WEB diff --git a/glslang/MachineIndependent/propagateNoContraction.cpp b/glslang/MachineIndependent/propagateNoContraction.cpp index 83a3230f5..9def592ba 100644 --- a/glslang/MachineIndependent/propagateNoContraction.cpp +++ b/glslang/MachineIndependent/propagateNoContraction.cpp @@ -867,4 +867,4 @@ void PropagateNoContraction(const glslang::TIntermediate& intermediate) } }; -#endif // GLSLANG_WEB \ No newline at end of file +#endif // GLSLANG_WEB diff --git a/glslang/MachineIndependent/reflection.h b/glslang/MachineIndependent/reflection.h index efdc8934f..0c33de459 100644 --- a/glslang/MachineIndependent/reflection.h +++ b/glslang/MachineIndependent/reflection.h @@ -220,4 +220,4 @@ protected: #endif // _REFLECTION_INCLUDED -#endif // GLSLANG_WEB \ No newline at end of file +#endif // GLSLANG_WEB