浏览代码

HDRenderPipeline: Fix PS4 compilation + Fix test scene SSS

- PS4 compiler doesn't support ";;", need to replace with ";"
- Fix missing prefab in test
/Branch_Batching2
sebastienlagarde 8 年前
当前提交
25cb78a1
共有 2 个文件被更改,包括 2 次插入100 次删除
  1. 4
      Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
  2. 98
      Assets/TestScenes/HDTest/HDRenderLoopTest.unity

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


#else // LAYERED_LIT_SHADER
// Set of users variables
#define PROP_DECL(type, name) type name, name##0, name##1, name##2, name##3;
#define PROP_DECL(type, name) type name, name##0, name##1, name##2, name##3
// sampler are share by texture type inside a layered material but we need to support that a particualr layer have no texture, so we take the first sampler of available texture as the share one
// mean we must declare all sampler
#define PROP_DECL_TEX2D(name)\

TEXTURE2D(MERGE_NAME(name, 2)); \
SAMPLER2D(MERGE_NAME(MERGE_NAME(sampler, name), 2)); \
TEXTURE2D(MERGE_NAME(name, 3)); \
SAMPLER2D(MERGE_NAME(MERGE_NAME(sampler, name), 3));
SAMPLER2D(MERGE_NAME(MERGE_NAME(sampler, name), 3))
// Set of users variables
PROP_DECL(float4, _BaseColor);

98
Assets/TestScenes/HDTest/HDRenderLoopTest.unity


m_UseColorTemperature: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!1001 &1159917811
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 500408927}
m_Modifications:
- target: {fileID: 400026, guid: 2b46db496f27398459cf881becf5763a, type: 3}
propertyPath: m_LocalPosition.x
value: 2.68
objectReference: {fileID: 0}
- target: {fileID: 400026, guid: 2b46db496f27398459cf881becf5763a, type: 3}
propertyPath: m_LocalPosition.y
value: 2.267
objectReference: {fileID: 0}
- target: {fileID: 400026, guid: 2b46db496f27398459cf881becf5763a, type: 3}
propertyPath: m_LocalPosition.z
value: 1.17
objectReference: {fileID: 0}
- target: {fileID: 400026, guid: 2b46db496f27398459cf881becf5763a, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 400026, guid: 2b46db496f27398459cf881becf5763a, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 400026, guid: 2b46db496f27398459cf881becf5763a, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 400026, guid: 2b46db496f27398459cf881becf5763a, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 400026, guid: 2b46db496f27398459cf881becf5763a, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2300020, guid: 2b46db496f27398459cf881becf5763a, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
- target: {fileID: 2300006, guid: 2b46db496f27398459cf881becf5763a, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
- target: {fileID: 2300022, guid: 2b46db496f27398459cf881becf5763a, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
- target: {fileID: 2300024, guid: 2b46db496f27398459cf881becf5763a, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
- target: {fileID: 2300000, guid: 2b46db496f27398459cf881becf5763a, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
- target: {fileID: 2300002, guid: 2b46db496f27398459cf881becf5763a, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
- target: {fileID: 2300004, guid: 2b46db496f27398459cf881becf5763a, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
- target: {fileID: 2300008, guid: 2b46db496f27398459cf881becf5763a, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
- target: {fileID: 2300010, guid: 2b46db496f27398459cf881becf5763a, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
- target: {fileID: 2300012, guid: 2b46db496f27398459cf881becf5763a, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
- target: {fileID: 2300014, guid: 2b46db496f27398459cf881becf5763a, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
- target: {fileID: 2300016, guid: 2b46db496f27398459cf881becf5763a, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
- target: {fileID: 2300018, guid: 2b46db496f27398459cf881becf5763a, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 70d048a3453cc5b4183269db4555c8e7, type: 2}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 2b46db496f27398459cf881becf5763a, type: 3}
m_IsPrefabParent: 0
--- !u!4 &1159917812 stripped
Transform:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 1159917811}
--- !u!1 &1161056796
GameObject:
m_ObjectHideFlags: 0

正在加载...
取消
保存