From 68df46ac54594e2ba1e89581913075d72595bb59 Mon Sep 17 00:00:00 2001 From: Fabien Houlmann Date: Fri, 3 Jul 2020 10:04:31 -0400 Subject: [PATCH 1/4] remove reference images for 9601 and 9602 on Vulkan WindowsEditor to force regenerate them --- .../WindowsEditor/Vulkan/None/9601_SkinnedMeshBatching-Off.png | 3 --- .../WindowsEditor/Vulkan/None/9602_SkinnedMeshBatching-On.png | 3 --- 2 files changed, 6 deletions(-) delete mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9601_SkinnedMeshBatching-Off.png delete mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9602_SkinnedMeshBatching-On.png diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9601_SkinnedMeshBatching-Off.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9601_SkinnedMeshBatching-Off.png deleted file mode 100644 index 9baa341bc40..00000000000 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9601_SkinnedMeshBatching-Off.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:09427c8b5b88d69f35f3acba345339e929e5179a5ffc1ad11d33e2d4274b27a8 -size 111483 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9602_SkinnedMeshBatching-On.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9602_SkinnedMeshBatching-On.png deleted file mode 100644 index 92f2db5fdce..00000000000 --- a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9602_SkinnedMeshBatching-On.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:77aaba8a603ef5088045a67a652f277be7a506ee1e4db19c252b74bf0bae556f -size 111486 From 101b4b69068b776f92ecde96764d53f2b7835591 Mon Sep 17 00:00:00 2001 From: Fabien Houlmann Date: Mon, 6 Jul 2020 10:46:27 -0400 Subject: [PATCH 2/4] update reference images (9601, 9602) from Yamato artifacts for Vulkan --- .../WindowsEditor/Vulkan/None/9601_SkinnedMeshBatching-Off.png | 3 +++ .../WindowsEditor/Vulkan/None/9602_SkinnedMeshBatching-On.png | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9601_SkinnedMeshBatching-Off.png create mode 100644 TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9602_SkinnedMeshBatching-On.png diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9601_SkinnedMeshBatching-Off.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9601_SkinnedMeshBatching-Off.png new file mode 100644 index 00000000000..a15907cd9ea --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9601_SkinnedMeshBatching-Off.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f7b45b6ffdad0548e77b314c9fb2129dd5c6ab40f0314cf30e663a95a8b5ddf +size 111784 diff --git a/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9602_SkinnedMeshBatching-On.png b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9602_SkinnedMeshBatching-On.png new file mode 100644 index 00000000000..6b91799e821 --- /dev/null +++ b/TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Vulkan/None/9602_SkinnedMeshBatching-On.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0743105eb58163defe80745d8869ae5e1ec428fe062859ec51a84548621fb3c +size 111789 From d369a1c68bf77b75ecf8c005cae5f6922f729586 Mon Sep 17 00:00:00 2001 From: Fabien Houlmann Date: Mon, 6 Jul 2020 10:47:07 -0400 Subject: [PATCH 3/4] fix shader macros for tessellation and XR single-pass --- .../Runtime/RenderPipeline/ShaderPass/VertMesh.hlsl | 3 --- 1 file changed, 3 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/VertMesh.hlsl b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/VertMesh.hlsl index 61d5ddbcb91..0041ee55a83 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/VertMesh.hlsl +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/VertMesh.hlsl @@ -45,8 +45,6 @@ struct PackedVaryingsToDS #ifdef VARYINGS_NEED_PASS PackedVaryingsPassToDS vpass; #endif - - UNITY_VERTEX_OUTPUT_STEREO }; PackedVaryingsToDS PackVaryingsToDS(VaryingsToDS input) @@ -57,7 +55,6 @@ PackedVaryingsToDS PackVaryingsToDS(VaryingsToDS input) output.vpass = PackVaryingsPassToDS(input.vpass); #endif - UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output); return output; } From 05e8b3ac8c920b7403f80193c7dedf60a002f18c Mon Sep 17 00:00:00 2001 From: Fabien Houlmann Date: Mon, 6 Jul 2020 17:33:38 -0400 Subject: [PATCH 4/4] restore shader changes (moved to another branch) --- .../Runtime/RenderPipeline/ShaderPass/VertMesh.hlsl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/VertMesh.hlsl b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/VertMesh.hlsl index 0041ee55a83..61d5ddbcb91 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/VertMesh.hlsl +++ b/com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/ShaderPass/VertMesh.hlsl @@ -45,6 +45,8 @@ struct PackedVaryingsToDS #ifdef VARYINGS_NEED_PASS PackedVaryingsPassToDS vpass; #endif + + UNITY_VERTEX_OUTPUT_STEREO }; PackedVaryingsToDS PackVaryingsToDS(VaryingsToDS input) @@ -55,6 +57,7 @@ PackedVaryingsToDS PackVaryingsToDS(VaryingsToDS input) output.vpass = PackVaryingsPassToDS(input.vpass); #endif + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(output); return output; }