From 95582453d48df3194770c76f988d6f3503ec844e Mon Sep 17 00:00:00 2001 From: Doug McDiarmid Date: Wed, 23 Jun 2021 18:46:04 -0700 Subject: [PATCH] Added comments and updated optional stream buffer bitmasks --- .../RayTracing/RayTracingSceneSrg.azsli | 8 ++++---- .../RayTracing/RayTracingSceneUtils.azsli | 6 +++--- .../diffuseprobegridraytracing.azshader | Bin 79466 -> 79466 bytes ...probegridraytracing_dx12_0.azshadervariant | Bin 34730 -> 34730 bytes ...probegridraytracing_null_0.azshadervariant | Bin 4502 -> 4502 bytes ...obegridraytracing_vulkan_0.azshadervariant | Bin 36332 -> 36332 bytes ...fuseprobegridraytracingclosesthit.azshader | Bin 79476 -> 79476 bytes ...aytracingclosesthit_dx12_0.azshadervariant | Bin 17142 -> 17142 bytes ...aytracingclosesthit_null_0.azshadervariant | Bin 4502 -> 4502 bytes ...tracingclosesthit_vulkan_0.azshadervariant | Bin 9420 -> 9420 bytes .../diffuseprobegridraytracingmiss.azshader | Bin 79470 -> 79470 bytes ...egridraytracingmiss_dx12_0.azshadervariant | Bin 17218 -> 17218 bytes ...egridraytracingmiss_null_0.azshadervariant | Bin 4502 -> 4502 bytes ...ridraytracingmiss_vulkan_0.azshadervariant | Bin 10364 -> 10364 bytes 14 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingSceneSrg.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingSceneSrg.azsli index bdc5680d31..c81426515d 100644 --- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingSceneSrg.azsli +++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingSceneSrg.azsli @@ -152,10 +152,10 @@ ShaderResourceGroup RayTracingSceneSrg : SRG_RayTracingScene #define MESH_POSITION_BUFFER_OFFSET 1 #define MESH_NORMAL_BUFFER_OFFSET 2 - // buffer flag bits indicating if optional buffers are present - #define MESH_BUFFER_FLAG_TANGENT 1 - #define MESH_BUFFER_FLAG_BITANGENT 2 - #define MESH_BUFFER_FLAG_UV 3 + // buffer flag bits indicating if optional buffers are present (note: these are bit masks) + #define MESH_BUFFER_FLAG_TANGENT (1 << 0) + #define MESH_BUFFER_FLAG_BITANGENT (1 << 1) + #define MESH_BUFFER_FLAG_UV (1 << 2) // Unbounded array of mesh stream buffers: // - Index, Position, Normal stream buffers are always present diff --git a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingSceneUtils.azsli b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingSceneUtils.azsli index 8847dd09c8..b3cf1a5783 100644 --- a/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingSceneUtils.azsli +++ b/Gems/Atom/Feature/Common/Assets/ShaderLib/Atom/Features/RayTracing/RayTracingSceneUtils.azsli @@ -33,9 +33,9 @@ struct VertexData { float3 m_position; float3 m_normal; - float4 m_tangent; - float3 m_bitangent; - float2 m_uv; + float4 m_tangent; // optional: use only if MESH_BUFFER_FLAG_TANGENT in MeshData.m_bufferFlags is set + float3 m_bitangent; // optional: use only if MESH_BUFFER_FLAG_BITANGENT in MeshData.m_bufferFlags is set + float2 m_uv; // optional: use only if MESH_BUFFER_FLAG_UV in MeshData.m_bufferFlags is set }; VertexData GetHitInterpolatedVertexData(RayTracingSceneSrg::MeshInfo meshInfo, float2 builtInBarycentrics) diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracing.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracing.azshader index f8be95f5192b91e36ac39164ef3a998e5249a4c7..d33b502a16dd08ca5d0fc3ac32e73e66984b378f 100644 GIT binary patch delta 61 zcmV-D0K)(3>;&rU1hCU-2nWe^Ly<|5=d;^sDrN}ckdOb{j6_DW4bVAd2+eD)Xw|(s T?6*!e0TclU^ddgwkN^Mx%=8>y delta 61 zcmV-D0K)(3>;&rU1hCU-2#Z7>xKe~;#l0#NU;qGEN(XKL diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit.azshader index ce93116741f2b387a029a04abeebcd9a89bc4277..dd8d5952ce92dbda5765410d2f65f9d032ef35c3 100644 GIT binary patch delta 68 zcmV-K0K5P6>;&}e1hCy{2=Jb62U3Zs#IxmTDrN}sSno?ztQ+H#z-lYALeLIn2=N{- a>*W(=f|J2&Dwl#a0qO|!CGv)@0002QkRZeW delta 68 zcmV-K0K5P6>;&}e1hCy{2nksc6e%ELBeUgcDrN|6MZ6$nPJ=&_z-lYALeLIn2q74k a0%;5?o0Gw6Dwl#a0qO|xoCvdy0002ATp8*B diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_dx12_0.azshadervariant index 5b90c98e4ef51df6cb2f890e2b9e707328581fd9..f6a665e54ea36a193b67a2c330437872faa66753 100644 GIT binary patch delta 18 acmey?%J{97al<<&jxVa8+SV~JFaQ8p`v@Qa delta 18 acmey?%J{97al<<&j*oLVHuo_wFaQ8o2?w_T diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_null_0.azshadervariant index 08807cbca3c3edc52c1dd06424b5704d31025af1..5280dddf705ced4f6ff39b9c6bd6449c30e0c145 100644 GIT binary patch delta 16 XcmbQHJWY8+pCHE<)lY5f7#J7;IB5n6 delta 16 XcmbQHJWY8+pCHG_IUJk&7#J7;Hg^S} diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingclosesthit_vulkan_0.azshadervariant index b641b8cac0d75fdd56055acdab242915b9b145fb..dfa67b2d0257d2846fd94994a03fcdf7ab55f3d9 100644 GIT binary patch delta 16 YcmX@(dB$_Y5fzRvs-N1{F)%Oy07dl&3IG5A delta 16 YcmX@(dB$_Y5fzS)b2v8lF)%Oy07L@@p#T5? diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingmiss.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingmiss.azshader index 530e25c13be872567db6b82f139b795d9f06be61..0e1b365d65882a575eaef4231c4955237516c794 100644 GIT binary patch delta 64 zcmV-G0Kfn4>;&%Y1hCg>2)0pN(^clTRkPn|DrN}XVyW4kDS}J05zskh2+pWuJI@73 WY?HfcDwljU0qO|!CMq(J0000h_#F}e delta 64 zcmV-G0Kfn4>;&%Y1hCg>2>!0H0KS&;!?WLMDrN`|bEpgP>1%Sc5zskh2pO|w80Kw) W!jrpdDwljU0qO|xnmJ}e0000=&K^Ag diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingmiss_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridraytracingmiss_dx12_0.azshadervariant index fc41a85572ef8b861833d44745f66c507425d67d..1cdaa0862de17e8527d4737f7f476b854520606c 100644 GIT binary patch delta 18 ZcmX@q#(1cWaf6jJ#}_p%qX`TQ3;;v#1