Merge HDRP/staging into shader stack branch

.yamato/upm-ci-hdrp.yml

@@ -236,7 +236,12 @@ All_{{ project.name }}_{{ editor.version }}:
     {% elsif win_api.name == "DX12" and testplatform.name == "editmode" %}
     #skip - not needed, cover by dx11	
     {% else %}
-    - .yamato/upm-ci-{{ project.name | downcase }}.yml#{{ project.name }}_{{ platform.name }}_{{ win_api.name }}_{{ testplatform.name }}_{{ editor.version }}
+      - path: .yamato/upm-ci-{{ project.name | downcase }}.yml#{{ project.name }}_{{ platform.name }}_{{ win_api.name }}_{{ testplatform.name }}_{{ editor.version }}
+        rerun: {{ editor.rerun_strategy }}    
+      {% if win_api.name == "DX12" and testplatform.name == "playmode" %}
+      - path: .yamato/upm-ci-hdrp_dxr.yml#HDRP_DXR_Win_DX12_playmode_{{ editor.version }}
+        rerun: {{ editor.rerun_strategy }}
+      {% endif %}
     {% endif %}
   {% endfor %}
 

.yamato/upm-ci-hdrp_dxr.yml

@@ -1,22 +1,23 @@
 editors:
   - version: 2020.1
+    rerun_strategy: on-new-revision
   - version: fast-2020.1
+    rerun_strategy: on-new-revision
   - version: trunk
+    rerun_strategy: on-new-revision
   - version: fast-trunk
+    rerun_strategy: on-new-revision
+  - version: CUSTOM-REVISION
+    rerun_strategy: always
 platforms:
   - name: Win
     os: windows
     type: Unity::VM::GPU
-    image: sdet/gamecode_win10:stable
+    image: graphics-foundation/win10-dxr:latest
     flavor: b1.large
     components:
       - editor
       - il2cpp
-#  - name: Linux
-#    type: Unity::VM::GPU
-#    image: cds-ops/ubuntu-18.04-base:stable
-#    flavor: b1.large
-# Not sure if Linux supports DXR
 testplatforms:
   - name: Standalone
     args: --suite=playmode --platform=Standalone
@@ -28,20 +29,73 @@ projects:
 win_apis:
   - name: DX12
     cmd: -force-d3d12
-#linux_apis:
-#  - name: OpenGLCore
-#    cmd: -force-glcore
-#  - name: Vulkan
-#    cmd: -force-vulkan
 ---
 {% for project in projects %}
 {% for editor in editors %}
 {% for platform in platforms %}
 
-{% if platform.name == "Win" %}
-
 {% for testplatform in testplatforms %}
 {% for win_api in win_apis %}
