From 9050377526d7aa67ce6c71a298a021c38c94007e Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Tue, 27 Dec 2022 19:04:09 +0100 Subject: [PATCH] Fix imported shader source last char value to prevent strange diffs in Version Control Systems --- Content/Shaders/AtmospherePreCompute.flax | 4 ++-- Content/Shaders/BakeLightmap.flax | 4 ++-- Content/Shaders/BitonicSort.flax | 4 ++-- Content/Shaders/ColorGrading.flax | 4 ++-- Content/Shaders/DebugDraw.flax | 4 ++-- Content/Shaders/Editor/LightmapUVsDensity.flax | 4 ++-- Content/Shaders/Editor/MaterialComplexity.flax | 4 ++-- Content/Shaders/Editor/QuadOverdraw.flax | 4 ++-- Content/Shaders/Editor/VertexColors.flax | 4 ++-- Content/Shaders/EyeAdaptation.flax | 4 ++-- Content/Shaders/FXAA.flax | 4 ++-- Content/Shaders/Fog.flax | 4 ++-- Content/Shaders/Forward.flax | 4 ++-- Content/Shaders/GBuffer.flax | 4 ++-- Content/Shaders/GI/DDGI.flax | 4 ++-- Content/Shaders/GI/GlobalSurfaceAtlas.flax | 4 ++-- Content/Shaders/GPUParticlesSorting.flax | 4 ++-- Content/Shaders/GUI.flax | 4 ++-- Content/Shaders/GlobalSignDistanceField.flax | 4 ++-- Content/Shaders/Histogram.flax | 4 ++-- Content/Shaders/Lights.flax | 4 ++-- Content/Shaders/MotionBlur.flax | 4 ++-- Content/Shaders/MultiScaler.flax | 4 ++-- Content/Shaders/PostProcessing.flax | 2 +- Content/Shaders/ProbesFilter.flax | 4 ++-- Content/Shaders/Quad.flax | 4 ++-- Content/Shaders/Reflections.flax | 4 ++-- Content/Shaders/SMAA.flax | 4 ++-- Content/Shaders/SSAO.flax | 4 ++-- Content/Shaders/Shadows.flax | 4 ++-- Content/Shaders/Sky.flax | 4 ++-- Content/Shaders/TAA.flax | 4 ++-- Content/Shaders/VolumetricFog.flax | 4 ++-- Source/Engine/ContentImporters/ImportShader.cpp | 6 ++++-- 34 files changed, 69 insertions(+), 67 deletions(-) diff --git a/Content/Shaders/AtmospherePreCompute.flax b/Content/Shaders/AtmospherePreCompute.flax index 527275f61..20491857f 100644 --- a/Content/Shaders/AtmospherePreCompute.flax +++ b/Content/Shaders/AtmospherePreCompute.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f06c5ac062366b3ef86c355c6cc8b3a984b8eb9bc027ffc0874bc51dbaef4b3e -size 11720 +oid sha256:68e1592216496fd6749ac4538dd2d549c39813d17ec3114514889100782007a6 +size 11418 diff --git a/Content/Shaders/BakeLightmap.flax b/Content/Shaders/BakeLightmap.flax index ef3e02163..03af565fc 100644 --- a/Content/Shaders/BakeLightmap.flax +++ b/Content/Shaders/BakeLightmap.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18eb0ec2642a8f87ee3d4dbe7af8771b0f79f983637aee1a9e5baebce435976b -size 16284 +oid sha256:0cf36b83e0bdbbf47b2d88b39d18ae3e1ac85246d46a05f1e6c58f89f4abc105 +size 15794 diff --git a/Content/Shaders/BitonicSort.flax b/Content/Shaders/BitonicSort.flax index 980b664f3..c49c2b73f 100644 --- a/Content/Shaders/BitonicSort.flax +++ b/Content/Shaders/BitonicSort.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8d1a797f813d3af8a98bcb8110981ea8c033324e94fb6413615c811b5c5bfd7 -size 6808 +oid sha256:fbecce17a3a0dba01aa1e8d537041c27339a5f171c04cdeb83c68765fd6ac652 +size 6548 diff --git a/Content/Shaders/ColorGrading.flax b/Content/Shaders/ColorGrading.flax index a7a466d5e..d36626d2c 100644 --- a/Content/Shaders/ColorGrading.flax +++ b/Content/Shaders/ColorGrading.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2bda196600fbc9d6f362e85471399331941272cdd92f9888bdcf7a1b8b04ada7 -size 10925 +oid sha256:1841743cd96e3efba196cba05678658463c1c1fcd6b06ac7703e87bb2850d641 +size 10618 diff --git a/Content/Shaders/DebugDraw.flax b/Content/Shaders/DebugDraw.flax index ea3807153..4e824c30c 100644 --- a/Content/Shaders/DebugDraw.flax +++ b/Content/Shaders/DebugDraw.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b25f3b058f2bca838a661e46e90931f347b7e9984626e2b0112270e0f3e4fa47 -size 2115 +oid sha256:9fc85c05a9203d53f03db74f4d04a39e651e34d310de119f06279a1ce0299bcc +size 2053 diff --git a/Content/Shaders/Editor/LightmapUVsDensity.flax b/Content/Shaders/Editor/LightmapUVsDensity.flax index c817058f7..145040bbe 100644 --- a/Content/Shaders/Editor/LightmapUVsDensity.flax +++ b/Content/Shaders/Editor/LightmapUVsDensity.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f23c12db6332866a9ac91d576575448af02e1a4e0fff20529f32911970de72e5 -size 4509 +oid sha256:7df3b4a9464524bb0354ab9f4e7dc6256af56d3f13f3b347a946742ecbf4c1d1 +size 4391 diff --git a/Content/Shaders/Editor/MaterialComplexity.flax b/Content/Shaders/Editor/MaterialComplexity.flax index 3c8770e50..490f72a38 100644 --- a/Content/Shaders/Editor/MaterialComplexity.flax +++ b/Content/Shaders/Editor/MaterialComplexity.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a891d1a83c1c99f17f43f75fbe09ffe5df99bd52f150875771f70ee67f2f52e0 -size 1336 +oid sha256:446446a3e8e3e72793cfdf3cf76d705917a61814fd1f40cb60827ad3c002b21d +size 1303 diff --git a/Content/Shaders/Editor/QuadOverdraw.flax b/Content/Shaders/Editor/QuadOverdraw.flax index 7eba0013e..7e6bdfb9a 100644 --- a/Content/Shaders/Editor/QuadOverdraw.flax +++ b/Content/Shaders/Editor/QuadOverdraw.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a25d8d4db381507c4c2a33d794b7eec8994ae8d281478e057232adf788224db -size 1448 +oid sha256:50ab3a3734b0cd349aadd61c404739b48146cc1f326412dc5e4604da3fe03dc6 +size 1414 diff --git a/Content/Shaders/Editor/VertexColors.flax b/Content/Shaders/Editor/VertexColors.flax index 2d862a36d..92b00ddac 100644 --- a/Content/Shaders/Editor/VertexColors.flax +++ b/Content/Shaders/Editor/VertexColors.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf47e691ee17a3bf17948cc365a327685e5298568a993fec47a920934d1a86fb -size 2102 +oid sha256:66e418d872f95996806ff866e4786d8d22e504c5209f4b7b8e140c29a77ce93f +size 2053 diff --git a/Content/Shaders/EyeAdaptation.flax b/Content/Shaders/EyeAdaptation.flax index a81177004..1f52e67da 100644 --- a/Content/Shaders/EyeAdaptation.flax +++ b/Content/Shaders/EyeAdaptation.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:00e1a4e4fc4153cb83b090169b9d600686e9bf6a6565914de46d55b1b945025e -size 4610 +oid sha256:0f1a19e5a918049d093d4536e540d4ffb779c2b0b4524a277b1503afbecea79b +size 4453 diff --git a/Content/Shaders/FXAA.flax b/Content/Shaders/FXAA.flax index 7f8e18d8a..4b6bdfe25 100644 --- a/Content/Shaders/FXAA.flax +++ b/Content/Shaders/FXAA.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8a6d89039e93acb1ac658b4b63ab9baa21c7777d948f14732571529a8cfe519 -size 25139 +oid sha256:142d7ede22ed99b095dd07fcce722b7668554911e57a1b41e17842e0383a8d24 +size 24484 diff --git a/Content/Shaders/Fog.flax b/Content/Shaders/Fog.flax index 37410e1af..f19396bd8 100644 --- a/Content/Shaders/Fog.flax +++ b/Content/Shaders/Fog.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58dab7514164b3cf941636dbead945da12b13dc485dbec997227711c2e67e58f -size 2878 +oid sha256:4703c3f843dec8248938344d04778d4705eb61247610906af9ec22b4d42f1eae +size 2795 diff --git a/Content/Shaders/Forward.flax b/Content/Shaders/Forward.flax index b922a3b16..393603913 100644 --- a/Content/Shaders/Forward.flax +++ b/Content/Shaders/Forward.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d18f21b456efe8c9f5c38c35aa0ce6e13552966aa48445cb33826837bea2819 -size 1221 +oid sha256:0c76097d4a231be004658cdbbeae05058ff5408cb003d38ac5ef6ca927c04484 +size 1197 diff --git a/Content/Shaders/GBuffer.flax b/Content/Shaders/GBuffer.flax index 78308a4bb..a22a76fb1 100644 --- a/Content/Shaders/GBuffer.flax +++ b/Content/Shaders/GBuffer.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:180768a9304d7bc12c8fb487a39a9991575d55cfaf5fe3135a4985098340d042 -size 2845 +oid sha256:255a153284978cff6e0285f40355ba8695679f97215c2efe39082ae7422f7d8f +size 2774 diff --git a/Content/Shaders/GI/DDGI.flax b/Content/Shaders/GI/DDGI.flax index 9e45adb50..6b0a66187 100644 --- a/Content/Shaders/GI/DDGI.flax +++ b/Content/Shaders/GI/DDGI.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3816b8fdd088656e385f46832c2719c77d386d12ec14ac3d0ac6df017b2c7e4 -size 23668 +oid sha256:e8a1f629462b91a6e520bff1c52e6144e157aa6c0b64508785f867e38f6fa051 +size 23092 diff --git a/Content/Shaders/GI/GlobalSurfaceAtlas.flax b/Content/Shaders/GI/GlobalSurfaceAtlas.flax index 3450fa8c6..ba31eea60 100644 --- a/Content/Shaders/GI/GlobalSurfaceAtlas.flax +++ b/Content/Shaders/GI/GlobalSurfaceAtlas.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c342070b981a0dbf335276434ce59f345861e8f9e7d4f2cf07ae2016542642e8 -size 12954 +oid sha256:8247f56712db3e47150b4f75416ff8baee778f43f4825d9c802e6a95e57c802e +size 12614 diff --git a/Content/Shaders/GPUParticlesSorting.flax b/Content/Shaders/GPUParticlesSorting.flax index 6b2a31931..08b6a4d78 100644 --- a/Content/Shaders/GPUParticlesSorting.flax +++ b/Content/Shaders/GPUParticlesSorting.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5d131298c4f138278a5339e7d1a2dd8263c4afa4e27f3fa345ebda21989ea15 -size 2726 +oid sha256:fcfaa7567daaeac0ba0e3d135db52c674b7f17f8bace31b8a4f75ef8a24b21a7 +size 2639 diff --git a/Content/Shaders/GUI.flax b/Content/Shaders/GUI.flax index a6e231bd4..18f16aa34 100644 --- a/Content/Shaders/GUI.flax +++ b/Content/Shaders/GUI.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5512b7584d43b571a9a30cec4b5c160cebd8924f4305c8de0ae439a664d143a7 -size 5111 +oid sha256:b4b204acc4b60f93a490e3178a853a7ae059ac5e6e1e4ee4dc7ebc0b8771413c +size 4943 diff --git a/Content/Shaders/GlobalSignDistanceField.flax b/Content/Shaders/GlobalSignDistanceField.flax index ec1d39d8f..50ca8c78d 100644 --- a/Content/Shaders/GlobalSignDistanceField.flax +++ b/Content/Shaders/GlobalSignDistanceField.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e14a67948d93abb8ef6124b39fdb7b1bc682e1fdf5341ce6255eefe2606a2dfc -size 11787 +oid sha256:dd3a18c7831eba6b531d82528733e2f7ab58a02b076441a974e2b999b26da616 +size 11498 diff --git a/Content/Shaders/Histogram.flax b/Content/Shaders/Histogram.flax index 4c5967874..9df23aad7 100644 --- a/Content/Shaders/Histogram.flax +++ b/Content/Shaders/Histogram.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92a990f5286c449d3274bd90766d022d03aeaa43ecb93c0589d391828842b16b -size 2609 +oid sha256:761d2f9eea984a5cb46ba7a83f3f49c9cb7452a05420faecc70c55c3b56cfa45 +size 2532 diff --git a/Content/Shaders/Lights.flax b/Content/Shaders/Lights.flax index 612a634ab..c76a501fe 100644 --- a/Content/Shaders/Lights.flax +++ b/Content/Shaders/Lights.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86919e780799e02ebae7ce13f876925219e5b03234c7fdae3b610623d8bc81b8 -size 5299 +oid sha256:37b0d62eff4ed0ea2cd48c351e0f8e0ed98f1aac3b272fd0849227eda6cb6856 +size 5122 diff --git a/Content/Shaders/MotionBlur.flax b/Content/Shaders/MotionBlur.flax index 5dac7c3eb..a2c201bc6 100644 --- a/Content/Shaders/MotionBlur.flax +++ b/Content/Shaders/MotionBlur.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82109c08b00acfcd46818e35b05732ccdfd7f453bf6b3cea5b450603b2d1baa8 -size 9685 +oid sha256:7b468b522e29e3464a2e310334e011d793a10ebc20092e5bedd76d33ed608054 +size 9428 diff --git a/Content/Shaders/MultiScaler.flax b/Content/Shaders/MultiScaler.flax index 3b71c27aa..8e5790610 100644 --- a/Content/Shaders/MultiScaler.flax +++ b/Content/Shaders/MultiScaler.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:737c91950c010adb13cee6669f77d95737aa671f17d71fb6bee8ca5c3c627e27 -size 7206 +oid sha256:a0412a83a79884e77e09f5debfedf45b5856756b2e2298edef196c9434d4bf19 +size 7006 diff --git a/Content/Shaders/PostProcessing.flax b/Content/Shaders/PostProcessing.flax index a771d9882..bba56658c 100644 --- a/Content/Shaders/PostProcessing.flax +++ b/Content/Shaders/PostProcessing.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f72955c7285fb135c80ba73ac0a1e62463394c86979bdad1e0a789158ad7728c +oid sha256:5f3c7923418f5872dc4bbfb08c39327f46d357c62827711da5e4e50332f26bc0 size 16522 diff --git a/Content/Shaders/ProbesFilter.flax b/Content/Shaders/ProbesFilter.flax index 760a91040..59ec47ef3 100644 --- a/Content/Shaders/ProbesFilter.flax +++ b/Content/Shaders/ProbesFilter.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3765117ee658c768184f9af0c7aa7799c575cfc68f5ce0d824e211570d887135 -size 2108 +oid sha256:bfc735d6646e35594c1441298a4718ea8cffe4517762f65982dabed50af8215e +size 2030 diff --git a/Content/Shaders/Quad.flax b/Content/Shaders/Quad.flax index 485a11fbf..6a6897dfb 100644 --- a/Content/Shaders/Quad.flax +++ b/Content/Shaders/Quad.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:04c502c31eaceba9738444cd3a9419474ebfbfd42e7efa39b7cc5778a19e267c -size 2310 +oid sha256:f9225e31ac76e66a2f4c09f70af326229c563155dc0c34eccb9f243f80c07908 +size 2242 diff --git a/Content/Shaders/Reflections.flax b/Content/Shaders/Reflections.flax index 9cf210fec..e594c5727 100644 --- a/Content/Shaders/Reflections.flax +++ b/Content/Shaders/Reflections.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b651d798d3e2a36d3afe960e087f061cf53cac826ac48fff17eebba7293ed46f -size 3288 +oid sha256:772f6b54b8ab6f6f054935bd9593616896c9e7b56249f0b084d85858a50f4f00 +size 3193 diff --git a/Content/Shaders/SMAA.flax b/Content/Shaders/SMAA.flax index e315c9ef5..605524a5d 100644 --- a/Content/Shaders/SMAA.flax +++ b/Content/Shaders/SMAA.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c53b7a4929736b7f603f47475e2d668100e52f53c6ba176397b06b2ebc0f050d -size 47673 +oid sha256:8071432958f2e295bc22f7058970c18135c001a4f705f20c4c99385d8acf1daa +size 46449 diff --git a/Content/Shaders/SSAO.flax b/Content/Shaders/SSAO.flax index e4a48b1f8..232e72a8c 100644 --- a/Content/Shaders/SSAO.flax +++ b/Content/Shaders/SSAO.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8ed05e81b6c7822c725976551f75960e770f3a32fdb23ab49f60e32e366ae15 -size 37614 +oid sha256:b6747405d3ef0698c9b84ceebfc1ba2fb3d255ffcec10bd5e5fb86b1ff632187 +size 36841 diff --git a/Content/Shaders/Shadows.flax b/Content/Shaders/Shadows.flax index 8c45d669a..9c5e5b142 100644 --- a/Content/Shaders/Shadows.flax +++ b/Content/Shaders/Shadows.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61ea612b8ee409c1de4bb4ff4455f31bf32ed756a6612d9c5a9a152ff6b034d0 -size 7847 +oid sha256:b823730a83d35980f63d3adb7d23c8ee4585826c6e6dd09555dd97aa77dad269 +size 7654 diff --git a/Content/Shaders/Sky.flax b/Content/Shaders/Sky.flax index 2ff583cfc..e7bc71130 100644 --- a/Content/Shaders/Sky.flax +++ b/Content/Shaders/Sky.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ad54e191498e2c0067b32b041cfb351fa18f928d36372ae259a8b64a9dfb311 -size 3572 +oid sha256:0791b4d9504a0284ecb7f45b8339abab12a00396c2b4063ee4320ac15d92bc9b +size 3473 diff --git a/Content/Shaders/TAA.flax b/Content/Shaders/TAA.flax index 768ffd750..65d5a2fae 100644 --- a/Content/Shaders/TAA.flax +++ b/Content/Shaders/TAA.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e15b9c0eed4678e45c681a789159fff3ff13d5f0cbd0a4880df1f6c6f68d9812 -size 3371 +oid sha256:f8103f574606ee8a27a3e1ac9d2bc796c5110711bb12246e1ff20e67d8844591 +size 3284 diff --git a/Content/Shaders/VolumetricFog.flax b/Content/Shaders/VolumetricFog.flax index 997b1ab8f..660b70338 100644 --- a/Content/Shaders/VolumetricFog.flax +++ b/Content/Shaders/VolumetricFog.flax @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7fd020a2c82854ed852a2bb7682dc69b7abe31f139ecff485082d21d9188993d -size 14257 +oid sha256:819c97f3b6d28209f0fe3f09a0b89af88e24cff5bf57658e696b586f1ec040ed +size 13843 diff --git a/Source/Engine/ContentImporters/ImportShader.cpp b/Source/Engine/ContentImporters/ImportShader.cpp index fe1253644..c6394c91b 100644 --- a/Source/Engine/ContentImporters/ImportShader.cpp +++ b/Source/Engine/ContentImporters/ImportShader.cpp @@ -32,12 +32,14 @@ CreateAssetResult ImportShader::Import(CreateAssetContext& context) LOG(Warning, "Empty shader source file."); return CreateAssetResult::Error; } - context.Data.Header.Chunks[SourceCodeChunk]->Data.Allocate(sourceCodeSize + 1); - const auto sourceCode = context.Data.Header.Chunks[SourceCodeChunk]->Get(); + const auto& sourceCodeChunk = context.Data.Header.Chunks[SourceCodeChunk]; + sourceCodeChunk->Data.Allocate(sourceCodeSize + 1); + const auto sourceCode = sourceCodeChunk->Get(); Platform::MemoryCopy(sourceCode, sourceCodeText.Get(), sourceCodeSize); // Encrypt source code Encryption::EncryptBytes(sourceCode, sourceCodeSize); + sourceCode[sourceCodeSize] = 0; // Set Custom Data with Header ShaderStorage::Header20 shaderHeader;