diff --git a/.repoconfig b/.repoconfig index d3c8240d50f..8f62b34d7e9 100644 --- a/.repoconfig +++ b/.repoconfig @@ -22,14 +22,12 @@ path-ignore=< - .yamato/all-lightmapping.yml#Lightmapping_ - .yamato/all-postprocessing.yml#PostProcessing_ + - .yamato/all-batchrenderergroup.yml#BatchRendererGroup_ - #General_Checks_ triggers: recurring: diff --git a/.yamato/config/batchrenderergroup.metafile b/.yamato/config/batchrenderergroup.metafile new file mode 100644 index 00000000000..c4c016d9d83 --- /dev/null +++ b/.yamato/config/batchrenderergroup.metafile @@ -0,0 +1,16 @@ +project: + name: BatchRendererGroup + +jobs: + - name: + dependencies: + - #PR__ + - #Extra__ + - name: PR + dependencies: + - .yamato/all-universal_batchrenderergroup.yml#PR_Universal_BatchRendererGroup_ + - .yamato/all-hdrp_batchrenderergroup.yml#PR_HDRP_BatchRendererGroup_ + - name: Extra + dependencies: + - .yamato/all-universal_batchrenderergroup.yml#Extra_Universal_BatchRendererGroup_ + - .yamato/all-hdrp_batchrenderergroup.yml#Extra_HDRP_BatchRendererGroup_ diff --git a/.yamato/config/hdrp.metafile b/.yamato/config/hdrp.metafile index eb2c70b5497..23ff1d35aaa 100644 --- a/.yamato/config/hdrp.metafile +++ b/.yamato/config/hdrp.metafile @@ -133,7 +133,6 @@ jobs: - playmode - Standalone - .yamato/all-hdrp_dxr.yml#PR_HDRP_DXR_ - # - .yamato/all-hdrp_hybrid.yml#PR_HDRP_Hybrid_ - .yamato/all-vfx_hdrp.yml#PR_VFX_HDRP_ - .yamato/_abv.yml#General_Checks_ - name: Extra @@ -177,6 +176,6 @@ jobs: - name: Nightly dependencies: - .yamato/all-hdrp_performancetests.yml#HDRP_PerformanceTests_ -# - .yamato/all-hdrp_hybrid.yml#HDRP_Hybrid_ + #- .yamato/all-hdrp_BatchRendererGroup.yml#HDRP_BatchRendererGroup_ - .yamato/all-hdrp_dxr.yml#HDRP_DXR_ - .yamato/all-hdrp.yml#HDRP_ diff --git a/.yamato/config/hdrp_hybrid.metafile b/.yamato/config/hdrp_batchrenderergroup.metafile similarity index 71% rename from .yamato/config/hdrp_hybrid.metafile rename to .yamato/config/hdrp_batchrenderergroup.metafile index 4c193aa04d4..a0dac224e0c 100644 --- a/.yamato/config/hdrp_hybrid.metafile +++ b/.yamato/config/hdrp_batchrenderergroup.metafile @@ -1,6 +1,6 @@ project: - name: HDRP_Hybrid - folder: HDRP_HybridTests + name: HDRP_BatchRendererGroup + folder: BatchRendererGroup_HDRP test_platforms: - type: playmode utr_flags: @@ -60,10 +60,6 @@ platforms: - Linear - name: Linux apis: - - name: OpenGLCore - exclude_test_platforms: - - name: Standalone - - name: playmode_XR - name: Vulkan exclude_test_platforms: - name: playmode_XR @@ -71,6 +67,19 @@ platforms: - name: mono color_spaces: - Linear + agents_project: + default: + type: Unity::VM::GPU + image: package-ci/ubuntu:stable + flavor: b1.large + editmode: + type: Unity::VM + image: package-ci/ubuntu:stable + flavor: b1.large + standalone_build: + type: Unity::VM::GPU + image: package-ci/ubuntu:stable + flavor: b1.large jobs: - name: PR @@ -81,14 +90,31 @@ jobs: color_space: Linear test_platforms: - playmode - - name: Extra - dependencies: # add any dependencies + - Standalone - platform: Win - api: DX11 + api: DX12 build_config: mono color_space: Linear test_platforms: - - playmode_XR + - playmode + - Standalone + - platform: Win + api: Vulkan + build_config: mono + color_space: Linear + test_platforms: + - playmode + - Standalone + - platform: Linux + api: Vulkan + build_config: mono + color_space: Linear + test_platforms: + - playmode + - Standalone + - name: Extra + dependencies: + [] - name: dependencies: - #PR__ diff --git a/.yamato/config/universal_hybrid.metafile b/.yamato/config/universal_batchrenderergroup.metafile similarity index 75% rename from .yamato/config/universal_hybrid.metafile rename to .yamato/config/universal_batchrenderergroup.metafile index d69175f349a..822dcb9e1cd 100644 --- a/.yamato/config/universal_hybrid.metafile +++ b/.yamato/config/universal_batchrenderergroup.metafile @@ -1,6 +1,6 @@ project: - name: Universal_Hybrid - folder: UniversalHybridTest + name: Universal_BatchRendererGroup + folder: BatchRendererGroup_URP test_platforms: - type: Standalone utr_flags: @@ -44,38 +44,31 @@ platforms: - name: mono color_spaces: - Linear - - name: Android - apis: - - name: OpenGLES3 - exclude_test_platforms: - - name: playmode - - name: playmode_XR - - name: Vulkan - exclude_test_platforms: - - name: playmode - - name: playmode_XR - build_configs: - - name: mono - color_spaces: - - Linear jobs: - name: PR - dependencies: + dependencies: # add any dependencies - platform: Win api: DX11 build_config: mono color_space: Linear test_platforms: - playmode - #- playmode - - platform: OSX - api: Metal + - Standalone + - platform: Win + api: Vulkan + build_config: mono + color_space: Linear + test_platforms: + - playmode + - Standalone + - platform: Linux + api: Vulkan build_config: mono color_space: Linear test_platforms: - #- playmode - playmode + - Standalone - name: Extra dependencies: [] diff --git a/.yamato/config/urp.metafile b/.yamato/config/urp.metafile index 6c7c12e91b3..469cc1de773 100644 --- a/.yamato/config/urp.metafile +++ b/.yamato/config/urp.metafile @@ -7,7 +7,6 @@ jobs: # expression: pull_request.target eq "" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.universal/**/*", "TestProjects/UniversalGraphicsTest_*/**/*"] AND NOT pull_request.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"] dependencies: - .yamato/all-universal_split.yml#PR_Universal_Split_ -# - .yamato/all-universal_hybrid.yml#PR_Universal_Hybrid_ - .yamato/all-universal_stereo.yml#PR_Universal_Stereo_ - .yamato/all-urpupdate.yml#PR_URPUpdate_ - .yamato/all-shadergraph.yml#PR_ShaderGraph_ @@ -16,7 +15,6 @@ jobs: - name: Extra dependencies: - .yamato/all-universal_split.yml#Extra_Universal_Split_ -# - .yamato/all-universal_hybrid.yml#Extra_Universal_Hybrid_ # - .yamato/all-universal_stereo.yml#Extra_Universal_Stereo_ # - .yamato/all-urpupdate.yml#Extra_URPUpdate_ # - .yamato/all-shadergraph.yml#Extra_ShaderGraph_Stereo_ @@ -28,7 +26,7 @@ jobs: - name: Nightly dependencies: - #_ -# - .yamato/all-universal_hybrid.yml#Universal_Hybrid_ + #- .yamato/all-universal_batchrenderergroup.yml#Universal_BatchRendererGroup_ - .yamato/all-universal_stereo.yml#Universal_Stereo_ - .yamato/all-urpupdate.yml#URPUpdate_ - .yamato/all-urp_perf.yml#URP_Perf_ diff --git a/.yamato/universal_hybrid-linux-vulkan.yml b/.yamato/hdrp_batchrenderergroup-linux-vulkan.yml similarity index 71% rename from .yamato/universal_hybrid-linux-vulkan.yml rename to .yamato/hdrp_batchrenderergroup-linux-vulkan.yml index 027d64cc4ae..b041a04fc0b 100644 --- a/.yamato/universal_hybrid-linux-vulkan.yml +++ b/.yamato/hdrp_batchrenderergroup-linux-vulkan.yml @@ -7,8 +7,8 @@ --- -Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: - name: Universal_Hybrid on Linux_Vulkan_Standalone_mono_Linear on version trunk +HDRP_BatchRendererGroup_Linux_Vulkan_playmode_mono_Linear_trunk: + name: HDRP_BatchRendererGroup on Linux_Vulkan_playmode_mono_Linear on version trunk agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -23,9 +23,17 @@ Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr retries: 2 - command: chmod +x utr + - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* + - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - + - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" + - command: sudo apt update + - command: sudo apt install unity-downloader-cli + retries: 2 + - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only + retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 + DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BatchRendererGroup_HDRP/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BatchRendererGroup_HDRP --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -33,18 +41,16 @@ Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision - - path: .yamato/universal_hybrid-linux-vulkan.yml#Build_Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk - rerun: on_new_revision -Build_Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: - name: Build Universal_Hybrid on Linux_Vulkan_mono_Linear_Standalone_build_Player on version trunk +HDRP_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_trunk: + name: HDRP_BatchRendererGroup on Linux_Vulkan_Standalone_mono_Linear on version trunk agent: - type: Unity::VM + type: Unity::VM::GPU image: package-ci/ubuntu:stable - flavor: b1.xlarge + flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: '{{trunk.changeset.id}}' @@ -55,17 +61,9 @@ Build_Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr retries: 2 - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalHybridTest/test-results --build-only --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalHybridTest --timeout=1200 + DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BatchRendererGroup_HDRP/test-results --compilation-errors-as-warnings --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -73,15 +71,14 @@ Build_Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" - players: - paths: - - "players*/**" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -Universal_Hybrid_Linux_Vulkan_playmode_mono_Linear_trunk: - name: Universal_Hybrid on Linux_Vulkan_playmode_mono_Linear on version trunk + - path: .yamato/hdrp_batchrenderergroup-linux-vulkan.yml#Build_HDRP_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_trunk + rerun: on_new_revision +Build_HDRP_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_trunk: + name: Build HDRP_BatchRendererGroup on Linux_Vulkan_mono_Linear_Standalone_build_Player on version trunk agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -106,7 +103,7 @@ Universal_Hybrid_Linux_Vulkan_playmode_mono_Linear_trunk: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalHybridTest --zero-tests-are-ok=1 + DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BatchRendererGroup_HDRP/test-results --build-only --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BatchRendererGroup_HDRP --timeout=1200 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -114,12 +111,15 @@ Universal_Hybrid_Linux_Vulkan_playmode_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" + players: + paths: + - "players*/**" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - name: Universal_Hybrid on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION +HDRP_BatchRendererGroup_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: + name: HDRP_BatchRendererGroup on Linux_Vulkan_playmode_mono_Linear on version CUSTOM-REVISION agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -134,9 +134,17 @@ Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr retries: 2 - command: chmod +x utr + - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* + - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - + - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" + - command: sudo apt update + - command: sudo apt install unity-downloader-cli + retries: 2 + - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only + retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 + DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BatchRendererGroup_HDRP/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BatchRendererGroup_HDRP --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -144,18 +152,16 @@ Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux rerun: on_new_revision - - path: .yamato/universal_hybrid-linux-vulkan.yml#Build_Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION - rerun: on_new_revision -Build_Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - name: Build Universal_Hybrid on Linux_Vulkan_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION +HDRP_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: + name: HDRP_BatchRendererGroup on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: - type: Unity::VM + type: Unity::VM::GPU image: package-ci/ubuntu:stable - flavor: b1.xlarge + flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set @@ -166,17 +172,9 @@ Build_Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr retries: 2 - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalHybridTest/test-results --build-only --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalHybridTest --timeout=1200 + DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BatchRendererGroup_HDRP/test-results --compilation-errors-as-warnings --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -184,15 +182,14 @@ Build_Universal_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" - players: - paths: - - "players*/**" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux rerun: on_new_revision -Universal_Hybrid_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: - name: Universal_Hybrid on Linux_Vulkan_playmode_mono_Linear on version CUSTOM-REVISION + - path: .yamato/hdrp_batchrenderergroup-linux-vulkan.yml#Build_HDRP_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION + rerun: on_new_revision +Build_HDRP_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: + name: Build HDRP_BatchRendererGroup on Linux_Vulkan_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -217,7 +214,7 @@ Universal_Hybrid_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalHybridTest --zero-tests-are-ok=1 + DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BatchRendererGroup_HDRP/test-results --build-only --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BatchRendererGroup_HDRP --timeout=1200 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -225,7 +222,10 @@ Universal_Hybrid_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" + players: + paths: + - "players*/**" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux rerun: on_new_revision diff --git a/.yamato/hdrp_hybrid-osx-metal.yml b/.yamato/hdrp_batchrenderergroup-osx-metal.yml similarity index 78% rename from .yamato/hdrp_hybrid-osx-metal.yml rename to .yamato/hdrp_batchrenderergroup-osx-metal.yml index 9cd7548f5ae..1863940fc81 100644 --- a/.yamato/hdrp_hybrid-osx-metal.yml +++ b/.yamato/hdrp_batchrenderergroup-osx-metal.yml @@ -7,8 +7,8 @@ --- -HDRP_Hybrid_OSX_Metal_playmode_mono_Linear_trunk: - name: HDRP_Hybrid on OSX_Metal_playmode_mono_Linear on version trunk +HDRP_BatchRendererGroup_OSX_Metal_playmode_mono_Linear_trunk: + name: HDRP_BatchRendererGroup on OSX_Metal_playmode_mono_Linear on version trunk agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -33,9 +33,9 @@ HDRP_Hybrid_OSX_Metal_playmode_mono_Linear_trunk: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --zero-tests-are-ok=1 " + ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results/ TestProjects/BatchRendererGroup_HDRP exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -44,12 +44,12 @@ HDRP_Hybrid_OSX_Metal_playmode_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -HDRP_Hybrid_OSX_Metal_playmode_XR_mono_Linear_trunk: - name: HDRP_Hybrid on OSX_Metal_playmode_XR_mono_Linear on version trunk +HDRP_BatchRendererGroup_OSX_Metal_playmode_XR_mono_Linear_trunk: + name: HDRP_BatchRendererGroup on OSX_Metal_playmode_XR_mono_Linear on version trunk agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -74,9 +74,9 @@ HDRP_Hybrid_OSX_Metal_playmode_XR_mono_Linear_trunk: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-xr-reuse-tests" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --zero-tests-are-ok=1 " + ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-xr-reuse-tests" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results/ TestProjects/BatchRendererGroup_HDRP exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -85,12 +85,12 @@ HDRP_Hybrid_OSX_Metal_playmode_XR_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -HDRP_Hybrid_OSX_Metal_Standalone_mono_Linear_trunk: - name: HDRP_Hybrid on OSX_Metal_Standalone_mono_Linear on version trunk +HDRP_BatchRendererGroup_OSX_Metal_Standalone_mono_Linear_trunk: + name: HDRP_BatchRendererGroup on OSX_Metal_Standalone_mono_Linear on version trunk agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -115,9 +115,9 @@ HDRP_Hybrid_OSX_Metal_Standalone_mono_Linear_trunk: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --timeout=2400 --zero-tests-are-ok=1 " + ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results --compilation-errors-as-warnings --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP --timeout=2400 --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results/ TestProjects/BatchRendererGroup_HDRP exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -126,12 +126,12 @@ HDRP_Hybrid_OSX_Metal_Standalone_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -HDRP_Hybrid_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: - name: HDRP_Hybrid on OSX_Metal_playmode_mono_Linear on version CUSTOM-REVISION +HDRP_BatchRendererGroup_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: + name: HDRP_BatchRendererGroup on OSX_Metal_playmode_mono_Linear on version CUSTOM-REVISION agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -156,9 +156,9 @@ HDRP_Hybrid_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --zero-tests-are-ok=1 " + ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results/ TestProjects/BatchRendererGroup_HDRP exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -167,12 +167,12 @@ HDRP_Hybrid_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:OSX rerun: on_new_revision -HDRP_Hybrid_OSX_Metal_playmode_XR_mono_Linear_CUSTOM-REVISION: - name: HDRP_Hybrid on OSX_Metal_playmode_XR_mono_Linear on version CUSTOM-REVISION +HDRP_BatchRendererGroup_OSX_Metal_playmode_XR_mono_Linear_CUSTOM-REVISION: + name: HDRP_BatchRendererGroup on OSX_Metal_playmode_XR_mono_Linear on version CUSTOM-REVISION agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -197,9 +197,9 @@ HDRP_Hybrid_OSX_Metal_playmode_XR_mono_Linear_CUSTOM-REVISION: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-xr-reuse-tests" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --zero-tests-are-ok=1 " + ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-xr-reuse-tests" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results/ TestProjects/BatchRendererGroup_HDRP exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -208,12 +208,12 @@ HDRP_Hybrid_OSX_Metal_playmode_XR_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:OSX rerun: on_new_revision -HDRP_Hybrid_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: - name: HDRP_Hybrid on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION +HDRP_BatchRendererGroup_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: + name: HDRP_BatchRendererGroup on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -238,9 +238,9 @@ HDRP_Hybrid_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/HDRP_HybridTests --timeout=2400 --zero-tests-are-ok=1 " + ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results --compilation-errors-as-warnings --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP --timeout=2400 --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/HDRP_HybridTests/test-results/ TestProjects/HDRP_HybridTests + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BatchRendererGroup_HDRP/test-results/ TestProjects/BatchRendererGroup_HDRP exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -249,7 +249,7 @@ HDRP_Hybrid_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" + - "TestProjects/BatchRendererGroup_HDRP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:OSX rerun: on_new_revision diff --git a/.yamato/hdrp_hybrid-win-vulkan.yml b/.yamato/hdrp_batchrenderergroup-win-dx11.yml similarity index 66% rename from .yamato/hdrp_hybrid-win-vulkan.yml rename to .yamato/hdrp_batchrenderergroup-win-dx11.yml index 0969ed91c45..d59d9a36ac3 100644 --- a/.yamato/hdrp_hybrid-win-vulkan.yml +++ b/.yamato/hdrp_batchrenderergroup-win-dx11.yml @@ -7,8 +7,8 @@ --- -HDRP_Hybrid_Win_Vulkan_playmode_mono_Linear_trunk: - name: HDRP_Hybrid on Win_Vulkan_playmode_mono_Linear on version trunk +HDRP_BatchRendererGroup_Win_DX11_playmode_mono_Linear_trunk: + name: HDRP_BatchRendererGroup on Win_DX11_playmode_mono_Linear on version trunk agent: type: Unity::VM::GPU image: graphics-foundation/win10-dxr:stable @@ -33,17 +33,17 @@ HDRP_Hybrid_Win_Vulkan_playmode_mono_Linear_trunk: set /p GIT_REVISIONDATE= /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: |5- - export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_HybridTests --zero-tests-are-ok=1 - after: - - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - - command: find_instabilities || exit 0 - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux - rerun: on_new_revision -HDRP_Hybrid_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: - name: HDRP_Hybrid on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION - agent: - type: Unity::VM::GPU - image: package-ci/ubuntu:stable - flavor: b1.large - variables: - UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates - CUSTOM_REVISION: custom_revision_not_set - CACHE_ARGS: '{{cache.flags}}' - UTR_VERSION: "current" - TEST_FILTER: .* - commands: - - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr - retries: 2 - - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - - command: |5- - export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_HybridTests --zero-tests-are-ok=1 - after: - - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - - command: find_instabilities || exit 0 - artifacts: - logs: - paths: - - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" - dependencies: - - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux - rerun: on_new_revision diff --git a/.yamato/universal_hybrid-linux-openglcore.yml b/.yamato/universal_batchrenderergroup-linux-openglcore.yml similarity index 77% rename from .yamato/universal_hybrid-linux-openglcore.yml rename to .yamato/universal_batchrenderergroup-linux-openglcore.yml index ae3b1513d71..495e4c5ade2 100644 --- a/.yamato/universal_hybrid-linux-openglcore.yml +++ b/.yamato/universal_batchrenderergroup-linux-openglcore.yml @@ -7,8 +7,8 @@ --- -Universal_Hybrid_Linux_OpenGLCore_playmode_mono_Linear_trunk: - name: Universal_Hybrid on Linux_OpenGLCore_playmode_mono_Linear on version trunk +Universal_BatchRendererGroup_Linux_OpenGLCore_playmode_mono_Linear_trunk: + name: Universal_BatchRendererGroup on Linux_OpenGLCore_playmode_mono_Linear on version trunk agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -33,7 +33,7 @@ Universal_Hybrid_Linux_OpenGLCore_playmode_mono_Linear_trunk: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalHybridTest --zero-tests-are-ok=1 + DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BatchRendererGroup_URP/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BatchRendererGroup_URP --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -41,12 +41,12 @@ Universal_Hybrid_Linux_OpenGLCore_playmode_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -Universal_Hybrid_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: - name: Universal_Hybrid on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION +Universal_BatchRendererGroup_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: + name: Universal_BatchRendererGroup on Linux_OpenGLCore_playmode_mono_Linear on version CUSTOM-REVISION agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -71,7 +71,7 @@ Universal_Hybrid_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/UniversalHybridTest --zero-tests-are-ok=1 + DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BatchRendererGroup_URP/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-glcore" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BatchRendererGroup_URP --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -79,7 +79,7 @@ Universal_Hybrid_Linux_OpenGLCore_playmode_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux rerun: on_new_revision diff --git a/.yamato/hdrp_hybrid-linux-vulkan.yml b/.yamato/universal_batchrenderergroup-linux-vulkan.yml similarity index 71% rename from .yamato/hdrp_hybrid-linux-vulkan.yml rename to .yamato/universal_batchrenderergroup-linux-vulkan.yml index 5073560655c..ec718e29e60 100644 --- a/.yamato/hdrp_hybrid-linux-vulkan.yml +++ b/.yamato/universal_batchrenderergroup-linux-vulkan.yml @@ -7,8 +7,8 @@ --- -HDRP_Hybrid_Linux_Vulkan_playmode_mono_Linear_trunk: - name: HDRP_Hybrid on Linux_Vulkan_playmode_mono_Linear on version trunk +Universal_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_trunk: + name: Universal_BatchRendererGroup on Linux_Vulkan_Standalone_mono_Linear on version trunk agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -23,17 +23,9 @@ HDRP_Hybrid_Linux_Vulkan_playmode_mono_Linear_trunk: - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr retries: 2 - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_HybridTests --zero-tests-are-ok=1 + DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BatchRendererGroup_URP/test-results --compilation-errors-as-warnings --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -41,16 +33,18 @@ HDRP_Hybrid_Linux_Vulkan_playmode_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: - name: HDRP_Hybrid on Linux_Vulkan_Standalone_mono_Linear on version trunk + - path: .yamato/universal_batchrenderergroup-linux-vulkan.yml#Build_Universal_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_trunk + rerun: on_new_revision +Build_Universal_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_trunk: + name: Build Universal_BatchRendererGroup on Linux_Vulkan_mono_Linear_Standalone_build_Player on version trunk agent: - type: Unity::VM::GPU + type: Unity::VM image: package-ci/ubuntu:stable - flavor: b1.large + flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: '{{trunk.changeset.id}}' @@ -61,9 +55,17 @@ HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr retries: 2 - command: chmod +x utr + - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* + - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - + - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" + - command: sudo apt update + - command: sudo apt install unity-downloader-cli + retries: 2 + - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only + retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 + DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BatchRendererGroup_URP/test-results --build-only --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BatchRendererGroup_URP --timeout=1200 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -71,18 +73,19 @@ HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" + players: + paths: + - "players*/**" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision - - path: .yamato/hdrp_hybrid-linux-vulkan.yml#Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk - rerun: on_new_revision -Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: - name: Build HDRP_Hybrid on Linux_Vulkan_mono_Linear_Standalone_build_Player on version trunk +Universal_BatchRendererGroup_Linux_Vulkan_playmode_mono_Linear_trunk: + name: Universal_BatchRendererGroup on Linux_Vulkan_playmode_mono_Linear on version trunk agent: - type: Unity::VM + type: Unity::VM::GPU image: package-ci/ubuntu:stable - flavor: b1.xlarge + flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: '{{trunk.changeset.id}}' @@ -103,7 +106,7 @@ Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_HybridTests/test-results --build-only --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_HybridTests --timeout=1200 + DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BatchRendererGroup_URP/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BatchRendererGroup_URP --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -111,15 +114,12 @@ Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" - players: - paths: - - "players*/**" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:Linux rerun: on_new_revision -HDRP_Hybrid_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: - name: HDRP_Hybrid on Linux_Vulkan_playmode_mono_Linear on version CUSTOM-REVISION +Universal_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: + name: Universal_BatchRendererGroup on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: type: Unity::VM::GPU image: package-ci/ubuntu:stable @@ -134,17 +134,9 @@ HDRP_Hybrid_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr retries: 2 - command: chmod +x utr - - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* - - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - - - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" - - command: sudo apt update - - command: sudo apt install unity-downloader-cli - retries: 2 - - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only - retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_HybridTests --zero-tests-are-ok=1 + DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/BatchRendererGroup_URP/test-results --compilation-errors-as-warnings --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -152,16 +144,18 @@ HDRP_Hybrid_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux rerun: on_new_revision -HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - name: HDRP_Hybrid on Linux_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION + - path: .yamato/universal_batchrenderergroup-linux-vulkan.yml#Build_Universal_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION + rerun: on_new_revision +Build_Universal_BatchRendererGroup_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: + name: Build Universal_BatchRendererGroup on Linux_Vulkan_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION agent: - type: Unity::VM::GPU + type: Unity::VM image: package-ci/ubuntu:stable - flavor: b1.large + flavor: b1.xlarge variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set @@ -172,9 +166,17 @@ HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr retries: 2 - command: chmod +x utr + - command: sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}* + - command: curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add - + - command: sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list" + - command: sudo apt update + - command: sudo apt install unity-downloader-cli + retries: 2 + - command: sudo unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only + retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr --artifacts_path=TestProjects/HDRP_HybridTests/test-results --compilation-errors-as-warnings --platform=StandaloneLinux64 --player-connection-ip=auto --player-load-path=players --suite=playmode --timeout=1200 --zero-tests-are-ok=1 + DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BatchRendererGroup_URP/test-results --build-only --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BatchRendererGroup_URP --timeout=1200 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -182,18 +184,19 @@ HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" + players: + paths: + - "players*/**" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux rerun: on_new_revision - - path: .yamato/hdrp_hybrid-linux-vulkan.yml#Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION - rerun: on_new_revision -Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: - name: Build HDRP_Hybrid on Linux_Vulkan_mono_Linear_Standalone_build_Player on version CUSTOM-REVISION +Universal_BatchRendererGroup_Linux_Vulkan_playmode_mono_Linear_CUSTOM-REVISION: + name: Universal_BatchRendererGroup on Linux_Vulkan_playmode_mono_Linear on version CUSTOM-REVISION agent: - type: Unity::VM + type: Unity::VM::GPU image: package-ci/ubuntu:stable - flavor: b1.xlarge + flavor: b1.large variables: UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates CUSTOM_REVISION: custom_revision_not_set @@ -214,7 +217,7 @@ Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/HDRP_HybridTests/test-results --build-only --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneLinux64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/HDRP_HybridTests --timeout=1200 + DISPLAY=:0.0 ./utr $CACHE_ARGS --artifacts_path=TestProjects/BatchRendererGroup_URP/test-results --compilation-errors-as-warnings --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-force-vulkan" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=./TestProjects/BatchRendererGroup_URP --zero-tests-are-ok=1 after: - command: pip3 install ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 - command: find_instabilities || exit 0 @@ -222,10 +225,7 @@ Build_HDRP_Hybrid_Linux_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/HDRP_HybridTests/Logs/*.log" - players: - paths: - - "players*/**" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:Linux rerun: on_new_revision diff --git a/.yamato/universal_hybrid-osx-metal.yml b/.yamato/universal_batchrenderergroup-osx-metal.yml similarity index 78% rename from .yamato/universal_hybrid-osx-metal.yml rename to .yamato/universal_batchrenderergroup-osx-metal.yml index 5977859b7ea..540947d0d3f 100644 --- a/.yamato/universal_hybrid-osx-metal.yml +++ b/.yamato/universal_batchrenderergroup-osx-metal.yml @@ -7,8 +7,8 @@ --- -Universal_Hybrid_OSX_Metal_Standalone_mono_Linear_trunk: - name: Universal_Hybrid on OSX_Metal_Standalone_mono_Linear on version trunk +Universal_BatchRendererGroup_OSX_Metal_Standalone_mono_Linear_trunk: + name: Universal_BatchRendererGroup on OSX_Metal_Standalone_mono_Linear on version trunk agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -33,9 +33,9 @@ Universal_Hybrid_OSX_Metal_Standalone_mono_Linear_trunk: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalHybridTest --timeout=2400 --zero-tests-are-ok=1 " + ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP/test-results --compilation-errors-as-warnings --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP --timeout=2400 --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results/ TestProjects/UniversalHybridTest + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP/test-results/ TestProjects/BatchRendererGroup_URP exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -44,12 +44,12 @@ Universal_Hybrid_OSX_Metal_Standalone_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -Universal_Hybrid_OSX_Metal_playmode_mono_Linear_trunk: - name: Universal_Hybrid on OSX_Metal_playmode_mono_Linear on version trunk +Universal_BatchRendererGroup_OSX_Metal_playmode_mono_Linear_trunk: + name: Universal_BatchRendererGroup on OSX_Metal_playmode_mono_Linear on version trunk agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -74,9 +74,9 @@ Universal_Hybrid_OSX_Metal_playmode_mono_Linear_trunk: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalHybridTest --zero-tests-are-ok=1 " + ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results/ TestProjects/UniversalHybridTest + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP/test-results/ TestProjects/BatchRendererGroup_URP exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -85,12 +85,12 @@ Universal_Hybrid_OSX_Metal_playmode_mono_Linear_trunk: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:trunk:OSX rerun: on_new_revision -Universal_Hybrid_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: - name: Universal_Hybrid on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION +Universal_BatchRendererGroup_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: + name: Universal_BatchRendererGroup on OSX_Metal_Standalone_mono_Linear on version CUSTOM-REVISION agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -115,9 +115,9 @@ Universal_Hybrid_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalHybridTest --timeout=2400 --zero-tests-are-ok=1 " + ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP/test-results --compilation-errors-as-warnings --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP --timeout=2400 --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results/ TestProjects/UniversalHybridTest + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP/test-results/ TestProjects/BatchRendererGroup_URP exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -126,12 +126,12 @@ Universal_Hybrid_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:OSX rerun: on_new_revision -Universal_Hybrid_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: - name: Universal_Hybrid on OSX_Metal_playmode_mono_Linear on version CUSTOM-REVISION +Universal_BatchRendererGroup_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: + name: Universal_BatchRendererGroup on OSX_Metal_playmode_mono_Linear on version CUSTOM-REVISION agent: type: Unity::metal::macmini image: slough-ops/macos-10.14-xcode:stable @@ -156,9 +156,9 @@ Universal_Hybrid_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: retries: 2 - command: |5- export GIT_REVISIONDATE=`git rev-parse HEAD | git show -s --format=%cI` - ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/UniversalHybridTest --zero-tests-are-ok=1 " + ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP/test-results --compilation-errors-as-warnings --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP --zero-tests-are-ok=1 " UTR_RESULT=$? - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/UniversalHybridTest/test-results/ TestProjects/UniversalHybridTest + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/BatchRendererGroup_URP/test-results/ TestProjects/BatchRendererGroup_URP exit $UTR_RESULT after: - command: pip3 install requests ant_instability_detection --index-url https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade || exit 0 @@ -167,7 +167,7 @@ Universal_Hybrid_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION: logs: paths: - "**/test-results/**" - - "TestProjects/UniversalHybridTest/Logs/*.log" + - "TestProjects/BatchRendererGroup_URP/Logs/*.log" dependencies: - path: .yamato/_editor_priming.yml#editor:priming:CUSTOM-REVISION:OSX rerun: on_new_revision diff --git a/.yamato/universal_hybrid-win-vulkan.yml b/.yamato/universal_batchrenderergroup-win-dx11.yml similarity index 65% rename from .yamato/universal_hybrid-win-vulkan.yml rename to .yamato/universal_batchrenderergroup-win-dx11.yml index 0e08bf2b5c6..d29fdfe7688 100644 --- a/.yamato/universal_hybrid-win-vulkan.yml +++ b/.yamato/universal_batchrenderergroup-win-dx11.yml @@ -7,8 +7,8 @@ --- -Universal_Hybrid_Win_Vulkan_Standalone_mono_Linear_trunk: - name: Universal_Hybrid on Win_Vulkan_Standalone_mono_Linear on version trunk +Universal_BatchRendererGroup_Win_DX11_Standalone_mono_Linear_trunk: + name: Universal_BatchRendererGroup on Win_DX11_Standalone_mono_Linear on version trunk agent: type: Unity::VM::GPU image: sdet/gamecode_win10:stable @@ -28,19 +28,19 @@ Universal_Hybrid_Win_Vulkan_Standalone_mono_Linear_trunk: set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= revdate.tmp - set /p GIT_REVISIONDATE= planes; [ReadOnly] @@ -160,7 +161,7 @@ public void Execute(int index) for (int i = start; i < end; i++) { ulong bit = FrustumPlanes.Intersect2NoPartial(planes, renderers[i].bounds) == FrustumPlanes.IntersectResult.In ? 1ul : 0ul; - visibleBits |= bit << (i-start); + visibleBits |= bit << (i - start); } rendererVisibility[index] = visibleBits; @@ -340,9 +341,13 @@ public JobHandle OnPerformCulling(BatchRendererGroup rendererGroup, BatchCulling return jobHandleOutput; } +#if UNITY_EDITOR public static Material LoadPickingMaterial() { Shader shader = Shader.Find("Hidden/HDRP/BRGPicking"); + + if (shader == null) return null; + Material material = new Material(shader); // Prevent Material unloading when switching scene @@ -352,14 +357,18 @@ public static Material LoadPickingMaterial() } Material m_pickingMaterial; +#endif + // Start is called before the first frame update void Start() { m_BatchRendererGroup = new BatchRendererGroup(this.OnPerformCulling, IntPtr.Zero); +#if UNITY_EDITOR m_pickingMaterial = LoadPickingMaterial(); m_BatchRendererGroup.SetPickingMaterial(m_pickingMaterial); +#endif // Create a batch... var renderers = FindObjectsOfType(); @@ -628,7 +637,9 @@ private void OnDestroy() m_instanceIndices.Dispose(); m_drawIndices.Dispose(); +#if UNITY_EDITOR DestroyImmediate(m_pickingMaterial); +#endif } } } diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/Unlit.mat b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/Unlit.mat similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/Unlit.mat rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/Unlit.mat diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/Unlit.mat.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/Unlit.mat.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/Unlit.mat.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/Unlit.mat.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/brick.jpg b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/brick.jpg similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/brick.jpg rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/brick.jpg diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/brick.jpg.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/brick.jpg.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/brick.jpg.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/brick.jpg.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs similarity index 96% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs index a3d62d2bc40..d2e552d078a 100644 --- a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs +++ b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs @@ -87,14 +87,14 @@ public JobHandle OnPerformCulling(BatchRendererGroup rendererGroup, BatchCulling for (int i = 0; i < itemGridSize; i++) { bool visible = true; - if ( m_cullTest ) + if (m_cullTest) { int dist = (r - itemGridSize / 2) * (r - itemGridSize / 2) + (i - itemGridSize / 2) * (i - itemGridSize / 2); - if ((dist >= radiusI) && ( dist <= radiusO)) + if ((dist >= radiusI) && (dist <= radiusO)) visible = false; } - if ( visible ) + if (visible) drawCommands.visibleInstances[n++] = r * itemGridSize + i; } } @@ -143,7 +143,7 @@ void Start() int objectToWorldID = Shader.PropertyToID("unity_ObjectToWorld"); int matrixPreviousMID = Shader.PropertyToID("unity_MatrixPreviousM"); -// int worldToObjectID = Shader.PropertyToID("unity_WorldToObject"); + // int worldToObjectID = Shader.PropertyToID("unity_WorldToObject"); int colorID = Shader.PropertyToID("_BaseColor"); // Generate a grid of objects... @@ -183,10 +183,11 @@ void Start() // Register batch m_batchID = m_BatchRendererGroup.AddBatch(batchMetadata, m_GPUPersistentInstanceData.bufferHandle); + m_initialized = true; } - void UpdatePositions(Vector3 pos) + void UpdatePositions(Vector3 pos) { int itemCountOffset = itemGridSize * itemGridSize * 3; // 3 float4 per matrix for (int z = 0; z < itemGridSize; z++) @@ -205,7 +206,7 @@ void UpdatePositions(Vector3 pos) // compute the new current frame matrix m_sysmemBuffer[i * 3 + 0] = new Vector4(1, 0, 0, 0); // hacky float3x4 layout m_sysmemBuffer[i * 3 + 1] = new Vector4(1, 0, 0, 0); - m_sysmemBuffer[i * 3 + 2] = new Vector4(1, px + pos.x, pos.y, pz+pos.z); + m_sysmemBuffer[i * 3 + 2] = new Vector4(1, px + pos.x, pos.y, pz + pos.z); } } @@ -217,7 +218,7 @@ void Update() { m_phase += Time.fixedDeltaTime * m_motionSpeed; - if ( m_motionAmplitude > 0.0f ) + if (m_motionAmplitude > 0.0f) { Vector3 pos = new Vector3(0, 0, Mathf.Cos(m_phase) * m_motionAmplitude); UpdatePositions(pos + m_center); diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Editor.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Editor.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Editor/SetupGraphicsTestCases.cs b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/SetupGraphicsTestCases.cs similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Editor/SetupGraphicsTestCases.cs rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/SetupGraphicsTestCases.cs diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Editor/SetupGraphicsTestCases.cs.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/SetupGraphicsTestCases.cs.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Editor/SetupGraphicsTestCases.cs.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/SetupGraphicsTestCases.cs.meta diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Editor/SetupProject.cs b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/SetupProject.cs similarity index 90% rename from TestProjects/UniversalHybridTest/Assets/Tests/Editor/SetupProject.cs rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/SetupProject.cs index 0957cb28e6b..fbf5425a987 100644 --- a/TestProjects/UniversalHybridTest/Assets/Tests/Editor/SetupProject.cs +++ b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/SetupProject.cs @@ -1,4 +1,4 @@ -//This script is copied from UniversalRP TestProject +//This script is copied from UniversalRP TestProject // https://github.com/Unity-Technologies/ScriptableRenderPipeline/blob/master/TestProjects/UniversalGraphicsTest/Assets/Test/Editor/SetupProject.cs using System; @@ -13,7 +13,7 @@ public static class SetupProject { public static void ApplySettings() { - #if UNITY_EDITOR +#if UNITY_EDITOR var options = new Dictionary { { "gamma", () => PlayerSettings.colorSpace = ColorSpace.Gamma }, @@ -31,14 +31,14 @@ public static void ApplySettings() if (options.TryGetValue(arg, out action)) action(); } - #endif +#endif } static void SetGraphicsAPI(GraphicsDeviceType api) { - #if UNITY_EDITOR +#if UNITY_EDITOR var currentTarget = EditorUserBuildSettings.activeBuildTarget; PlayerSettings.SetGraphicsAPIs(currentTarget, new [] { api } ); - #endif +#endif } } diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Editor/SetupProject.cs.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/SetupProject.cs.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Editor/SetupProject.cs.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/SetupProject.cs.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Editor/TestEditor.asmdef b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/TestEditor.asmdef similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Editor/TestEditor.asmdef rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/TestEditor.asmdef diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Editor/TestEditor.asmdef.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/TestEditor.asmdef.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Editor/TestEditor.asmdef.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Editor/TestEditor.asmdef.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Runtime.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTestFix.cs b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTestFix.cs similarity index 66% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTestFix.cs rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTestFix.cs index 42a335bad2e..c7c6ac15b46 100644 --- a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTestFix.cs +++ b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTestFix.cs @@ -1,4 +1,4 @@ -//This is for fixing yamato standalone test. Attach this component to MainCamera if standalone test is fine when you run locally but fails on yamato (sub-scene objects are not rendering / not stable) +//This is for fixing yamato standalone test. Attach this component to MainCamera if standalone test is fine when you run locally but fails on yamato (sub-scene objects are not rendering / not stable) using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -6,7 +6,7 @@ public class GraphicsTestFix : MonoBehaviour { - #if !UNITY_EDITOR //wrapper so that it runs on player only +#if !UNITY_EDITOR //wrapper so that it runs on player only private GraphicsTestSettingsCustom settings; private Camera cam; @@ -22,15 +22,15 @@ void Start() void Update() { - if(count == settings.WaitFrames -3) + if (count == settings.WaitFrames - 3) { - Debug.Log(count+" GraphicsTestFix - start callback"); + Debug.Log(count + " GraphicsTestFix - start callback"); RenderPipelineManager.endFrameRendering += MyRenderFrame; } count++; } - - private void MyRenderFrame(ScriptableRenderContext context,Camera[] cameras) + + private void MyRenderFrame(ScriptableRenderContext context, Camera[] cameras) { //Make a capture when reached correct frame if (texture == null) @@ -38,16 +38,16 @@ private void MyRenderFrame(ScriptableRenderContext context,Camera[] cameras) texture = new Texture2D(cam.pixelWidth, cam.pixelHeight, TextureFormat.RGB24, false); texture.ReadPixels(new Rect(0, 0, texture.width, texture.height), 0, 0, false); texture.Apply(); - Debug.Log(count+" GraphicsTestFix - done ReadPixel"); + Debug.Log(count + " GraphicsTestFix - done ReadPixel"); } //Blit captured texture to the screen afterwards, so that the screen stays static if (texture != null) { - if(cam.targetTexture != null) + if (cam.targetTexture != null) { - Graphics.Blit(texture,cam.targetTexture); - Debug.Log(count+" GraphicsTestFix - done Blit to cam.targetTexture = "+cam.targetTexture.name); + Graphics.Blit(texture, cam.targetTexture); + Debug.Log(count + " GraphicsTestFix - done Blit to cam.targetTexture = " + cam.targetTexture.name); } else { @@ -73,8 +73,5 @@ private void CleanUp() RenderPipelineManager.endFrameRendering -= MyRenderFrame; } - #endif +#endif } - - - diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTestFix.cs.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTestFix.cs.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTestFix.cs.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTestFix.cs.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs similarity index 91% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs index b2fab1bdc07..9e2064c842a 100644 --- a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs +++ b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs @@ -1,4 +1,4 @@ -//This script is copied from UniversalRP TestProject +//This script is copied from UniversalRP TestProject // https://github.com/Unity-Technologies/ScriptableRenderPipeline/blob/master/TestProjects/UniversalGraphicsTest/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs using UnityEngine.TestTools.Graphics; diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTests.cs b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTests.cs similarity index 98% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTests.cs rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTests.cs index 5125a15b1e7..585d228b07d 100644 --- a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTests.cs +++ b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTests.cs @@ -1,4 +1,4 @@ -//This script is copied from UniversalRP TestProject +//This script is copied from UniversalRP TestProject // https://github.com/Unity-Technologies/ScriptableRenderPipeline/blob/master/TestProjects/UniversalGraphicsTest/Assets/Test/Runtime/UniversalGraphicsTests.cs using System.Collections; diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTests.cs.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTests.cs.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/GraphicsTests.cs.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/GraphicsTests.cs.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/TestRuntime.asmdef b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/TestRuntime.asmdef similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/TestRuntime.asmdef rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/TestRuntime.asmdef diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/TestRuntime.asmdef.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/TestRuntime.asmdef.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Runtime/TestRuntime.asmdef.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/Tests/Runtime/TestRuntime.asmdef.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/VFXDefaultResources.asset b/TestProjects/BatchRendererGroup_HDRP/Assets/VFXDefaultResources.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/VFXDefaultResources.asset rename to TestProjects/BatchRendererGroup_HDRP/Assets/VFXDefaultResources.asset diff --git a/TestProjects/HDRP_HybridTests/Assets/VFXDefaultResources.asset.meta b/TestProjects/BatchRendererGroup_HDRP/Assets/VFXDefaultResources.asset.meta similarity index 100% rename from TestProjects/HDRP_HybridTests/Assets/VFXDefaultResources.asset.meta rename to TestProjects/BatchRendererGroup_HDRP/Assets/VFXDefaultResources.asset.meta diff --git a/TestProjects/HDRP_HybridTests/Packages/manifest.json b/TestProjects/BatchRendererGroup_HDRP/Packages/manifest.json similarity index 100% rename from TestProjects/HDRP_HybridTests/Packages/manifest.json rename to TestProjects/BatchRendererGroup_HDRP/Packages/manifest.json diff --git a/TestProjects/HDRP_HybridTests/Packages/packages-lock.json b/TestProjects/BatchRendererGroup_HDRP/Packages/packages-lock.json similarity index 100% rename from TestProjects/HDRP_HybridTests/Packages/packages-lock.json rename to TestProjects/BatchRendererGroup_HDRP/Packages/packages-lock.json diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/AudioManager.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/AudioManager.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/AudioManager.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/AudioManager.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/BurstAotSettings_StandaloneWindows.json b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/BurstAotSettings_StandaloneWindows.json similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/BurstAotSettings_StandaloneWindows.json rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/BurstAotSettings_StandaloneWindows.json diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/ClusterInputManager.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/ClusterInputManager.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/ClusterInputManager.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/ClusterInputManager.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/DynamicsManager.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/DynamicsManager.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/DynamicsManager.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/DynamicsManager.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/EditorBuildSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/EditorBuildSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/EditorBuildSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/EditorBuildSettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/EditorSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/EditorSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/EditorSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/EditorSettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/GraphicsSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/GraphicsSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/GraphicsSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/GraphicsSettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/HDRPProjectSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/HDRPProjectSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/HDRPProjectSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/HDRPProjectSettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/InputManager.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/InputManager.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/InputManager.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/InputManager.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/MemorySettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/MemorySettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/MemorySettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/MemorySettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/NavMeshAreas.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/NavMeshAreas.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/NavMeshAreas.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/NavMeshAreas.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/NetworkManager.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/NetworkManager.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/NetworkManager.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/NetworkManager.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/PackageManagerSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/PackageManagerSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/PackageManagerSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/PackageManagerSettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/Physics2DSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/Physics2DSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/Physics2DSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/Physics2DSettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/PresetManager.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/PresetManager.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/PresetManager.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/PresetManager.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/ProjectSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/ProjectSettings.asset similarity index 98% rename from TestProjects/HDRP_HybridTests/ProjectSettings/ProjectSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/ProjectSettings.asset index 688fa6ea6c1..4813badb2aa 100644 --- a/TestProjects/HDRP_HybridTests/ProjectSettings/ProjectSettings.asset +++ b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/ProjectSettings.asset @@ -119,6 +119,8 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 switchNVNGraphicsFirmwareMemory: 32 @@ -315,7 +317,7 @@ PlayerSettings: m_APIs: 10000000 m_Automatic: 0 - m_BuildTarget: WindowsStandaloneSupport - m_APIs: 1200000002000000 + m_APIs: 120000000200000015000000 m_Automatic: 0 - m_BuildTarget: iOSSupport m_APIs: 10000000 @@ -603,6 +605,12 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 scriptingDefineSymbols: : UNITY_POST_PROCESSING_STACK_V2 Android: UNITY_POST_PROCESSING_STACK_V2 @@ -619,6 +627,7 @@ PlayerSettings: platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} + il2cppCodeGeneration: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} suppressCommonWarnings: 1 @@ -714,4 +723,3 @@ PlayerSettings: forceSRGBBlit: 1 virtualTexturingSupportEnabled: 0 insecureHttpOption: 0 - uploadClearedTextureDataAfterCreationFromScript: 1 diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/QualitySettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/QualitySettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/QualitySettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/QualitySettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/SceneTemplateSettings.json b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/SceneTemplateSettings.json similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/SceneTemplateSettings.json rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/SceneTemplateSettings.json diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/ShaderGraphSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/ShaderGraphSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/ShaderGraphSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/ShaderGraphSettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/TagManager.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/TagManager.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/TagManager.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/TagManager.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/TimeManager.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/TimeManager.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/TimeManager.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/TimeManager.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/UnityConnectSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/UnityConnectSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/UnityConnectSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/UnityConnectSettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/VFXManager.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/VFXManager.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/VFXManager.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/VFXManager.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/VersionControlSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/VersionControlSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/VersionControlSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/VersionControlSettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/XRPackageSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/XRPackageSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/XRPackageSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/XRPackageSettings.asset diff --git a/TestProjects/HDRP_HybridTests/ProjectSettings/XRSettings.asset b/TestProjects/BatchRendererGroup_HDRP/ProjectSettings/XRSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/ProjectSettings/XRSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/ProjectSettings/XRSettings.asset diff --git a/TestProjects/HDRP_HybridTests/TestRunnerOptions.json b/TestProjects/BatchRendererGroup_HDRP/TestRunnerOptions.json similarity index 100% rename from TestProjects/HDRP_HybridTests/TestRunnerOptions.json rename to TestProjects/BatchRendererGroup_HDRP/TestRunnerOptions.json diff --git a/TestProjects/HDRP_HybridTests/UserSettings/EditorUserSettings.asset b/TestProjects/BatchRendererGroup_HDRP/UserSettings/EditorUserSettings.asset similarity index 100% rename from TestProjects/HDRP_HybridTests/UserSettings/EditorUserSettings.asset rename to TestProjects/BatchRendererGroup_HDRP/UserSettings/EditorUserSettings.asset diff --git a/TestProjects/HDRP_HybridTests/UserSettings/Layouts/default-2022.dwlt b/TestProjects/BatchRendererGroup_HDRP/UserSettings/Layouts/default-2022.dwlt similarity index 100% rename from TestProjects/HDRP_HybridTests/UserSettings/Layouts/default-2022.dwlt rename to TestProjects/BatchRendererGroup_HDRP/UserSettings/Layouts/default-2022.dwlt diff --git a/TestProjects/HDRP_HybridTests/UserSettings/Search.settings b/TestProjects/BatchRendererGroup_HDRP/UserSettings/Search.settings similarity index 100% rename from TestProjects/HDRP_HybridTests/UserSettings/Search.settings rename to TestProjects/BatchRendererGroup_HDRP/UserSettings/Search.settings diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/BRGGameObjects.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BRGGameObjects.png similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/BRGGameObjects.png rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BRGGameObjects.png diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BRGGameObjects.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BRGGameObjects.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BRGGameObjects.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BRGGameObjects.png.meta diff --git a/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png new file mode 100644 index 00000000000..eb48f16ff27 --- /dev/null +++ b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:477684bf25c23f09ac77ed1bf1467f08824e6acdf494cbb0cdab423547c2920d +size 434303 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/BRGGameObjects.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BRGGameObjects.png similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/BRGGameObjects.png rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BRGGameObjects.png diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BRGGameObjects.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BRGGameObjects.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BRGGameObjects.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BRGGameObjects.png.meta diff --git a/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png new file mode 100644 index 00000000000..eb48f16ff27 --- /dev/null +++ b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:477684bf25c23f09ac77ed1bf1467f08824e6acdf494cbb0cdab423547c2920d +size 434303 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/BRGGameObjects.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/BRGGameObjects.png rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png.meta diff --git a/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png new file mode 100644 index 00000000000..eb48f16ff27 --- /dev/null +++ b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:477684bf25c23f09ac77ed1bf1467f08824e6acdf494cbb0cdab423547c2920d +size 434303 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BRGGameObjects.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BRGGameObjects.png rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png.meta diff --git a/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png new file mode 100644 index 00000000000..eb48f16ff27 --- /dev/null +++ b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:477684bf25c23f09ac77ed1bf1467f08824e6acdf494cbb0cdab423547c2920d +size 434303 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BRGGameObjects.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BRGGameObjects.png rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png.meta diff --git a/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png new file mode 100644 index 00000000000..eb48f16ff27 --- /dev/null +++ b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:477684bf25c23f09ac77ed1bf1467f08824e6acdf494cbb0cdab423547c2920d +size 434303 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BRGGameObjects.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BRGGameObjects.png rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png.meta diff --git a/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png new file mode 100644 index 00000000000..eb48f16ff27 --- /dev/null +++ b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:477684bf25c23f09ac77ed1bf1467f08824e6acdf494cbb0cdab423547c2920d +size 434303 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BRGGameObjects.png similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BRGGameObjects.png diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BRGGameObjects.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BRGGameObjects.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BRGGameObjects.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BRGGameObjects.png.meta diff --git a/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png new file mode 100644 index 00000000000..eb48f16ff27 --- /dev/null +++ b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:477684bf25c23f09ac77ed1bf1467f08824e6acdf494cbb0cdab423547c2920d +size 434303 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png.meta diff --git a/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png new file mode 100644 index 00000000000..eb48f16ff27 --- /dev/null +++ b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:477684bf25c23f09ac77ed1bf1467f08824e6acdf494cbb0cdab423547c2920d +size 434303 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png.meta diff --git a/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png new file mode 100644 index 00000000000..eb48f16ff27 --- /dev/null +++ b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:477684bf25c23f09ac77ed1bf1467f08824e6acdf494cbb0cdab423547c2920d +size 434303 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None.meta diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png.meta diff --git a/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png new file mode 100644 index 00000000000..eb48f16ff27 --- /dev/null +++ b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:477684bf25c23f09ac77ed1bf1467f08824e6acdf494cbb0cdab423547c2920d +size 434303 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png.meta b/TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png.meta rename to TestProjects/BatchRendererGroup_URP/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/AABB.cs b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/AABB.cs similarity index 85% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/AABB.cs rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/AABB.cs index 2f8c13a4661..845e23084f3 100644 --- a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/AABB.cs +++ b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/AABB.cs @@ -42,13 +42,13 @@ public bool Contains(float3 point) public bool Contains(AABB b) { return Contains(b.Center + float3(-b.Extents.x, -b.Extents.y, -b.Extents.z)) - && Contains(b.Center + float3(-b.Extents.x, -b.Extents.y, b.Extents.z)) - && Contains(b.Center + float3(-b.Extents.x, b.Extents.y, -b.Extents.z)) - && Contains(b.Center + float3(-b.Extents.x, b.Extents.y, b.Extents.z)) + && Contains(b.Center + float3(-b.Extents.x, -b.Extents.y, b.Extents.z)) + && Contains(b.Center + float3(-b.Extents.x, b.Extents.y, -b.Extents.z)) + && Contains(b.Center + float3(-b.Extents.x, b.Extents.y, b.Extents.z)) && Contains(b.Center + float3(b.Extents.x, -b.Extents.y, -b.Extents.z)) - && Contains(b.Center + float3(b.Extents.x, -b.Extents.y, b.Extents.z)) - && Contains(b.Center + float3(b.Extents.x, b.Extents.y, -b.Extents.z)) - && Contains(b.Center + float3(b.Extents.x, b.Extents.y, b.Extents.z)); + && Contains(b.Center + float3(b.Extents.x, -b.Extents.y, b.Extents.z)) + && Contains(b.Center + float3(b.Extents.x, b.Extents.y, -b.Extents.z)) + && Contains(b.Center + float3(b.Extents.x, b.Extents.y, b.Extents.z)); } static float3 RotateExtents(float3 extents, float3 m0, float3 m1, float3 m2) diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/AABB.cs.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/AABB.cs.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/AABB.cs.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/AABB.cs.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/BRGGameObjects.unity b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/BRGGameObjects.unity similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/BRGGameObjects.unity rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/BRGGameObjects.unity diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/BRGGameObjects.unity.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/BRGGameObjects.unity.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/BRGGameObjects.unity.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/BRGGameObjects.unity.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs similarity index 91% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs index 7ac8b61ea45..9376860bef5 100644 --- a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs +++ b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs @@ -6,12 +6,12 @@ public static class AABBExtensions { public static AABB ToAABB(this Bounds bounds) { - return new AABB { Center = bounds.center, Extents = bounds.extents}; + return new AABB { Center = bounds.center, Extents = bounds.extents }; } public static Bounds ToBounds(this AABB aabb) { - return new Bounds { center = aabb.Center, extents = aabb.Extents}; + return new Bounds { center = aabb.Center, extents = aabb.Extents }; } } } diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/BoundsToAABB.cs.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/FrustumPlanes.cs b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/FrustumPlanes.cs similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/FrustumPlanes.cs rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/FrustumPlanes.cs diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/FrustumPlanes.cs.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/FrustumPlanes.cs.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/FrustumPlanes.cs.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/FrustumPlanes.cs.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs similarity index 99% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs index 53ca1cdd7b2..07ce0162127 100644 --- a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs +++ b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs @@ -142,7 +142,8 @@ static MetadataValue CreateMetadataValue(int nameID, int gpuAddress, bool isOver [BurstCompile] private struct CullingJob : IJobParallelFor { - [DeallocateOnJobCompletion][ReadOnly] + [DeallocateOnJobCompletion] + [ReadOnly] public NativeArray planes; [ReadOnly] @@ -161,7 +162,7 @@ public void Execute(int index) for (int i = start; i < end; i++) { ulong bit = FrustumPlanes.Intersect2NoPartial(planes, renderers[i].bounds) == FrustumPlanes.IntersectResult.In ? 1ul : 0ul; - visibleBits |= bit << (i-start); + visibleBits |= bit << (i - start); } rendererVisibility[index] = visibleBits; @@ -341,9 +342,13 @@ public JobHandle OnPerformCulling(BatchRendererGroup rendererGroup, BatchCulling return jobHandleOutput; } +#if UNITY_EDITOR public static Material LoadPickingMaterial() { Shader shader = Shader.Find("Hidden/Universal Render Pipeline/BRGPicking"); + + if (shader == null) return null; + Material material = new Material(shader); // Prevent Material unloading when switching scene @@ -354,14 +359,18 @@ public static Material LoadPickingMaterial() Material m_pickingMaterial; +#endif + // Start is called before the first frame update void Start() { m_BatchRendererGroup = new BatchRendererGroup(this.OnPerformCulling, IntPtr.Zero); +#if UNITY_EDITOR m_pickingMaterial = LoadPickingMaterial(); m_BatchRendererGroup.SetPickingMaterial(m_pickingMaterial); +#endif // Create a batch... var renderers = FindObjectsOfType(); @@ -631,7 +640,9 @@ private void OnDestroy() m_instanceIndices.Dispose(); m_drawIndices.Dispose(); +#if UNITY_EDITOR DestroyImmediate(m_pickingMaterial); +#endif } } } diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat similarity index 97% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat index c0529630192..7553798e8b8 100644 --- a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat +++ b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -93,6 +93,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -114,6 +116,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat similarity index 97% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat index f4f8448b293..474e3e7d5e3 100644 --- a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat +++ b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -93,6 +93,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -114,6 +116,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/brick.jpg b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/brick.jpg similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/brick.jpg rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/brick.jpg diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/brick.jpg.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/brick.jpg.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BRGGameObjects/brick.jpg.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BRGGameObjects/brick.jpg.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat similarity index 97% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat index 8ee4007b053..d42f482ce8a 100644 --- a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat +++ b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 6 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -93,6 +93,7 @@ Material: m_Floats: - _AlphaClip: 0 - _Blend: 0 + - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -101,6 +102,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -114,6 +116,7 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BRGMaterial.mat.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs similarity index 96% rename from TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs index 0cb8c454911..847c019a903 100644 --- a/TestProjects/HDRP_HybridTests/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs +++ b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs @@ -87,14 +87,14 @@ public JobHandle OnPerformCulling(BatchRendererGroup rendererGroup, BatchCulling for (int i = 0; i < itemGridSize; i++) { bool visible = true; - if ( m_cullTest ) + if (m_cullTest) { int dist = (r - itemGridSize / 2) * (r - itemGridSize / 2) + (i - itemGridSize / 2) * (i - itemGridSize / 2); - if ((dist >= radiusI) && ( dist <= radiusO)) + if ((dist >= radiusI) && (dist <= radiusO)) visible = false; } - if ( visible ) + if (visible) drawCommands.visibleInstances[n++] = r * itemGridSize + i; } } @@ -143,7 +143,7 @@ void Start() int objectToWorldID = Shader.PropertyToID("unity_ObjectToWorld"); int matrixPreviousMID = Shader.PropertyToID("unity_MatrixPreviousM"); -// int worldToObjectID = Shader.PropertyToID("unity_WorldToObject"); + // int worldToObjectID = Shader.PropertyToID("unity_WorldToObject"); int colorID = Shader.PropertyToID("_BaseColor"); // Generate a grid of objects... @@ -183,11 +183,10 @@ void Start() // Register batch m_batchID = m_BatchRendererGroup.AddBatch(batchMetadata, m_GPUPersistentInstanceData.bufferHandle); - m_initialized = true; } - void UpdatePositions(Vector3 pos) + void UpdatePositions(Vector3 pos) { int itemCountOffset = itemGridSize * itemGridSize * 3; // 3 float4 per matrix for (int z = 0; z < itemGridSize; z++) @@ -206,7 +205,7 @@ void UpdatePositions(Vector3 pos) // compute the new current frame matrix m_sysmemBuffer[i * 3 + 0] = new Vector4(1, 0, 0, 0); // hacky float3x4 layout m_sysmemBuffer[i * 3 + 1] = new Vector4(1, 0, 0, 0); - m_sysmemBuffer[i * 3 + 2] = new Vector4(1, px + pos.x, pos.y, pz+pos.z); + m_sysmemBuffer[i * 3 + 2] = new Vector4(1, px + pos.x, pos.y, pz + pos.z); } } @@ -218,7 +217,7 @@ void Update() { m_phase += Time.fixedDeltaTime * m_motionSpeed; - if ( m_motionAmplitude > 0.0f ) + if (m_motionAmplitude > 0.0f) { Vector3 pos = new Vector3(0, 0, Mathf.Cos(m_phase) * m_motionAmplitude); UpdatePositions(pos + m_center); diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BRGSetup.cs.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw.unity.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/BatchRenderGroupRaw/BatchRenderGroupRaw/Global Volume Profile.asset.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/SimpleExample.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/SimpleExample.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/SimpleExample.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/SimpleExample.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/SimpleExample/SimpleBRGExample.cs b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/SimpleExample/SimpleBRGExample.cs similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/SimpleExample/SimpleBRGExample.cs rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/SimpleExample/SimpleBRGExample.cs diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/SimpleExample/SimpleBRGExample.cs.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/SimpleExample/SimpleBRGExample.cs.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/SimpleExample/SimpleBRGExample.cs.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/SimpleExample/SimpleBRGExample.cs.meta diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/SimpleExample/SimpleBRGExample.unity b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/SimpleExample/SimpleBRGExample.unity similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/SimpleExample/SimpleBRGExample.unity rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/SimpleExample/SimpleBRGExample.unity diff --git a/TestProjects/UniversalHybridTest/Assets/SampleScenes/SimpleExample/SimpleBRGExample.unity.meta b/TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/SimpleExample/SimpleBRGExample.unity.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/SampleScenes/SimpleExample/SimpleBRGExample.unity.meta rename to TestProjects/BatchRendererGroup_URP/Assets/SampleScenes/SimpleExample/SimpleBRGExample.unity.meta diff --git a/TestProjects/UniversalHybridTest/Assets/Tests.meta b/TestProjects/BatchRendererGroup_URP/Assets/Tests.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests.meta rename to TestProjects/BatchRendererGroup_URP/Assets/Tests.meta diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Editor.meta b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests/Editor.meta rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor.meta diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Editor/SetupGraphicsTestCases.cs b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/SetupGraphicsTestCases.cs similarity index 99% rename from TestProjects/UniversalHybridTest/Assets/Tests/Editor/SetupGraphicsTestCases.cs rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/SetupGraphicsTestCases.cs index b72fa167364..2c496a48321 100644 --- a/TestProjects/UniversalHybridTest/Assets/Tests/Editor/SetupGraphicsTestCases.cs +++ b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/SetupGraphicsTestCases.cs @@ -16,4 +16,4 @@ public void Setup() // Configure project for XR tests Unity.Testing.XR.Editor.InjectMockHMD.SetupLoader(); } -} \ No newline at end of file +} diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Editor/SetupGraphicsTestCases.cs.meta b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/SetupGraphicsTestCases.cs.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests/Editor/SetupGraphicsTestCases.cs.meta rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/SetupGraphicsTestCases.cs.meta diff --git a/TestProjects/HDRP_HybridTests/Assets/Tests/Editor/SetupProject.cs b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/SetupProject.cs similarity index 90% rename from TestProjects/HDRP_HybridTests/Assets/Tests/Editor/SetupProject.cs rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/SetupProject.cs index 0957cb28e6b..fbf5425a987 100644 --- a/TestProjects/HDRP_HybridTests/Assets/Tests/Editor/SetupProject.cs +++ b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/SetupProject.cs @@ -1,4 +1,4 @@ -//This script is copied from UniversalRP TestProject +//This script is copied from UniversalRP TestProject // https://github.com/Unity-Technologies/ScriptableRenderPipeline/blob/master/TestProjects/UniversalGraphicsTest/Assets/Test/Editor/SetupProject.cs using System; @@ -13,7 +13,7 @@ public static class SetupProject { public static void ApplySettings() { - #if UNITY_EDITOR +#if UNITY_EDITOR var options = new Dictionary { { "gamma", () => PlayerSettings.colorSpace = ColorSpace.Gamma }, @@ -31,14 +31,14 @@ public static void ApplySettings() if (options.TryGetValue(arg, out action)) action(); } - #endif +#endif } static void SetGraphicsAPI(GraphicsDeviceType api) { - #if UNITY_EDITOR +#if UNITY_EDITOR var currentTarget = EditorUserBuildSettings.activeBuildTarget; PlayerSettings.SetGraphicsAPIs(currentTarget, new [] { api } ); - #endif +#endif } } diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Editor/SetupProject.cs.meta b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/SetupProject.cs.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests/Editor/SetupProject.cs.meta rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/SetupProject.cs.meta diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Editor/TestEditor.asmdef b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/TestEditor.asmdef similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests/Editor/TestEditor.asmdef rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/TestEditor.asmdef diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Editor/TestEditor.asmdef.meta b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/TestEditor.asmdef.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests/Editor/TestEditor.asmdef.meta rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Editor/TestEditor.asmdef.meta diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime.meta b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests/Runtime.meta rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime.meta diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTestFix.cs b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTestFix.cs similarity index 66% rename from TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTestFix.cs rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTestFix.cs index 42a335bad2e..c7c6ac15b46 100644 --- a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTestFix.cs +++ b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTestFix.cs @@ -1,4 +1,4 @@ -//This is for fixing yamato standalone test. Attach this component to MainCamera if standalone test is fine when you run locally but fails on yamato (sub-scene objects are not rendering / not stable) +//This is for fixing yamato standalone test. Attach this component to MainCamera if standalone test is fine when you run locally but fails on yamato (sub-scene objects are not rendering / not stable) using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -6,7 +6,7 @@ public class GraphicsTestFix : MonoBehaviour { - #if !UNITY_EDITOR //wrapper so that it runs on player only +#if !UNITY_EDITOR //wrapper so that it runs on player only private GraphicsTestSettingsCustom settings; private Camera cam; @@ -22,15 +22,15 @@ void Start() void Update() { - if(count == settings.WaitFrames -3) + if (count == settings.WaitFrames - 3) { - Debug.Log(count+" GraphicsTestFix - start callback"); + Debug.Log(count + " GraphicsTestFix - start callback"); RenderPipelineManager.endFrameRendering += MyRenderFrame; } count++; } - - private void MyRenderFrame(ScriptableRenderContext context,Camera[] cameras) + + private void MyRenderFrame(ScriptableRenderContext context, Camera[] cameras) { //Make a capture when reached correct frame if (texture == null) @@ -38,16 +38,16 @@ private void MyRenderFrame(ScriptableRenderContext context,Camera[] cameras) texture = new Texture2D(cam.pixelWidth, cam.pixelHeight, TextureFormat.RGB24, false); texture.ReadPixels(new Rect(0, 0, texture.width, texture.height), 0, 0, false); texture.Apply(); - Debug.Log(count+" GraphicsTestFix - done ReadPixel"); + Debug.Log(count + " GraphicsTestFix - done ReadPixel"); } //Blit captured texture to the screen afterwards, so that the screen stays static if (texture != null) { - if(cam.targetTexture != null) + if (cam.targetTexture != null) { - Graphics.Blit(texture,cam.targetTexture); - Debug.Log(count+" GraphicsTestFix - done Blit to cam.targetTexture = "+cam.targetTexture.name); + Graphics.Blit(texture, cam.targetTexture); + Debug.Log(count + " GraphicsTestFix - done Blit to cam.targetTexture = " + cam.targetTexture.name); } else { @@ -73,8 +73,5 @@ private void CleanUp() RenderPipelineManager.endFrameRendering -= MyRenderFrame; } - #endif +#endif } - - - diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTestFix.cs.meta b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTestFix.cs.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTestFix.cs.meta rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTestFix.cs.meta diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs similarity index 91% rename from TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs index b2fab1bdc07..9e2064c842a 100644 --- a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs +++ b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs @@ -1,4 +1,4 @@ -//This script is copied from UniversalRP TestProject +//This script is copied from UniversalRP TestProject // https://github.com/Unity-Technologies/ScriptableRenderPipeline/blob/master/TestProjects/UniversalGraphicsTest/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs using UnityEngine.TestTools.Graphics; diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs.meta b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs.meta rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTestSettingsCustom.cs.meta diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTests.cs b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTests.cs similarity index 92% rename from TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTests.cs rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTests.cs index 95164507121..69b10b1cecb 100644 --- a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTests.cs +++ b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTests.cs @@ -1,4 +1,4 @@ - + using System.Collections; using System.Linq; using NUnit.Framework; @@ -10,10 +10,10 @@ public class GraphicsTests { - #if UNITY_ANDROID +#if UNITY_ANDROID static bool wasFirstSceneRan = false; const int firstSceneAdditionalFrames = 3; - #endif +#endif public const string path = "Assets/ReferenceImages"; [UnityTest, Category("GraphicsTest")] @@ -31,11 +31,11 @@ public IEnumerator Run(GraphicsTestCase testCase) var settings = Object.FindObjectOfType(); if (settings == null) Assert.Ignore("Ignoring this test for GraphicsTest because couldn't find GraphicsTestSettingsCustom"); - #if !UNITY_EDITOR +#if !UNITY_EDITOR Screen.SetResolution(settings.ImageComparisonSettings.TargetWidth, settings.ImageComparisonSettings.TargetHeight, false); - #endif +#endif - var cameras = GameObject.FindGameObjectsWithTag("MainCamera").Select(x=>x.GetComponent()); + var cameras = GameObject.FindGameObjectsWithTag("MainCamera").Select(x => x.GetComponent()); yield return null; @@ -55,7 +55,7 @@ public IEnumerator Run(GraphicsTestCase testCase) yield return new WaitForEndOfFrame(); - #if UNITY_ANDROID +#if UNITY_ANDROID // On Android first scene often needs a bit more frames to load all the assets // otherwise the screenshot is just a black screen if (!wasFirstSceneRan) @@ -66,7 +66,7 @@ public IEnumerator Run(GraphicsTestCase testCase) } wasFirstSceneRan = true; } - #endif +#endif ImageAssert.AreEqual(testCase.ReferenceImage, cameras.Where(x => x != null), settings.ImageComparisonSettings); } @@ -74,10 +74,10 @@ public IEnumerator Run(GraphicsTestCase testCase) [TearDown] public void DumpImagesInEditor() { - #if UNITY_EDITOR +#if UNITY_EDITOR UnityEditor.TestTools.Graphics.ResultsUtility.ExtractImagesFromTestProperties(TestContext.CurrentContext.Test); - #endif +#endif XRGraphicsAutomatedTests.running = false; } -} \ No newline at end of file +} diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTests.cs.meta b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTests.cs.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests/Runtime/GraphicsTests.cs.meta rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/GraphicsTests.cs.meta diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime/TestRuntime.asmdef b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/TestRuntime.asmdef similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests/Runtime/TestRuntime.asmdef rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/TestRuntime.asmdef diff --git a/TestProjects/UniversalHybridTest/Assets/Tests/Runtime/TestRuntime.asmdef.meta b/TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/TestRuntime.asmdef.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/Tests/Runtime/TestRuntime.asmdef.meta rename to TestProjects/BatchRendererGroup_URP/Assets/Tests/Runtime/TestRuntime.asmdef.meta diff --git a/TestProjects/UniversalHybridTest/Assets/URPSettings.meta b/TestProjects/BatchRendererGroup_URP/Assets/URPSettings.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/URPSettings.meta rename to TestProjects/BatchRendererGroup_URP/Assets/URPSettings.meta diff --git a/TestProjects/UniversalHybridTest/Assets/URPSettings/UniversalRenderPipelineAsset.asset b/TestProjects/BatchRendererGroup_URP/Assets/URPSettings/UniversalRenderPipelineAsset.asset similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/URPSettings/UniversalRenderPipelineAsset.asset rename to TestProjects/BatchRendererGroup_URP/Assets/URPSettings/UniversalRenderPipelineAsset.asset diff --git a/TestProjects/UniversalHybridTest/Assets/URPSettings/UniversalRenderPipelineAsset.asset.meta b/TestProjects/BatchRendererGroup_URP/Assets/URPSettings/UniversalRenderPipelineAsset.asset.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/URPSettings/UniversalRenderPipelineAsset.asset.meta rename to TestProjects/BatchRendererGroup_URP/Assets/URPSettings/UniversalRenderPipelineAsset.asset.meta diff --git a/TestProjects/UniversalHybridTest/Assets/URPSettings/UniversalRenderPipelineAsset_Renderer.asset b/TestProjects/BatchRendererGroup_URP/Assets/URPSettings/UniversalRenderPipelineAsset_Renderer.asset similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/URPSettings/UniversalRenderPipelineAsset_Renderer.asset rename to TestProjects/BatchRendererGroup_URP/Assets/URPSettings/UniversalRenderPipelineAsset_Renderer.asset diff --git a/TestProjects/UniversalHybridTest/Assets/URPSettings/UniversalRenderPipelineAsset_Renderer.asset.meta b/TestProjects/BatchRendererGroup_URP/Assets/URPSettings/UniversalRenderPipelineAsset_Renderer.asset.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/URPSettings/UniversalRenderPipelineAsset_Renderer.asset.meta rename to TestProjects/BatchRendererGroup_URP/Assets/URPSettings/UniversalRenderPipelineAsset_Renderer.asset.meta diff --git a/TestProjects/UniversalHybridTest/Assets/UniversalRenderPipelineGlobalSettings.asset b/TestProjects/BatchRendererGroup_URP/Assets/UniversalRenderPipelineGlobalSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/UniversalRenderPipelineGlobalSettings.asset rename to TestProjects/BatchRendererGroup_URP/Assets/UniversalRenderPipelineGlobalSettings.asset diff --git a/TestProjects/UniversalHybridTest/Assets/UniversalRenderPipelineGlobalSettings.asset.meta b/TestProjects/BatchRendererGroup_URP/Assets/UniversalRenderPipelineGlobalSettings.asset.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/UniversalRenderPipelineGlobalSettings.asset.meta rename to TestProjects/BatchRendererGroup_URP/Assets/UniversalRenderPipelineGlobalSettings.asset.meta diff --git a/TestProjects/UniversalHybridTest/Assets/VFXDefaultResources.asset b/TestProjects/BatchRendererGroup_URP/Assets/VFXDefaultResources.asset similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/VFXDefaultResources.asset rename to TestProjects/BatchRendererGroup_URP/Assets/VFXDefaultResources.asset diff --git a/TestProjects/UniversalHybridTest/Assets/VFXDefaultResources.asset.meta b/TestProjects/BatchRendererGroup_URP/Assets/VFXDefaultResources.asset.meta similarity index 100% rename from TestProjects/UniversalHybridTest/Assets/VFXDefaultResources.asset.meta rename to TestProjects/BatchRendererGroup_URP/Assets/VFXDefaultResources.asset.meta diff --git a/TestProjects/UniversalHybridTest/Packages/manifest.json b/TestProjects/BatchRendererGroup_URP/Packages/manifest.json similarity index 100% rename from TestProjects/UniversalHybridTest/Packages/manifest.json rename to TestProjects/BatchRendererGroup_URP/Packages/manifest.json diff --git a/TestProjects/UniversalHybridTest/Packages/packages-lock.json b/TestProjects/BatchRendererGroup_URP/Packages/packages-lock.json similarity index 100% rename from TestProjects/UniversalHybridTest/Packages/packages-lock.json rename to TestProjects/BatchRendererGroup_URP/Packages/packages-lock.json diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/AudioManager.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/AudioManager.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/AudioManager.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/AudioManager.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/ClusterInputManager.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/ClusterInputManager.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/ClusterInputManager.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/ClusterInputManager.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/DynamicsManager.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/DynamicsManager.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/DynamicsManager.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/DynamicsManager.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/EditorBuildSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/EditorBuildSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/EditorBuildSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/EditorBuildSettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/EditorSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/EditorSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/EditorSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/EditorSettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/GraphicsSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/GraphicsSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/GraphicsSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/GraphicsSettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/InputManager.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/InputManager.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/InputManager.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/InputManager.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/MemorySettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/MemorySettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/MemorySettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/MemorySettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/NavMeshAreas.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/NavMeshAreas.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/NavMeshAreas.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/NavMeshAreas.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/NetworkManager.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/NetworkManager.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/NetworkManager.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/NetworkManager.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/PackageManagerSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/PackageManagerSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/PackageManagerSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/PackageManagerSettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/Physics2DSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/Physics2DSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/Physics2DSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/Physics2DSettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/PresetManager.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/PresetManager.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/PresetManager.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/PresetManager.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/ProjectSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/ProjectSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/ProjectSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/ProjectSettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/QualitySettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/QualitySettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/QualitySettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/QualitySettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/ShaderGraphSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/ShaderGraphSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/ShaderGraphSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/ShaderGraphSettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/TagManager.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/TagManager.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/TagManager.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/TagManager.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/TimeManager.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/TimeManager.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/TimeManager.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/TimeManager.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/URPProjectSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/URPProjectSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/URPProjectSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/URPProjectSettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/UnityConnectSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/UnityConnectSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/UnityConnectSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/UnityConnectSettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/VFXManager.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/VFXManager.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/VFXManager.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/VFXManager.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/VersionControlSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/VersionControlSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/VersionControlSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/VersionControlSettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/XRPackageSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/XRPackageSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/XRPackageSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/XRPackageSettings.asset diff --git a/TestProjects/UniversalHybridTest/ProjectSettings/XRSettings.asset b/TestProjects/BatchRendererGroup_URP/ProjectSettings/XRSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/ProjectSettings/XRSettings.asset rename to TestProjects/BatchRendererGroup_URP/ProjectSettings/XRSettings.asset diff --git a/TestProjects/UniversalHybridTest/TestRunnerOptions.json b/TestProjects/BatchRendererGroup_URP/TestRunnerOptions.json similarity index 100% rename from TestProjects/UniversalHybridTest/TestRunnerOptions.json rename to TestProjects/BatchRendererGroup_URP/TestRunnerOptions.json diff --git a/TestProjects/UniversalHybridTest/UserSettings/EditorUserSettings.asset b/TestProjects/BatchRendererGroup_URP/UserSettings/EditorUserSettings.asset similarity index 100% rename from TestProjects/UniversalHybridTest/UserSettings/EditorUserSettings.asset rename to TestProjects/BatchRendererGroup_URP/UserSettings/EditorUserSettings.asset diff --git a/TestProjects/UniversalHybridTest/UserSettings/Layouts/default-2022.dwlt b/TestProjects/BatchRendererGroup_URP/UserSettings/Layouts/default-2022.dwlt similarity index 100% rename from TestProjects/UniversalHybridTest/UserSettings/Layouts/default-2022.dwlt rename to TestProjects/BatchRendererGroup_URP/UserSettings/Layouts/default-2022.dwlt diff --git a/TestProjects/UniversalHybridTest/UserSettings/Search.settings b/TestProjects/BatchRendererGroup_URP/UserSettings/Search.settings similarity index 100% rename from TestProjects/UniversalHybridTest/UserSettings/Search.settings rename to TestProjects/BatchRendererGroup_URP/UserSettings/Search.settings diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png deleted file mode 100644 index 069d30639ac..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74cf52c6606eb93c9ae96370bc4fda89c8dbede6a7b614c1026d6a11ad666076 -size 129856 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png deleted file mode 100644 index 3db4f5a90f8..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5104f8d4c6acdd8265300e25cbc1ad131233e72881935048a923adef757afdd5 -size 968312 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/AreEqual_WithTotallyDifferentImages_ThrowsAssertionException.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/AreEqual_WithTotallyDifferentImages_ThrowsAssertionException.png deleted file mode 100644 index 2db7b660b18..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/AreEqual_WithTotallyDifferentImages_ThrowsAssertionException.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9e1b2fb7becd40bcfce82dfe66ca3689d727154d45d3036db4a3ebf108214274 -size 69 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png deleted file mode 100644 index 2766950bf04..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f63d3a2406404eafcc810a2a07fc13882dfeeba1e34746bcf5f5548185b8bd6d -size 129712 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png deleted file mode 100644 index 66339bda365..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0f99f89c48400245b59de9a4137392917d83ef97f2c92fbcc6517fae2c25a7c8 -size 965472 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png deleted file mode 100644 index e2eeb6ba0af..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a62a7418926c4da5d329d27635a29092a96661dcac671cbbd02b16db8814b85c -size 130470 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png deleted file mode 100644 index b036031f65f..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a5733ca044730bb7755746321da50632d069f75c3d011e0dcb84cb88f7ff135 -size 973272 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png deleted file mode 100644 index e2eeb6ba0af..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a62a7418926c4da5d329d27635a29092a96661dcac671cbbd02b16db8814b85c -size 130470 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png deleted file mode 100644 index 02858e4fb96..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:531cd8334741ce287524f4d09340f7888626b5b0e1a97c1e3e2a8e87edaaddaf -size 973278 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png deleted file mode 100644 index 6e18e4cfcac..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0abb6314645e8e68cfcadedb01841177652a7b60831ae2939feb137bc84b58a5 -size 130364 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png deleted file mode 100644 index 2b8410b16f8..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c047f42185b862f2cc6e8f7e2fa4286122eacd76c1d0948010c6226ebabb7eb -size 973214 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png deleted file mode 100644 index e2eeb6ba0af..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a62a7418926c4da5d329d27635a29092a96661dcac671cbbd02b16db8814b85c -size 130470 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png deleted file mode 100644 index b036031f65f..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a5733ca044730bb7755746321da50632d069f75c3d011e0dcb84cb88f7ff135 -size 973272 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png deleted file mode 100644 index e2eeb6ba0af..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a62a7418926c4da5d329d27635a29092a96661dcac671cbbd02b16db8814b85c -size 130470 diff --git a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png b/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png deleted file mode 100644 index b036031f65f..00000000000 --- a/TestProjects/HDRP_HybridTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a5733ca044730bb7755746321da50632d069f75c3d011e0dcb84cb88f7ff135 -size 973272 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/Android/OpenGLES3/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/Android/Vulkan/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore.meta deleted file mode 100644 index 90fd4194ff4..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d2d5af19c42ee2645adf52f0de3156d7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/BRGGameObjects.png.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/BRGGameObjects.png.meta deleted file mode 100644 index 8c38631679a..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/BRGGameObjects.png.meta +++ /dev/null @@ -1,122 +0,0 @@ -fileFormatVersion: 2 -guid: c8f927d108df1004cba1039794c27f4a -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 1 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/OpenGLCore/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxEditor/Vulkan/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore.meta deleted file mode 100644 index b39f7e4339c..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ebf8c4ee7b60aed4dace8da0ea33521d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None.meta deleted file mode 100644 index 5a0e3072ba2..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b95d5db8fec276d428fc54e306111485 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BRGGameObjects.png.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BRGGameObjects.png.meta deleted file mode 100644 index b2ff3471e5d..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BRGGameObjects.png.meta +++ /dev/null @@ -1,122 +0,0 @@ -fileFormatVersion: 2 -guid: 5879c5325114ab0488899b972fe86334 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 1 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BatchRenderGroupRaw.png.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BatchRenderGroupRaw.png.meta deleted file mode 100644 index 8c91bb13312..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/OpenGLCore/None/BatchRenderGroupRaw.png.meta +++ /dev/null @@ -1,122 +0,0 @@ -fileFormatVersion: 2 -guid: 2c1ef02a4ecc71746a008f70d3dce994 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 1 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXEditor/Metal/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D12/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore.meta deleted file mode 100644 index 9657bfad049..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d038189fa506e0a4eb3f256b7af4a1b8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None.meta deleted file mode 100644 index e8957772c82..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5cb171632ac012149a2f3d95a8638245 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BRGGameObjects.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BRGGameObjects.png deleted file mode 100644 index 18432128d12..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc31b9a69b7eee83e9802b202f97bb3463039fc7ab7565ec9763dcd9cde70e97 -size 110090 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BRGGameObjects.png.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BRGGameObjects.png.meta deleted file mode 100644 index b93e3470e83..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BRGGameObjects.png.meta +++ /dev/null @@ -1,122 +0,0 @@ -fileFormatVersion: 2 -guid: 95364670a012423469284916b9ab32d0 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 1 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BatchRenderGroupRaw.png.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BatchRenderGroupRaw.png.meta deleted file mode 100644 index a345daede09..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/OpenGLCore/None/BatchRenderGroupRaw.png.meta +++ /dev/null @@ -1,122 +0,0 @@ -fileFormatVersion: 2 -guid: 18eea19848f65474b936fde9919d513e -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 1 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BRGGameObjects.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BRGGameObjects.png deleted file mode 100644 index 18432128d12..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc31b9a69b7eee83e9802b202f97bb3463039fc7ab7565ec9763dcd9cde70e97 -size 110090 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png deleted file mode 100644 index 18432128d12..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc31b9a69b7eee83e9802b202f97bb3463039fc7ab7565ec9763dcd9cde70e97 -size 110090 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png deleted file mode 100644 index 18432128d12..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc31b9a69b7eee83e9802b202f97bb3463039fc7ab7565ec9763dcd9cde70e97 -size 110090 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore.meta deleted file mode 100644 index e49c18c7a7a..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2066287f7ed6b714e8d8c7de5622b712 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None.meta deleted file mode 100644 index 8c047f02647..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 380f1571115b2ef4680055ea9aac0ecb -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BRGGameObjects.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BRGGameObjects.png deleted file mode 100644 index 18432128d12..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc31b9a69b7eee83e9802b202f97bb3463039fc7ab7565ec9763dcd9cde70e97 -size 110090 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BRGGameObjects.png.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BRGGameObjects.png.meta deleted file mode 100644 index 756a83bae9f..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BRGGameObjects.png.meta +++ /dev/null @@ -1,122 +0,0 @@ -fileFormatVersion: 2 -guid: d0d8a4164cc95e94fba09d822edf62bf -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 1 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BatchRenderGroupRaw.png.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BatchRenderGroupRaw.png.meta deleted file mode 100644 index 47de5d1f17d..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/OpenGLCore/None/BatchRenderGroupRaw.png.meta +++ /dev/null @@ -1,122 +0,0 @@ -fileFormatVersion: 2 -guid: 060b0516353100c4090c38fe974d648d -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 1 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png deleted file mode 100644 index 18432128d12..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc31b9a69b7eee83e9802b202f97bb3463039fc7ab7565ec9763dcd9cde70e97 -size 110090 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer.meta deleted file mode 100644 index ed4155b8ec7..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eb496a0e0f0cdc84fab8a0ff9fc258da -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal.meta deleted file mode 100644 index 59f3402ff41..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c8dbde478a8f60f4b82a0cb885f36367 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None.meta deleted file mode 100644 index f4b66050a5a..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 395f11b7d4ac1ad4abe6072892dfbe27 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BRGGameObjects.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BRGGameObjects.png deleted file mode 100644 index 18432128d12..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BRGGameObjects.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc31b9a69b7eee83e9802b202f97bb3463039fc7ab7565ec9763dcd9cde70e97 -size 110090 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BRGGameObjects.png.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BRGGameObjects.png.meta deleted file mode 100644 index 6161474dbc2..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BRGGameObjects.png.meta +++ /dev/null @@ -1,122 +0,0 @@ -fileFormatVersion: 2 -guid: fa12e93057055fe42a21c9ff01d2fbf5 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 1 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BatchRenderGroupRaw.png b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BatchRenderGroupRaw.png deleted file mode 100644 index 31973b01272..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BatchRenderGroupRaw.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44204711ea07f852b9bc8f12d316f68aef8d6b4e74fedb9c9801c11dff5d613d -size 718231 diff --git a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BatchRenderGroupRaw.png.meta b/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BatchRenderGroupRaw.png.meta deleted file mode 100644 index dd17a97c38e..00000000000 --- a/TestProjects/UniversalHybridTest/Assets/ReferenceImages/Linear/iPhonePlayer/Metal/None/BatchRenderGroupRaw.png.meta +++ /dev/null @@ -1,122 +0,0 @@ -fileFormatVersion: 2 -guid: b15a0db3d8891e54d981b900960d365c -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 1 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 0 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: