浏览代码

Merge branch 'metal' of github.com:Unity-Technologies/ScriptableRenderLoop into metal

/main
Antti Tapaninen 8 年前
当前提交
42af929e
共有 9 个文件被更改,包括 24 次插入28 次删除
  1. 2
      Assets/BasicRenderPipelineTutorial.meta
  2. 2
      Assets/ScriptableRenderPipeline/common.meta
  3. 2
      Assets/ScriptableRenderPipeline/common/ShaderBase.h
  4. 2
      Assets/ScriptableRenderPipeline/common/TextureCache.cs
  5. 2
      Assets/ScriptableRenderPipeline/fptl.meta
  6. 2
      Assets/ScriptableRenderPipeline/fptl/FPTLRenderPipeline.asset
  7. 20
      ProjectSettings/EditorBuildSettings.asset
  8. 3
      ProjectSettings/GraphicsSettings.asset
  9. 17
      ProjectSettings/ProjectSettings.asset

2
Assets/BasicRenderPipelineTutorial.meta


fileFormatVersion: 2
guid: 129d9c5b5ed1a6147a8bc74f844e4d2e
guid: 4b0281d4b3a724c708cccfceecaf5d06
folderAsset: yes
timeCreated: 1478093341
licenseType: Pro

2
Assets/ScriptableRenderPipeline/common.meta


fileFormatVersion: 2
guid: 88c7531cefb4c7043bcfda092215f20c
guid: 821e9f1a4c41b47c0bc28c297ef12b13
folderAsset: yes
timeCreated: 1467917164
licenseType: Pro

2
Assets/ScriptableRenderPipeline/common/ShaderBase.h


return half2( 1.0-0.5*recipPi*atan2(dir.x, -dir.z), asin(dir.y)*recipPi+0.5 );
}
#define CUBE_ARRAY_NOT_SUPPORTED
#ifdef CUBE_ARRAY_NOT_SUPPORTED
#define UNITY_DECLARE_ABSTRACT_CUBE_ARRAY UNITY_DECLARE_TEX2DARRAY
#define UNITY_PASS_ABSTRACT_CUBE_ARRAY UNITY_PASS_TEX2DARRAY

2
Assets/ScriptableRenderPipeline/common/TextureCache.cs


// alternative panorama path intended for mobile
// the member variables below are only in use when m_IsNoCubeArray is true.
private bool m_IsNoCubeArray = false;
private bool m_IsNoCubeArray = true;
private Texture2DArray m_CacheNoCubeArray;
private RenderTexture[] m_StagingRTs;
private int m_NumPanoMipLevels;

2
Assets/ScriptableRenderPipeline/fptl.meta


fileFormatVersion: 2
guid: 4ae727bb0a95bdf4aada784867082de5
guid: 0d8fe981ab02d41cbac3e4f01428a661
folderAsset: yes
timeCreated: 1467916766
licenseType: Pro

2
Assets/ScriptableRenderPipeline/fptl/FPTLRenderPipeline.asset


type: 3}
buildScreenAABBShader: {fileID: 7200000, guid: e7a739144e735934b89a42a4b9d9e23c,
type: 3}
buildPerTileLightListShader: {fileID: 7200000, guid: f54ef7cb596a714488693ef9cdaf63fb,
buildPerTileLightListShader: {fileID: 7200000, guid: 6b1c9f74123904a5bba79a11d6f48893,
type: 3}
buildPerBigTileLightListShader: {fileID: 7200000, guid: b5507a2ffdae8a84f94211c10d428920,
type: 3}

20
ProjectSettings/EditorBuildSettings.asset


%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1045 &1
EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes: []
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1045 &1
EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes:
- enabled: 0
path: Assets/TestScenes/FPTL/FPTL.unity
guid: ac502c5271c0a254b8a18fbe4b8a3bf1
- enabled: 1
path: Assets/TestScenes/Big/BenchRenderVikingVillageStatic/renderloopTest.unity
guid: 97926ffe68fa77947be0d1979ec2fc73

3
ProjectSettings/GraphicsSettings.asset


- {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 4800000, guid: 595434cc3b6405246b6cd3086d0b6f7d, type: 3}
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
m_CustomRenderPipeline: {fileID: 11400000, guid: e185fecca3c73cd47a09f1092663ef32,
m_CustomRenderPipeline: {fileID: 11400000, guid: 9654ae26e66cbee45b8d2a4f8cac0ceb,
type: 2}
m_TransparencySortMode: 0
m_TransparencySortAxis: {x: 0, y: 0, z: 1}

17
ProjectSettings/ProjectSettings.asset


targetDevice: 2
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: DefaultCompany
companyName: Unity
productName: dev
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}

xboxEnableFitness: 0
visibleInBackground: 1
allowFullscreenSwitch: 1
graphicsJobMode: 0
macFullscreenMode: 2
d3d9FullscreenMode: 1
d3d11FullscreenMode: 1

Android: com.Company.ProductName
Standalone: unity.DefaultCompany.dev
Tizen: com.Company.ProductName
iOS: com.Company.ProductName
iOS: com.Unity.VV
tvOS: com.Company.ProductName
buildNumber:
iOS: 0

iOSBackgroundModes: 0
iOSMetalForceHardShadows: 0
metalEditorSupport: 1
metalAPIValidation: 1
metalAPIValidation: 0
appleDeveloperTeamID:
iOSManualSigningProvisioningProfileID:
tvOSManualSigningProvisioningProfileID:

switchParentalControl: 0
switchAllowsScreenshot: 1
switchDataLossConfirmation: 0
XboxTitleId:
XboxImageXexPath:
XboxSpaPath:
XboxGenerateSpa: 0
XboxDeployKinectResources: 0
XboxSplashScreen: {fileID: 0}
xboxEnableSpeech: 0
xboxAdditionalTitleMemorySize: 0
xboxDeployKinectHeadOrientation: 0
xboxDeployKinectHeadPosition: 0
ps4NPAgeRating: 12
ps4NPTitleSecret:
ps4NPTrophyPackPath:

正在加载...
取消
保存