Skip to content

[10.x.x] Screen Space Ambient Occlusion (Part 1) #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 78 commits into from
Closed

[10.x.x] Screen Space Ambient Occlusion (Part 1) #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
52d3777
Test scene
ellioman Mar 19, 2020
ad7ebe4
Initial commit of SSAO using only depth texture
ellioman Mar 19, 2020
53d12e7
Removing UV adjustments for VR when sampling the SSAO. Small cleanup …
ellioman Mar 19, 2020
554362e
Forgot to update PBRForwardPass
ellioman Mar 20, 2020
adde333
Removing the 8 Renderer limit in the URP Asset. Adding a new Renderer…
ellioman Mar 20, 2020
2a7d422
Making the _BaseMap texture in SSAO.hlsl be XR compatible
ellioman Mar 23, 2020
dc21270
Added quality option for normal reconstruction. Also some improvements.
ellioman Mar 24, 2020
801558e
Removing the SAMPLE_GI_SSAO and moving the calculations to Initialize…
ellioman Mar 24, 2020
1ddb090
Fixing a typo in the shaders.
ellioman Mar 24, 2020
0e7de0f
Adding SSAO Keywords to the Terrain shaders
ellioman Mar 24, 2020
bf3476d
Various fixes
ellioman Mar 25, 2020
1425853
Making sure we call SAMPLE_TEXTURE2D_X and not SAMPLE_TEXTURE2D
ellioman Mar 25, 2020
624a6a0
Moved the occlusion from being multiplied to baseGI to being used wit…
ellioman Mar 25, 2020
03bd021
SSAO now doesn't execute the passes if intensity is set to 0.0...
ellioman Mar 25, 2020
2c117d3
Minor cleanup
ellioman Mar 26, 2020
8a8eab2
DynamicResolutionSetter script
ellioman Mar 27, 2020
75c8f70
DynamicResolution script
ellioman Mar 27, 2020
7901ca5
Scene update
ellioman Mar 27, 2020
8de72c5
Fixing some VR defines, adding blur option and creating a test scene …
ellioman Mar 27, 2020
3456459
Adding _BLUR_ENABLED to all the occlusion passes
ellioman Mar 28, 2020
7ef67e3
Making SSAO work with orthographic cameras
ellioman Mar 29, 2020
5fcc8f2
Minor fixes and updating the test scenes
ellioman Mar 30, 2020
e895e29
Adjusting the test scenes so it displays AO on one half of the screen
ellioman Mar 30, 2020
8f96a80
Switched the cmd.Blit(...) calls to cmd.DrawMesh(...)
ellioman Mar 31, 2020
bfb52f2
Removing DynamicResSetter
ellioman Apr 1, 2020
577e0e1
Removing DynamicResSetter
ellioman Apr 1, 2020
681575b
Updating reference images and settings
ellioman Apr 1, 2020
d71f924
Made SSAO not run if radius is 0 or sample count 0 plus I did some sm…
ellioman Apr 1, 2020
eaa62b8
Removed GetScreenParams from core as it will be done in another PR
ellioman Apr 1, 2020
e0ba5cb
Merge branch 'master' into universal/feature/ssao-part-1
ellioman Apr 1, 2020
af3b17e
Tooltips, renaming downscale to downsampling, adjusting the sample co…
ellioman Apr 1, 2020
a5406f5
Removed the blur option and changed the random function.
ellioman Apr 1, 2020
f9c2ccb
Making the default sample count be 8 instead of 10
ellioman Apr 2, 2020
168430f
Merge branch 'master' into universal/feature/ssao-part-1
ellioman Apr 2, 2020
6ea1147
Override OnCameraCleanup() instead of FrameCleanup().
ellioman Apr 2, 2020
0e6bb1e
Changing ScreenSpaceAmbientOcclusionFeature to use OnCameraSetup inst…
ellioman Apr 2, 2020
d7e4eb9
Update Reference Images [Cancel Old CI]
ellioman Apr 2, 2020
d87beef
Merge branch 'master' into universal/feature/ssao-part-1
ellioman Apr 7, 2020
1b84eb5
Editor code fixes after discussion with Martin
ellioman Apr 7, 2020
dd036d6
Changes made after PR review comments
ellioman Apr 8, 2020
1037638
Hopefully fixing black slices in VR & Updating reference images
ellioman Apr 14, 2020
b6cc35f
Removing sqrt call and simplifying the SSAO code a little bit
ellioman Apr 15, 2020
ba7b1f3
Merge branch 'master' into universal/feature/ssao-part-1
ellioman Apr 30, 2020
387a898
Updating the test scenes [skip ci]
ellioman Apr 30, 2020
cf8be83
Fixing an issue with artifacts when downsampling was enabled plus oth…
ellioman May 8, 2020
0f2974a
Merge branch 'master' into universal/feature/ssao-part-1
ellioman May 8, 2020
3792b13
Fixing an error in WavingGrassPasses and ScreenSpaceAmbientOcclusionF…
ellioman May 8, 2020
b708ff7
Updating Stereo Reference Images [Cancel Old CI]
ellioman May 8, 2020
bcbe72e
Merge branch 'master' into universal/feature/ssao-part-1
ellioman May 8, 2020
2f262a2
Accidentally made the format be ARG64 instead of ARGB32.
ellioman May 8, 2020
b240809
Kawase Blur implemented
ellioman May 10, 2020
d12d136
Edited the UI tooltips.
oleks-k May 12, 2020
5ce67de
Merge branch 'master' into universal/feature/ssao-part-1
ellioman May 15, 2020
3e024c6
New workflow to align with HDRP plus some bugfixes
ellioman May 15, 2020
b4dd121
Merge branch 'master' into universal/feature/ssao-part-1
ellioman May 15, 2020
3287eee
Changing render texture format from 16 to 8.
ellioman May 18, 2020
548fffc
Making sure we don't force a depth prepass if SSAO feature is disable…
ellioman May 18, 2020
a01a113
Merge branch 'master' into universal/feature/ssao-part-1 [Skip CI]
ellioman May 18, 2020
915cacb
Various updates. Direct Lighting Strength added, removed all volume s…
ellioman Jun 2, 2020
3957e9b
Merge branch 'master' into universal/feature/ssao-part-1
ellioman Jun 2, 2020
e9c174e
Copying the test scene from URP Project to Stereo URP Project
ellioman Jun 2, 2020
7da876c
Reverting some unnecessary changes in this PR plus some minor fixes
ellioman Jun 2, 2020
aa1b1b2
More cleanup and minor fixes
ellioman Jun 2, 2020
ea322f5
Minor fix
ellioman Jun 3, 2020
784dacf
Increasing Timeout for Metal [Skip CI]
ellioman Jun 3, 2020
092e334
Removing SSAO from the WavingGrassBillboard
ellioman Jun 3, 2020
115d30c
Increasing timeout again
ellioman Jun 4, 2020
d0bab78
Updating test scenes, Reference Images & Image Comparison Settings
ellioman Jun 10, 2020
221b911
Merge branch 'master' into universal/feature/ssao-part-1
ellioman Jun 10, 2020
fcf1187
Reverting the timeout change to universal-osx-metal.yml
ellioman Jun 10, 2020
af15c98
Merge branch 'master' into universal/feature/ssao-part-1
ellioman Jun 11, 2020
389213f
Adding region around serialized properties in SSAO editor script [Ski…
ellioman Jun 11, 2020
30c829c
Increasing the timeout on OSX Metal from 1400-2000. [Skip CI]
ellioman Jun 11, 2020
7765c27
Increasing the timeout to 2400
ellioman Jun 11, 2020
0a83e3b
Changing Normal Samples to Normal Quality and removing the terrain fr…
ellioman Jun 11, 2020
2d4cb64
Fixing an issue with the blur pass in XR
ellioman Jun 12, 2020
4006919
Using Blue Noise in the SSAO
ellioman Jun 12, 2020
a9f156e
Update DepthRenderer so it has BlueNoise texture [Skip CI]
ellioman Jun 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .yamato/hdrp-osx-metal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ HDRP_OSX_Metal_Standalone_trunk:
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only'
- |5-

ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_RuntimeTests && ~/Graphics/TestProjects/HDRP_RuntimeTests/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results --timeout=1400'
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_RuntimeTests && ~/Graphics/TestProjects/HDRP_RuntimeTests/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results --timeout=2400'
UTR_RESULT=$?
mkdir -p TestProjects/HDRP_RuntimeTests/test-results/
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results/ TestProjects/HDRP_RuntimeTests/test-results/
Expand Down Expand Up @@ -218,7 +218,7 @@ HDRP_OSX_Metal_Standalone_fast-trunk:
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only'
- |5-

ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_RuntimeTests && ~/Graphics/TestProjects/HDRP_RuntimeTests/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results --timeout=1400'
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_RuntimeTests && ~/Graphics/TestProjects/HDRP_RuntimeTests/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results --timeout=2400'
UTR_RESULT=$?
mkdir -p TestProjects/HDRP_RuntimeTests/test-results/
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results/ TestProjects/HDRP_RuntimeTests/test-results/
Expand Down Expand Up @@ -334,7 +334,7 @@ HDRP_OSX_Metal_Standalone_CUSTOM-REVISION:
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only'
- |5-

ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_RuntimeTests && ~/Graphics/TestProjects/HDRP_RuntimeTests/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results --timeout=1400'
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_RuntimeTests && ~/Graphics/TestProjects/HDRP_RuntimeTests/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results --timeout=2400'
UTR_RESULT=$?
mkdir -p TestProjects/HDRP_RuntimeTests/test-results/
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_RuntimeTests/test-results/ TestProjects/HDRP_RuntimeTests/test-results/
Expand Down
6 changes: 3 additions & 3 deletions .yamato/hdrp_hybrid-osx-metal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ HDRP_Hybrid_OSX_Metal_Standalone_trunk:
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only'
- |5-

ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_HybridTests && ~/Graphics/TestProjects/HDRP_HybridTests/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --timeout=1400'
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_HybridTests && ~/Graphics/TestProjects/HDRP_HybridTests/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --timeout=2400'
UTR_RESULT=$?
mkdir -p TestProjects/HDRP_HybridTests/test-results/
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests/test-results/
Expand Down Expand Up @@ -162,7 +162,7 @@ HDRP_Hybrid_OSX_Metal_Standalone_fast-trunk:
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only'
- |5-

ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_HybridTests && ~/Graphics/TestProjects/HDRP_HybridTests/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --timeout=1400'
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_HybridTests && ~/Graphics/TestProjects/HDRP_HybridTests/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --timeout=2400'
UTR_RESULT=$?
mkdir -p TestProjects/HDRP_HybridTests/test-results/
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests/test-results/
Expand Down Expand Up @@ -249,7 +249,7 @@ HDRP_Hybrid_OSX_Metal_Standalone_CUSTOM-REVISION:
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only'
- |5-

ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_HybridTests && ~/Graphics/TestProjects/HDRP_HybridTests/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --timeout=1400'
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/HDRP_HybridTests && ~/Graphics/TestProjects/HDRP_HybridTests/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --timeout=2400'
UTR_RESULT=$?
mkdir -p TestProjects/HDRP_HybridTests/test-results/
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests/test-results/
Expand Down
2 changes: 1 addition & 1 deletion .yamato/ruamel/jobs/projects/commands/osx_metal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def cmd_standalone(project_folder, platform, api, test_platform_args):
base = _cmd_base(project_folder, platform["components"])
base.extend([
pss(f'''
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP \'cd ~/{REPOSITORY_NAME}/{TEST_PROJECTS_DIR}/{project_folder} && ~/{REPOSITORY_NAME}/{TEST_PROJECTS_DIR}/{project_folder}/utr/utr {test_platform_args}OSX --testproject=/Users/bokken/{REPOSITORY_NAME}/{TEST_PROJECTS_DIR}/{project_folder} --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/{REPOSITORY_NAME}/{TEST_PROJECTS_DIR}/{project_folder}/{PATH_TEST_RESULTS} --timeout=1400\'
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP \'cd ~/{REPOSITORY_NAME}/{TEST_PROJECTS_DIR}/{project_folder} && ~/{REPOSITORY_NAME}/{TEST_PROJECTS_DIR}/{project_folder}/utr/utr {test_platform_args}OSX --testproject=/Users/bokken/{REPOSITORY_NAME}/{TEST_PROJECTS_DIR}/{project_folder} --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/{REPOSITORY_NAME}/{TEST_PROJECTS_DIR}/{project_folder}/{PATH_TEST_RESULTS} --timeout=2400\'
UTR_RESULT=$?
mkdir -p {TEST_PROJECTS_DIR}/{project_folder}/{PATH_TEST_RESULTS}/
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/{REPOSITORY_NAME}/{TEST_PROJECTS_DIR}/{project_folder}/{PATH_TEST_RESULTS}/ {TEST_PROJECTS_DIR}/{project_folder}/{PATH_TEST_RESULTS}/
Expand Down
6 changes: 3 additions & 3 deletions .yamato/shadergraph-osx-metal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ShaderGraph_OSX_Metal_Standalone_trunk:
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only'
- |5-

ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --timeout=1400'
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --timeout=2400'
UTR_RESULT=$?
mkdir -p TestProjects/ShaderGraph/test-results/
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/
Expand Down Expand Up @@ -106,7 +106,7 @@ ShaderGraph_OSX_Metal_Standalone_fast-trunk:
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only'
- |5-

ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --timeout=1400'
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --timeout=2400'
UTR_RESULT=$?
mkdir -p TestProjects/ShaderGraph/test-results/
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/
Expand Down Expand Up @@ -191,7 +191,7 @@ ShaderGraph_OSX_Metal_Standalone_CUSTOM-REVISION:
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only'
- |5-

ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --timeout=1400'
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/ShaderGraph && ~/Graphics/TestProjects/ShaderGraph/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/ShaderGraph --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results --timeout=2400'
UTR_RESULT=$?
mkdir -p TestProjects/ShaderGraph/test-results/
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/ShaderGraph/test-results/ TestProjects/ShaderGraph/test-results/
Expand Down
6 changes: 3 additions & 3 deletions .yamato/universal-osx-metal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Universal_OSX_Metal_Standalone_trunk:
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only'
- |5-

ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --timeout=1400'
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --timeout=2400'
UTR_RESULT=$?
mkdir -p TestProjects/UniversalGraphicsTest/test-results/
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results/ TestProjects/UniversalGraphicsTest/test-results/
Expand Down Expand Up @@ -134,7 +134,7 @@ Universal_OSX_Metal_Standalone_fast-trunk:
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only'
- |5-

ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --timeout=1400'
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --timeout=2400'
UTR_RESULT=$?
mkdir -p TestProjects/UniversalGraphicsTest/test-results/
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results/ TestProjects/UniversalGraphicsTest/test-results/
Expand Down Expand Up @@ -247,7 +247,7 @@ Universal_OSX_Metal_Standalone_CUSTOM-REVISION:
- ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '/Users/bokken/Library/Python/3.7/bin/unity-downloader-cli --source-file ~/Graphics/unity_revision.txt -c editor -c il2cpp --wait --published-only'
- |5-

ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --timeout=1400'
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP 'cd ~/Graphics/TestProjects/UniversalGraphicsTest && ~/Graphics/TestProjects/UniversalGraphicsTest/utr/utr --suite=playmode --platform=StandaloneOSX --testproject=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest --editor-location=/Users/bokken/.Editor --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results --timeout=2400'
UTR_RESULT=$?
mkdir -p TestProjects/UniversalGraphicsTest/test-results/
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalGraphicsTest/test-results/ TestProjects/UniversalGraphicsTest/test-results/
Expand Down
Loading