From 2aef552bcc5bc3132d3b6f3f3bc353d2642e320c Mon Sep 17 00:00:00 2001 From: Theo Penavaire Date: Thu, 28 May 2020 17:42:12 +0200 Subject: [PATCH 1/8] Enable DX12, Vulkan and Metal standalone tests --- .yamato/all-hdrp.yml | 24 ++++++++++++++++++++++++ .yamato/ruamel/config/hdrp.metafile | 10 ++++++++++ 2 files changed, 34 insertions(+) diff --git a/.yamato/all-hdrp.yml b/.yamato/all-hdrp.yml index afefcfb3c78..f382b2aedbf 100644 --- a/.yamato/all-hdrp.yml +++ b/.yamato/all-hdrp.yml @@ -13,8 +13,16 @@ All_HDRP_trunk: rerun: always - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_XR_trunk rerun: always + - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_Standalone_trunk + rerun: always - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_trunk rerun: always + - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_Standalone_trunk + rerun: always + - path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_Standalone_trunk + rerun: always + - path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_Standalone_trunk + rerun: always - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_trunk rerun: always All_HDRP_fast-trunk: @@ -32,8 +40,16 @@ All_HDRP_fast-trunk: rerun: always - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_XR_fast-trunk rerun: always + - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_Standalone_fast-trunk + rerun: always - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_fast-trunk rerun: always + - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_Standalone_fast-trunk + rerun: always + - path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_Standalone_fast-trunk + rerun: always + - path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_Standalone_fast-trunk + rerun: always - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_fast-trunk rerun: always All_HDRP_CUSTOM-REVISION: @@ -51,8 +67,16 @@ All_HDRP_CUSTOM-REVISION: rerun: always - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_XR_CUSTOM-REVISION rerun: always + - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_Standalone_CUSTOM-REVISION + rerun: always - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_CUSTOM-REVISION rerun: always + - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_Standalone_CUSTOM-REVISION + rerun: always + - path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_Standalone_CUSTOM-REVISION + rerun: always + - path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_Standalone_CUSTOM-REVISION + rerun: always - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_CUSTOM-REVISION rerun: always variables: diff --git a/.yamato/ruamel/config/hdrp.metafile b/.yamato/ruamel/config/hdrp.metafile index f836b150c37..ce19be45535 100644 --- a/.yamato/ruamel/config/hdrp.metafile +++ b/.yamato/ruamel/config/hdrp.metafile @@ -33,10 +33,20 @@ all: test_platforms: - playmode - playmode_XR + - Standalone - platform: Win api: Vulkan test_platforms: - playmode + - Standalone + - platform: OSX + api: Metal + test_platforms: + - Standalone + - platform: Linux + api: Vulkan + test_platforms: + - Standalone - project: HDRP_DXR platform: Win api: DX12 From a77b4519e025a41247b9957fab464c19c94275e9 Mon Sep 17 00:00:00 2001 From: Theo Penavaire Date: Thu, 28 May 2020 18:09:34 +0200 Subject: [PATCH 2/8] Disable Standalone tests for Vulkan (Linux) --- .yamato/all-hdrp.yml | 6 ------ .yamato/ruamel/config/hdrp.metafile | 4 ---- 2 files changed, 10 deletions(-) diff --git a/.yamato/all-hdrp.yml b/.yamato/all-hdrp.yml index f382b2aedbf..f5e935a7f25 100644 --- a/.yamato/all-hdrp.yml +++ b/.yamato/all-hdrp.yml @@ -21,8 +21,6 @@ All_HDRP_trunk: rerun: always - path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_Standalone_trunk rerun: always - - path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_Standalone_trunk - rerun: always - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_trunk rerun: always All_HDRP_fast-trunk: @@ -48,8 +46,6 @@ All_HDRP_fast-trunk: rerun: always - path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_Standalone_fast-trunk rerun: always - - path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_Standalone_fast-trunk - rerun: always - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_fast-trunk rerun: always All_HDRP_CUSTOM-REVISION: @@ -75,8 +71,6 @@ All_HDRP_CUSTOM-REVISION: rerun: always - path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_Standalone_CUSTOM-REVISION rerun: always - - path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_Standalone_CUSTOM-REVISION - rerun: always - path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_CUSTOM-REVISION rerun: always variables: diff --git a/.yamato/ruamel/config/hdrp.metafile b/.yamato/ruamel/config/hdrp.metafile index ce19be45535..e954bc82dd7 100644 --- a/.yamato/ruamel/config/hdrp.metafile +++ b/.yamato/ruamel/config/hdrp.metafile @@ -43,10 +43,6 @@ all: api: Metal test_platforms: - Standalone - - platform: Linux - api: Vulkan - test_platforms: - - Standalone - project: HDRP_DXR platform: Win api: DX12 From 0a674226968a08478ee55a48039dfe9b55a335bf Mon Sep 17 00:00:00 2001 From: Theo Penavaire Date: Fri, 29 May 2020 13:47:57 +0200 Subject: [PATCH 3/8] Update reference images for DX12 & Vulkan --- .../Linear/WindowsPlayer/Direct3D12.meta | 8 ++ .../Linear/WindowsPlayer/Direct3D12/None.meta | 8 ++ .../Direct3D12/None/001-HDTemplate.png | 3 + .../Direct3D12/None/001-HDTemplate.png.meta | 96 +++++++++++++++++++ .../Direct3D12/None/002-HDMaterials.png | 3 + .../Direct3D12/None/002-HDMaterials.png.meta | 96 +++++++++++++++++++ .../Vulkan/None/003-VirtualTexturing.png | 3 + .../Vulkan/None/003-VirtualTexturing.png.meta | 96 +++++++++++++++++++ 8 files changed, 313 insertions(+) create mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12.meta create mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None.meta create mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/001-HDTemplate.png create mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/001-HDTemplate.png.meta create mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png create mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png.meta create mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/003-VirtualTexturing.png create mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/003-VirtualTexturing.png.meta diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12.meta b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12.meta new file mode 100644 index 00000000000..807ab0df033 --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 96a3b107f424bad41bd21adfa09c66dc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None.meta b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None.meta new file mode 100644 index 00000000000..07509e65010 --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3c7d235afdedb2445a4d7b538f4651e4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/001-HDTemplate.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/001-HDTemplate.png new file mode 100644 index 00000000000..00b2a4fd77d --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/001-HDTemplate.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1dc134cc8f4b5f1c0fb4ee9f8cb33fbf506d2edab786c2a9b796692d55ce0153 +size 2562004 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/001-HDTemplate.png.meta b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/001-HDTemplate.png.meta new file mode 100644 index 00000000000..c2dcfde291b --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/001-HDTemplate.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 9b14fc2710c848e42a0ba901b554f906 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + 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: 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png new file mode 100644 index 00000000000..3345a22d70b --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:444d9757a3efc034d63649f196531dae7c31037577d0c731b3c0c6d250cd6e6a +size 2295182 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png.meta b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png.meta new file mode 100644 index 00000000000..7b78d03a38c --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: a60f182c9ada39b44b0e1b0aef954d39 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + 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: 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/003-VirtualTexturing.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/003-VirtualTexturing.png new file mode 100644 index 00000000000..2f12fb9ef2c --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/003-VirtualTexturing.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2c4ba004714177c01d9fbe2fbf36d76bf33845d0f82fe45390d412e937402bb +size 764168 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/003-VirtualTexturing.png.meta b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/003-VirtualTexturing.png.meta new file mode 100644 index 00000000000..ff87a7eca51 --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/003-VirtualTexturing.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: fef85bc7a4398a24aa52d88966581f31 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + 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: 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: From d49e4631bc2b5ca3ea74cc06f5ecd9d4de0174b1 Mon Sep 17 00:00:00 2001 From: Theo Penavaire Date: Fri, 29 May 2020 14:48:58 +0200 Subject: [PATCH 4/8] Update supported Graphics APIs in the Player Settings of HDRP_Tests * OpenGLCore is currently not supported by HDRP so removed it. * DX12 was disabled, so enabled it. --- .../HDRP_Tests/ProjectSettings/ProjectSettings.asset | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/TestProjects/HDRP_Tests/ProjectSettings/ProjectSettings.asset b/TestProjects/HDRP_Tests/ProjectSettings/ProjectSettings.asset index cf87a112447..aa8fbc9f8a0 100644 --- a/TestProjects/HDRP_Tests/ProjectSettings/ProjectSettings.asset +++ b/TestProjects/HDRP_Tests/ProjectSettings/ProjectSettings.asset @@ -277,7 +277,10 @@ PlayerSettings: m_BuildTargetBatching: [] m_BuildTargetGraphicsAPIs: - m_BuildTarget: WindowsStandaloneSupport - m_APIs: 0200000015000000 + m_APIs: 020000001200000015000000 + m_Automatic: 0 + - m_BuildTarget: MacStandaloneSupport + m_APIs: 10000000 m_Automatic: 0 m_BuildTargetVRSettings: [] m_BuildTargetEnableVuforiaSettings: [] From 19ce1454175b992bd0c93fefd3d458f65f87ff5f Mon Sep 17 00:00:00 2001 From: Theo Penavaire Date: Fri, 29 May 2020 16:14:58 +0200 Subject: [PATCH 5/8] Update reference images and Graphics APIs for HDRP_Runtime tests * Revert the 2 previous commits as they were targetting the wrong folder/project (HDRP_Tests instead of HDRP_Runtime) --- .../Linear/WindowsPlayer/Direct3D12.meta | 2 +- .../Linear/WindowsPlayer/Direct3D12/None.meta | 2 +- .../WindowsPlayer/Direct3D12/None/001-HDTemplate.png | 3 +++ .../Direct3D12/None/001-HDTemplate.png.meta | 2 +- .../WindowsPlayer/Direct3D12/None/002-HDMaterials.png | 3 +++ .../Direct3D12/None/002-HDMaterials.png.meta | 2 +- .../Vulkan/None/003-VirtualTexturing.png | 3 +++ .../Vulkan/None/003-VirtualTexturing.png.meta | 2 +- .../ProjectSettings/ProjectSettings.asset | 11 ++++++++++- .../WindowsPlayer/Direct3D12/None/001-HDTemplate.png | 3 --- .../WindowsPlayer/Direct3D12/None/002-HDMaterials.png | 3 --- .../Vulkan/None/003-VirtualTexturing.png | 3 --- .../HDRP_Tests/ProjectSettings/ProjectSettings.asset | 5 +---- 13 files changed, 25 insertions(+), 19 deletions(-) rename TestProjects/{HDRP_Tests => HDRP_RuntimeTests}/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12.meta (77%) rename TestProjects/{HDRP_Tests => HDRP_RuntimeTests}/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None.meta (77%) create mode 100644 TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/001-HDTemplate.png rename TestProjects/{HDRP_Tests => HDRP_RuntimeTests}/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/001-HDTemplate.png.meta (98%) create mode 100644 TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png rename TestProjects/{HDRP_Tests => HDRP_RuntimeTests}/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png.meta (98%) create mode 100644 TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/003-VirtualTexturing.png rename TestProjects/{HDRP_Tests => HDRP_RuntimeTests}/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/003-VirtualTexturing.png.meta (98%) delete mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/001-HDTemplate.png delete mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png delete mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/003-VirtualTexturing.png diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12.meta b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12.meta similarity index 77% rename from TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12.meta rename to TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12.meta index 807ab0df033..6e457387ba5 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12.meta +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 96a3b107f424bad41bd21adfa09c66dc +guid: 1abecc8f2ffc63744bec279b9acafcd6 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None.meta b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None.meta similarity index 77% rename from TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None.meta rename to TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None.meta index 07509e65010..12f86b6986b 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None.meta +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3c7d235afdedb2445a4d7b538f4651e4 +guid: e6477f9434e8bc34a8ba35db1d932b65 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/001-HDTemplate.png b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/001-HDTemplate.png new file mode 100644 index 00000000000..b9d874ffe49 --- /dev/null +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/001-HDTemplate.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a3d0b1985b75622b040665de3007263fdf2adf4a49cd410b5690f039728c5b4 +size 2562487 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/001-HDTemplate.png.meta b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/001-HDTemplate.png.meta similarity index 98% rename from TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/001-HDTemplate.png.meta rename to TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/001-HDTemplate.png.meta index c2dcfde291b..a1bf9afea38 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/001-HDTemplate.png.meta +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/001-HDTemplate.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9b14fc2710c848e42a0ba901b554f906 +guid: 2c3773af38f29b546bec60eb62b3ec54 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png new file mode 100644 index 00000000000..0dc63f42c7e --- /dev/null +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c49718d27745985e588e93b91eed79b8319c16355cfae58669b0e11222a22526 +size 2295157 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png.meta b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png.meta similarity index 98% rename from TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png.meta rename to TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png.meta index 7b78d03a38c..49a7b6d8838 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png.meta +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a60f182c9ada39b44b0e1b0aef954d39 +guid: 3b19c0c8c6f62a844bd23f9edde7cb41 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/003-VirtualTexturing.png b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/003-VirtualTexturing.png new file mode 100644 index 00000000000..4d84c414580 --- /dev/null +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/003-VirtualTexturing.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c64cbaac1913b5677777d0f106ba7a96556dd9ea3580cfc0ce75c4f0bc23b440 +size 764214 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/003-VirtualTexturing.png.meta b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/003-VirtualTexturing.png.meta similarity index 98% rename from TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/003-VirtualTexturing.png.meta rename to TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/003-VirtualTexturing.png.meta index ff87a7eca51..365d62e3a74 100644 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/003-VirtualTexturing.png.meta +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/003-VirtualTexturing.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fef85bc7a4398a24aa52d88966581f31 +guid: b3ddf897ecae2ac41b6164063f87597b TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/TestProjects/HDRP_RuntimeTests/ProjectSettings/ProjectSettings.asset b/TestProjects/HDRP_RuntimeTests/ProjectSettings/ProjectSettings.asset index 4af54930a7c..7b40051c95d 100644 --- a/TestProjects/HDRP_RuntimeTests/ProjectSettings/ProjectSettings.asset +++ b/TestProjects/HDRP_RuntimeTests/ProjectSettings/ProjectSettings.asset @@ -269,7 +269,16 @@ PlayerSettings: m_GraphicsJobMode: 0 - m_BuildTarget: XboxOnePlayer m_GraphicsJobMode: 0 - m_BuildTargetGraphicsAPIs: [] + m_BuildTargetGraphicsAPIs: + - m_BuildTarget: LinuxStandaloneSupport + m_APIs: 1100000015000000 + m_Automatic: 1 + - m_BuildTarget: MacStandaloneSupport + m_APIs: 10000000 + m_Automatic: 0 + - m_BuildTarget: WindowsStandaloneSupport + m_APIs: 020000001500000012000000 + m_Automatic: 0 m_BuildTargetVRSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/001-HDTemplate.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/001-HDTemplate.png deleted file mode 100644 index 00b2a4fd77d..00000000000 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/001-HDTemplate.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1dc134cc8f4b5f1c0fb4ee9f8cb33fbf506d2edab786c2a9b796692d55ce0153 -size 2562004 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png deleted file mode 100644 index 3345a22d70b..00000000000 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/002-HDMaterials.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:444d9757a3efc034d63649f196531dae7c31037577d0c731b3c0c6d250cd6e6a -size 2295182 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/003-VirtualTexturing.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/003-VirtualTexturing.png deleted file mode 100644 index 2f12fb9ef2c..00000000000 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsPlayer/Vulkan/None/003-VirtualTexturing.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2c4ba004714177c01d9fbe2fbf36d76bf33845d0f82fe45390d412e937402bb -size 764168 diff --git a/TestProjects/HDRP_Tests/ProjectSettings/ProjectSettings.asset b/TestProjects/HDRP_Tests/ProjectSettings/ProjectSettings.asset index aa8fbc9f8a0..cf87a112447 100644 --- a/TestProjects/HDRP_Tests/ProjectSettings/ProjectSettings.asset +++ b/TestProjects/HDRP_Tests/ProjectSettings/ProjectSettings.asset @@ -277,10 +277,7 @@ PlayerSettings: m_BuildTargetBatching: [] m_BuildTargetGraphicsAPIs: - m_BuildTarget: WindowsStandaloneSupport - m_APIs: 020000001200000015000000 - m_Automatic: 0 - - m_BuildTarget: MacStandaloneSupport - m_APIs: 10000000 + m_APIs: 0200000015000000 m_Automatic: 0 m_BuildTargetVRSettings: [] m_BuildTargetEnableVuforiaSettings: [] From 8710c6a2486dcb0f73a8358f3f42d006308d3418 Mon Sep 17 00:00:00 2001 From: Theo Penavaire Date: Fri, 29 May 2020 17:36:10 +0200 Subject: [PATCH 6/8] Add reference images for metal (OSX) --- .../ReferenceImages/Linear/OSXPlayer.meta | 8 ++ .../Linear/OSXPlayer/Metal.meta | 8 ++ .../Linear/OSXPlayer/Metal/None.meta | 8 ++ .../OSXPlayer/Metal/None/001-HDTemplate.png | 3 + .../Metal/None/001-HDTemplate.png.meta | 96 +++++++++++++++++++ .../OSXPlayer/Metal/None/002-HDMaterials.png | 3 + .../Metal/None/002-HDMaterials.png.meta | 96 +++++++++++++++++++ .../Metal/None/003-VirtualTexturing.png | 3 + .../Metal/None/003-VirtualTexturing.png.meta | 96 +++++++++++++++++++ 9 files changed, 321 insertions(+) create mode 100644 TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer.meta create mode 100644 TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal.meta create mode 100644 TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None.meta create mode 100644 TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/001-HDTemplate.png create mode 100644 TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/001-HDTemplate.png.meta create mode 100644 TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/002-HDMaterials.png create mode 100644 TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/002-HDMaterials.png.meta create mode 100644 TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing.png create mode 100644 TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing.png.meta diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer.meta b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer.meta new file mode 100644 index 00000000000..9c1920c3a93 --- /dev/null +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5d00098674f728840b929366d1a91a5c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal.meta b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal.meta new file mode 100644 index 00000000000..b6b900cd401 --- /dev/null +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e7b139b4bfb0c3a4cb6254d10aa28806 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None.meta b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None.meta new file mode 100644 index 00000000000..ceb359b8495 --- /dev/null +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 85bcd00eeaa45ac42b4da1cce440e444 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/001-HDTemplate.png b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/001-HDTemplate.png new file mode 100644 index 00000000000..0370f26acce --- /dev/null +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/001-HDTemplate.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffc14f67a85a2ad40c4dcc0bcf5c01e467f67affc84e4a0659d3c71e5a418e3f +size 2550746 diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/001-HDTemplate.png.meta b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/001-HDTemplate.png.meta new file mode 100644 index 00000000000..05a87999988 --- /dev/null +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/001-HDTemplate.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: cee75051bd22b8b48a7218d4a48f60a6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + 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: 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/002-HDMaterials.png b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/002-HDMaterials.png new file mode 100644 index 00000000000..fcffe80792c --- /dev/null +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/002-HDMaterials.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d55f533a0b06602617c09a16aea7ff6064509175c7fbb5d6895d19dd7e6ab7aa +size 1286569 diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/002-HDMaterials.png.meta b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/002-HDMaterials.png.meta new file mode 100644 index 00000000000..ab7111427eb --- /dev/null +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/002-HDMaterials.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 3733b0232faf0064dbccb89518d5a6e5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + 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: 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing.png b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing.png new file mode 100644 index 00000000000..88ffdf677b0 --- /dev/null +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea5c4c862a23ef93713d95d88c267258de3f0f39f3e1a421e78f1d93a15d47f3 +size 786703 diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing.png.meta b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing.png.meta new file mode 100644 index 00000000000..50ea4e3f567 --- /dev/null +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/003-VirtualTexturing.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 8dc388fcd42974b4bb29c2acebf50c7e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + 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: 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: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: From d114a657f482f36590efc1319c32bddaf7e35ad1 Mon Sep 17 00:00:00 2001 From: Theo Penavaire Date: Thu, 4 Jun 2020 12:03:07 +0200 Subject: [PATCH 7/8] Add reference image for DX12's VirtualTexturing test --- .../Direct3D12/None/003-VirtualTexturing.png | 3 + .../None/003-VirtualTexturing.png.meta | 96 +++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/003-VirtualTexturing.png create mode 100644 TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/003-VirtualTexturing.png.meta diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/003-VirtualTexturing.png b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/003-VirtualTexturing.png new file mode 100644 index 00000000000..f1d37da2f58 --- /dev/null +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/003-VirtualTexturing.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4fd4f7c990a96de1dfd8d8aaf769326f1b9d0cdad5ede666e17e78decea90cf3 +size 777890 diff --git a/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/003-VirtualTexturing.png.meta b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/003-VirtualTexturing.png.meta new file mode 100644 index 00000000000..b1891979b85 --- /dev/null +++ b/TestProjects/HDRP_RuntimeTests/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D12/None/003-VirtualTexturing.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 5673c6e6bcac35245b3220337f4cc19d +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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: From 61aa264ef580f1856269f86ddf2059de7a234625 Mon Sep 17 00:00:00 2001 From: Theo Penavaire Date: Wed, 10 Jun 2020 10:30:54 +0200 Subject: [PATCH 8/8] Temporarily disable dx12 & vulkan tests in all_hdrp_ci --- .yamato/all-hdrp.yml | 12 ------------ .yamato/config/hdrp.metafile | 4 ++-- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.yamato/all-hdrp.yml b/.yamato/all-hdrp.yml index f78d11d474d..6153a1dfe8c 100644 --- a/.yamato/all-hdrp.yml +++ b/.yamato/all-hdrp.yml @@ -18,12 +18,8 @@ All_HDRP_trunk: rerun: on-new-revision - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_XR_trunk rerun: on-new-revision - - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_Standalone_trunk - rerun: on-new-revision - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_trunk rerun: on-new-revision - - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_Standalone_trunk - rerun: on-new-revision - path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_Standalone_trunk rerun: on-new-revision - path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_editmode_trunk @@ -51,12 +47,8 @@ All_HDRP_fast-trunk: rerun: on-new-revision - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_XR_fast-trunk rerun: on-new-revision - - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_Standalone_fast-trunk - rerun: on-new-revision - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_fast-trunk rerun: on-new-revision - - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_Standalone_fast-trunk - rerun: on-new-revision - path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_Standalone_fast-trunk rerun: on-new-revision - path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_editmode_fast-trunk @@ -84,12 +76,8 @@ All_HDRP_CUSTOM-REVISION: rerun: always - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_XR_CUSTOM-REVISION rerun: always - - path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_Standalone_CUSTOM-REVISION - rerun: always - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_CUSTOM-REVISION rerun: always - - path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_Standalone_CUSTOM-REVISION - rerun: always - path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_Standalone_CUSTOM-REVISION rerun: always - path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_editmode_CUSTOM-REVISION diff --git a/.yamato/config/hdrp.metafile b/.yamato/config/hdrp.metafile index a2e3771bef7..f9f364ec47a 100644 --- a/.yamato/config/hdrp.metafile +++ b/.yamato/config/hdrp.metafile @@ -33,12 +33,12 @@ all: test_platforms: - playmode - playmode_XR - - Standalone + # - Standalone - platform: Win api: Vulkan test_platforms: - playmode - - Standalone + # - Standalone - platform: OSX api: Metal test_platforms: