浏览代码

HDRenderLoop : Fix after merge

/main
sebastienlagarde 8 年前
当前提交
5e5b4fcb
共有 2 个文件被更改,包括 1 次插入13 次删除
  1. 2
      Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Material/Material.hlsl
  2. 12
      Assets/ScriptableRenderLoop/ShaderLibrary/Common.hlsl

2
Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Material/Material.hlsl


#include "Assets/ScriptableRenderLoop/ShaderLibrary/CommonLighting.hlsl"
#include "Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Shaderconfig.cs"
#include "Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/LightDefinition.cs"
#include "Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/LightDefinition.cs.hlsl"
//-----------------------------------------------------------------------------
// Parametrization function helpers

12
Assets/ScriptableRenderLoop/ShaderLibrary/Common.hlsl


#endif
#include "API/Validate.hlsl"
// ----------------------------------------------------------------------------
// Common define allowing to include shared file between C# and hlsl
// ----------------------------------------------------------------------------
#define __HLSL 1
#define public
#define Vec2 float2
#define Vec3 float3
#define Vec4 float4
#define Mat44 float4x4
// ----------------------------------------------------------------------------
// Common math definition and fastmath function
// ----------------------------------------------------------------------------

正在加载...
取消
保存