Merge pull request #1537 from Unity-Technologies/lw/fix-unityperdraw-cblayout

Lw/fix unityperdraw cblayout

com.unity.render-pipelines.lightweight/CHANGELOG.md

 
 ## [Unreleased]
 ### Fixed
+- Fixed UnityPerDraw CB layout
 - GLCore compute buffer compiler error
 - Occlusion strength not being applied on LW standard shaders
 - CopyDepth pass is being called even when a depth from prepass is available

com.unity.render-pipelines.lightweight/LWRP/ShaderLibrary/InputBuiltin.hlsl

 
 // ----------------------------------------------------------------------------
 
+// Block Layout should be respected due to SRP Batcher
-
+// Space block Feature
+// Light Indices block feature
+// These are set internally by the engine upon request by RendererConfiguration.
+// Check GetRendererSettings in LightweightPipeline.cs
+real4 unity_LightIndicesOffsetAndCount;
+real4 unity_4LightIndices0;
+real4 unity_4LightIndices1;
+
+// Reflection Probe 0 block feature
+// HDR environment map decode instructions
+real4 unity_SpecCube0_HDR;
+
+// Lightmap block feature
+float4 unity_DynamicLightmapST;
-// SH lighting environment
+// No feature block yet!
+// HDR lightmap decode instructions
+real4 unity_Lightmap_HDR;
+
+// SH block feature
 real4 unity_SHAr;
 real4 unity_SHAg;
 real4 unity_SHAb;
 real4 unity_SHC;
 
+// Probe Occlusion block feature
-
-// HDR environment map decode instructions
-real4 unity_SpecCube0_HDR;
-
-// HDR lightmap decode instructions
-real4 unity_Lightmap_HDR;
-
-// These are set internally by the engine upon request by RendererConfiguration.
-// Check GetRendererSettings in LightweightPipeline.cs
-real4 unity_LightIndicesOffsetAndCount;
-real4 unity_4LightIndices0;
-real4 unity_4LightIndices1;
-
 CBUFFER_END
 
 #if defined(UNITY_STEREO_MULTIVIEW_ENABLED) || ((defined(UNITY_SINGLE_PASS_STEREO) || defined(UNITY_STEREO_INSTANCING_ENABLED)) && (defined(SHADER_API_GLCORE) || defined(SHADER_API_GLES3) || defined(SHADER_API_METAL)))