+
+{% if testplatform.name == "Standalone" %}
+{{ project.name }}_Win_{{ win_api.name }}_{{ testplatform.name }}_{{ editor.version }}:
+  name : Test {{ project.name }} on Win_{{ win_api.name }}_{{ testplatform.name }} on version {{ editor.version }}
+  agent:
+    flavor: b1.large
+    type: Unity::VM::GPU
+    model: rtx2080
+    image: graphics-foundation/win10-dxr:latest
+  skip_checkout: true
+  variables:
+    UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+    {% if editor.version == 'CUSTOM-REVISION' %}
+    CUSTOM_REVISION: custom_revision_not_set
+    {% endif %}
+  commands:
+    - git clone git@github.cds.internal.unity3d.com:unity/utr.git  TestProjects/{{ project.folder }}/utr
+
+    - cd TestProjects/{{ project.folder }} && utr\utr {{ testplatform.args }}Windows64 --artifacts_path=test-results --timeout=1200 --player-load-path=../../players --player-connection-ip=auto
+  artifacts:
+    logs:
+      paths:
+        - "**/test-results/**"
+  dependencies:
+    - path: .yamato/z_editor.yml#editor:priming:{{ editor.version }}:{{ platform.os }}
+      rerun: {{ editor.rerun_strategy }}
+    - path: .yamato/upm-ci-{{ project.name | downcase }}.yml#Build_{{ project.name }}_Win_{{ win_api.name }}_Player_{{ editor.version }}
+      rerun: {{ editor.rerun_strategy }}
+
+Build_{{ project.name }}_Win_{{ win_api.name }}_Player_{{ editor.version }}:
+  name : Build {{ project.name }} on Win_{{ win_api.name }}_Player on version {{ editor.version }}
+  agent:
+    flavor: b1.xlarge
+    type: Unity::VM
+    image: graphics-foundation/win10-dxr:latest
+  variables:
+    UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+    {% if editor.version == 'CUSTOM-REVISION' %}
+    CUSTOM_REVISION: custom_revision_not_set
+    {% endif %}
+  commands:
+    - git clone git@github.cds.internal.unity3d.com:unity/utr.git  TestProjects/{{ project.folder }}/utr
+    - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple
+
+    - cd TestProjects/{{ project.folder }} && unity-downloader-cli --source-file ../../unity_revision.txt {% for component in platform.components %}-c {{ component }} {% endfor %}--wait --published-only
+
+    - cd TestProjects/{{ project.folder }} && utr\utr {{ testplatform.args }}Windows64 --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildWindows{{ win_api.name }}Linear" --testproject=. --editor-location=.Editor --artifacts_path=test-results --timeout=1200 --player-save-path=../../players --build-only
+  dependencies:
+    - path: .yamato/z_editor.yml#editor:priming:{{ editor.version }}:{{ platform.os }}
+      rerun: {{ editor.rerun_strategy }}
+  artifacts:
+    logs:
+      paths:
+        - "**/test-results/**"
+    players:
+      paths:
+        - "players/**"
+
+{% else %}
+
 {{ project.name }}_Win_{{ win_api.name }}_{{ testplatform.name }}_{{ editor.version }}:
   name : {{ project.name }} on Win_{{ testplatform.name }}_{{ win_api.name }} on version {{ editor.version }}
   agent:
@@ -51,32 +105,30 @@ win_apis:
     flavor: {{ platform.flavor}}
   variables:
     UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+    {% if editor.version == 'CUSTOM-REVISION' %}
+    CUSTOM_REVISION: custom_revision_not_set
+    {% endif %}
   commands:
     - git clone git@github.cds.internal.unity3d.com:unity/utr.git TestProjects/{{ project.folder }}/utr
     - pip install unity-downloader-cli --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
     - cd TestProjects/{{ project.folder }} && unity-downloader-cli --source-file ../../unity_revision.txt {% for component in platform.components %}-c {{ component }} {% endfor %}--wait --published-only    
 
-    {% if testplatform.name == "Standalone" %}
-    - cd TestProjects/{{ project.folder }} && utr\utr {{ testplatform.args }}Windows64 --extra-editor-arg="-executemethod" --extra-editor-arg="CustomBuild.BuildWindows{{ win_api.name }}Linear" --testproject=. --editor-location=.Editor --artifacts_path=upm-ci~/test-results --timeout=1200
-    {% else %}
     - cd TestProjects/{{ project.folder }} && utr\utr {{ testplatform.args }} --extra-editor-arg="{{ win_api.cmd }}" --testproject=. --editor-location=.Editor --artifacts_path=upm-ci~/test-results
-    {% endif %}
   dependencies:
     - .yamato/z_editor.yml#editor:priming:{{ editor.version }}:{{ platform.os }}
   artifacts:
     logs:
       paths:
         - "**/test-results/**"
-{% endfor %}    
-{% endfor %}
 
-{% endif %}
+{% endif %} # standalone
+{% endfor %} # win api  
+{% endfor %} # testplatform
 
-{% endfor %}
-{% endfor %}
+{% endfor %} # platform
 
-All_{{ project.name }}:
-  name: All {{ project.name }} CI
+All_{{ project.name }}_{{ editor.version }}:
+  name: All {{ project.name }} CI - {{ editor.version }}
   agent:
     type: Unity::VM
     image: cds-ops/ubuntu-18.04-agent:stable
@@ -91,9 +143,10 @@ All_{{ project.name }}:
   {% for platform in platforms %}
   {% for testplatform in testplatforms %}
   {% for win_api in win_apis %}
