Merge pull request #311 from Unity-Technologies/Branch_FixPS4_CB_Layout

Fixed various over uniforms in Constant Buffers

Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.hlsl

 
 #include "TilePass.cs.hlsl"
 
-// For FPTL
-uint _NumTileFtplX;
-uint _NumTileFtplY;
-
+
+CBUFFER_START(UnityTilePass)
+uint _NumTileFtplX;
+uint _NumTileFtplY;
 
 // these uniforms are only needed for when OPAQUES_ONLY is NOT defined
 // but there's a problem with our front-end compilation of compute shaders with multiple kernels causing it to error
 //#ifdef USE_CLUSTERED_LIGHTLIST
 uint _NumTileClusteredX;
 uint _NumTileClusteredY;
+CBUFFER_END
+
 StructuredBuffer<uint> g_vLayeredOffsetsBuffer;     // don't support Buffer yet in unity
 StructuredBuffer<float> g_logBaseBuffer;            // don't support Buffer yet in unity
 //#endif

Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/lightlistbuild-clustered.compute

 #define PERFORM_SPHERICAL_INTERSECTION_TESTS
 #define CONV_HULL_TEST_ENABLED
 
-uniform int g_iNrVisibLights;
-uniform float4x4 g_mInvScrProjection;
-uniform float4x4 g_mScrProjection;
-uniform int _EnvLightIndexShift;
+CBUFFER_START(UnityLightListClustered)
+int g_iNrVisibLights;
+float4x4 g_mInvScrProjection;
+float4x4 g_mScrProjection;
+int _EnvLightIndexShift;
-uniform float g_fClustScale;
-uniform float g_fClustBase;
-uniform float g_fNearPlane;
-uniform float g_fFarPlane;
-uniform int	  g_iLog2NumClusters;		// numClusters = (1<<g_iLog2NumClusters)
+float g_fClustScale;
+float g_fClustBase;
+float g_fNearPlane;
+float g_fFarPlane;
+int	  g_iLog2NumClusters;		// numClusters = (1<<g_iLog2NumClusters)
+CBUFFER_END
 
 #include "ClusteredUtils.hlsl"
 

Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/materialflags.compute

 #define USE_MATERIAL_FEATURE_FLAGS
 #define NR_THREADS	64
 
-uniform uint2 g_viDimensions;
+CBUFFER_START(UnityMaterialFlags)
+uint2 g_viDimensions;
+uint g_BaseFeatureFlags;
+CBUFFER_END
-uniform uint g_BaseFeatureFlags;
 
 DECLARE_GBUFFER_TEXTURE(_GBufferTexture);
 

Assets/ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/shadeopaque.compute

     RWTexture2D<float4> combinedLightingUAV;
 #endif
 
+CBUFFER_START(UnityShadeOpaque)
+	uint g_TileListOffset;
+CBUFFER_END
+
-	uint g_TileListOffset;
     StructuredBuffer<uint> g_TileList;
 // Indirect
 [numthreads(16, 16, 1)]

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.hlsl

 #define SSS_WRAP_ANGLE (PI/12)              // Used for wrap lighting
 #define SSS_WRAP_LIGHT cos(PI/2 - SSS_WRAP_ANGLE)
 
+CBUFFER_START(UnitySSSParameters)
 uint   _EnableSSSAndTransmission;           // Globally toggles subsurface and transmission scattering on/off
 uint   _TexturingModeFlags;                 // 1 bit/profile; 0 = PreAndPostScatter, 1 = PostScatter
 uint   _TransmissionFlags;                  // 2 bit/profile; 0 = inf. thick, 1 = thin, 2 = regular
+CBUFFER_END
 
 //-----------------------------------------------------------------------------
 // Helper functions/variable specific to this material