-    - .yamato/upm-ci-{{ project.name | downcase }}.yml#{{ project.name }}_Win_{{ win_api.name }}_{{ testplatform.name }}_trunk
+    - .yamato/upm-ci-{{ project.name | downcase }}.yml#{{ project.name }}_Win_{{ win_api.name }}_{{ testplatform.name }}_{{ editor.version }}
   {% endfor %}
   {% endfor %}
   {% endfor %}
 
-{% endfor %}
+{% endfor %} #project
+{% endfor %} # editor

TestProjects/HDRP_DXR_Tests/Assets/Common/HDRenderPipelineAssetDeferred.asset

@@ -159,7 +159,7 @@ MonoBehaviour:
   m_RenderingPathDefaultCameraFrameSettings:
     bitDatas:
       data1: 136268574097245
-      data2: 4539628425396027392
+      data2: 4539628428617252864
     lodBias: 1
     lodBiasMode: 0
     lodBiasQualityLevel: 0
@@ -201,15 +201,15 @@ MonoBehaviour:
   m_RenderPipelineSettings:
     supportShadowMask: 1
     supportSSR: 1
-    supportSSRTransparent: 0
+    supportSSRTransparent: 1
     supportSSAO: 1
+    supportSSGI: 1
     supportSubsurfaceScattering: 1
     sssSampleBudget:
       m_Values: 140000002800000050000000
       m_SchemaId:
         m_Id: With3Levels
     supportVolumetrics: 1
-    increaseResolutionOfVolumetrics: 0
     supportLightLayers: 0
     lightLayerName0: Light Layer default
     lightLayerName1: Light Layer 1
@@ -235,6 +235,7 @@ MonoBehaviour:
     supportTerrainHole: 0
     supportProbeVolume: 0
     supportRayTracing: 1
+    supportedRayTracingMode: 3
     probeVolumeSettings:
       atlasWidth: 128
       atlasHeight: 128
@@ -248,9 +249,9 @@ MonoBehaviour:
       cubeCookieTexArraySize: 16
       cookieAtlasLastValidMip: 0
       cookieTexArraySize: 16
-      planarReflectionAtlasSize: 8192
+      planarReflectionAtlasSize: 1024
       reflectionProbeCacheSize: 64
-      reflectionCubemapSize: 256
+      reflectionCubemapSize: 128
       reflectionCacheCompressed: 0
       planarReflectionCacheCompressed: 0
       skyReflectionSize: 256
@@ -261,7 +262,7 @@ MonoBehaviour:
       maxDirectionalLightsOnScreen: 16
       maxPunctualLightsOnScreen: 512
       maxAreaLightsOnScreen: 64
-      maxEnvLightsOnScreen: 64
+      maxEnvLightsOnScreen: 32
       maxDecalsOnScreen: 512
       maxPlanarReflectionOnScreen: 16
     hdShadowInitParams:

TestProjects/HDRP_DXR_Tests/Assets/Common/HDRenderPipelineAssetForward.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0cf1dab834d4ec34195b920ea7bbf9ec, type: 3}
   m_Name: HDRenderPipelineAssetForward
   m_EditorClassIdentifier: 
-  m_Version: 14
+  m_Version: 15
   m_ObsoleteFrameSettings:
     overrides: 0
     enableShadow: 0
@@ -157,45 +157,58 @@ MonoBehaviour:
   m_DefaultLookDevProfile: {fileID: 0}
   m_RenderingPathDefaultCameraFrameSettings:
     bitDatas:
-      data1: 65899829919581
+      data1: 136268574097245
       data2: 4539628425396027392
     lodBias: 1
     lodBiasMode: 0
     lodBiasQualityLevel: 0
     maximumLODLevel: 0
     maximumLODLevelMode: 0
     maximumLODLevelQualityLevel: 0
+    sssQualityMode: 0
+    sssQualityLevel: 0
+    sssCustomSampleBudget: 20
     materialQuality: 0
   m_RenderingPathDefaultBakedOrCustomReflectionFrameSettings:
     bitDatas:
-      data1: 69344385302301
+      data1: 139713129479965
       data2: 4539628424389459968
     lodBias: 1
     lodBiasMode: 0
     lodBiasQualityLevel: 0
     maximumLODLevel: 0
     maximumLODLevelMode: 0
     maximumLODLevelQualityLevel: 0
+    sssQualityMode: 0
+    sssQualityLevel: 0
+    sssCustomSampleBudget: 20
     materialQuality: 0
   m_RenderingPathDefaultRealtimeReflectionFrameSettings:
     bitDatas:
-      data1: 69696415080221
+      data1: 140065159257885
       data2: 4539628424389459968
     lodBias: 1
     lodBiasMode: 0
     lodBiasQualityLevel: 0
     maximumLODLevel: 0
     maximumLODLevelMode: 0
     maximumLODLevelQualityLevel: 0
+    sssQualityMode: 0
+    sssQualityLevel: 0
+    sssCustomSampleBudget: 20
     materialQuality: 0
   m_RenderPipelineSettings:
     supportShadowMask: 1
     supportSSR: 1
+    supportSSRTransparent: 0
     supportSSAO: 1
+    supportSSGI: 1
     supportSubsurfaceScattering: 1
-    increaseSssSampleCount: 0
+    sssSampleBudget:
+      m_Values: 140000002800000050000000
+      m_SchemaId:
+        m_Id: With3Levels
     supportVolumetrics: 1
-    increaseResolutionOfVolumetrics: 0
     supportLightLayers: 0
     lightLayerName0: Light Layer default
     lightLayerName1: Light Layer 1
@@ -219,17 +232,25 @@ MonoBehaviour:
     supportRuntimeDebugDisplay: 1
     supportDitheringCrossFade: 1
     supportTerrainHole: 0
+    supportProbeVolume: 0
     supportRayTracing: 1
+    supportedRayTracingMode: 3
+    probeVolumeSettings:
+      atlasWidth: 128
+      atlasHeight: 128
+      atlasDepth: 512
+      atlasOctahedralDepthWidth: 2048
+      atlasOctahedralDepthHeight: 2048
     lightLoopSettings:
       cookieAtlasSize: 2048
       cookieFormat: 74
       pointCookieSize: 128
       cubeCookieTexArraySize: 16
       cookieAtlasLastValidMip: 0
       cookieTexArraySize: 16
-      planarReflectionAtlasSize: 8192
+      planarReflectionAtlasSize: 1024
       reflectionProbeCacheSize: 64
-      reflectionCubemapSize: 256
+      reflectionCubemapSize: 128
       reflectionCacheCompressed: 0
       planarReflectionCacheCompressed: 0
       skyReflectionSize: 256
@@ -240,7 +261,7 @@ MonoBehaviour:
       maxDirectionalLightsOnScreen: 16
       maxPunctualLightsOnScreen: 512
       maxAreaLightsOnScreen: 64
-      maxEnvLightsOnScreen: 64
+      maxEnvLightsOnScreen: 32
       maxDecalsOnScreen: 512
       maxPlanarReflectionOnScreen: 16
     hdShadowInitParams:
@@ -297,6 +318,7 @@ MonoBehaviour:
     xrSettings:
       singlePass: 1
       occlusionMesh: 1
+      cameraJitter: 0
     postProcessQualitySettings:
       NearBlurSampleCount: 030000000500000008000000
       NearBlurMaxRadius:
@@ -338,6 +360,18 @@ MonoBehaviour:
       AODirectionCount: 010000000200000004000000
       ContactShadowSampleCount: 060000000a00000010000000
       SSRMaxRaySteps: 100000002000000040000000
+      SSGIRaySteps: 100000002000000040000000
+      SSGIResolution: 000101
+      SSGIRadius:
+      - 2
+      - 3
+      - 10
+      SSGIFullResolution: 000101
+      SSGIClampValue:
+      - 2
+      - 2
+      - 3
+      SSGIFilterRadius: 020000000300000004000000
   allowShaderVariantStripping: 1
   enableSRPBatcher: 1
   shaderVariantLogLevel: 0