diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/029_Particles/Shaders/CustomParticleData.shader b/TestProjects/UniversalGraphicsTest/Assets/Scenes/029_Particles/Shaders/CustomParticleData.shader index 00cde1e7ffa..e37def1b919 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/029_Particles/Shaders/CustomParticleData.shader +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/029_Particles/Shaders/CustomParticleData.shader @@ -26,6 +26,7 @@ float4 vertex : POSITION; float4 uv : TEXCOORD0; float3 uv2 : TEXCOORD1; + UNITY_VERTEX_INPUT_INSTANCE_ID }; struct v2f @@ -35,11 +36,14 @@ UNITY_FOG_COORDS(1) float4 vertex : SV_POSITION; + UNITY_VERTEX_OUTPUT_STEREO }; v2f vert (appdata v) { v2f o; + UNITY_SETUP_INSTANCE_ID(v); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); o.vertex = UnityObjectToClipPos(v.vertex); o.uv = v.uv; o.uv2 = v.uv2; diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/046_Camera_OpaqueTexture/CameraOpaque.shader b/TestProjects/UniversalGraphicsTest/Assets/Scenes/046_Camera_OpaqueTexture/CameraOpaque.shader index aef65e2ff74..767f44637d3 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/046_Camera_OpaqueTexture/CameraOpaque.shader +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/046_Camera_OpaqueTexture/CameraOpaque.shader @@ -20,11 +20,13 @@ #pragma multi_compile_fog #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" + #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/DeclareOpaqueTexture.hlsl" struct appdata { float4 vertex : POSITION; float2 uv : TEXCOORD0; + UNITY_VERTEX_INPUT_INSTANCE_ID }; struct v2f @@ -32,14 +34,14 @@ float2 uv : TEXCOORD0; float4 vertex : SV_POSITION; float4 screenUV : TEXCOORD1; + UNITY_VERTEX_OUTPUT_STEREO }; - TEXTURE2D(_CameraOpaqueTexture); - SAMPLER(sampler_CameraOpaqueTexture_linear_clamp); - v2f vert (appdata v) { v2f o; + UNITY_SETUP_INSTANCE_ID(v); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); o.vertex = TransformObjectToHClip(v.vertex); o.uv = v.uv; o.screenUV = ComputeScreenPos(o.vertex); @@ -48,14 +50,15 @@ half4 frag (v2f i) : SV_Target { + UNITY_SETUP_STEREO_EYE_INDEX_POST_VERTEX(i); // sample the texture half2 screenUV = i.screenUV.xy / i.screenUV.w; half v = 0.05; screenUV += (frac(screenUV * 80) * v) - v * 0.5; half4 col = half4(-0.05, 0, -0.05, 1); - col.r += SAMPLE_TEXTURE2D(_CameraOpaqueTexture, sampler_CameraOpaqueTexture_linear_clamp, ((screenUV - 0.5) * 1.1) + 0.5).r; - col.g += SAMPLE_TEXTURE2D(_CameraOpaqueTexture, sampler_CameraOpaqueTexture_linear_clamp, screenUV).g; - col.b += SAMPLE_TEXTURE2D(_CameraOpaqueTexture, sampler_CameraOpaqueTexture_linear_clamp, ((screenUV - 0.5) * 0.9) + 0.5).b; + col.r += SampleSceneColor(((screenUV - 0.5) * 1.1) + 0.5).r; + col.g += SampleSceneColor(screenUV).g; + col.b += SampleSceneColor(((screenUV - 0.5) * 0.9) + 0.5).b; return col; } ENDHLSL diff --git a/com.unity.render-pipelines.universal/Shaders/2D/Sprite-Lit-Default.shader b/com.unity.render-pipelines.universal/Shaders/2D/Sprite-Lit-Default.shader index 7c469036f33..0fdc1ac1cae 100644 --- a/com.unity.render-pipelines.universal/Shaders/2D/Sprite-Lit-Default.shader +++ b/com.unity.render-pipelines.universal/Shaders/2D/Sprite-Lit-Default.shader @@ -43,6 +43,7 @@ Shader "Universal Render Pipeline/2D/Sprite-Lit-Default" float3 positionOS : POSITION; float4 color : COLOR; float2 uv : TEXCOORD0; + UNITY_VERTEX_INPUT_INSTANCE_ID }; struct Varyings @@ -51,6 +52,7 @@ Shader "Universal Render Pipeline/2D/Sprite-Lit-Default" float4 color : COLOR; float2 uv : TEXCOORD0; float2 lightingUV : TEXCOORD1; + UNITY_VERTEX_OUTPUT_STEREO }; #include "Packages/com.unity.render-pipelines.universal/Shaders/2D/Include/LightingUtility.hlsl" @@ -83,6 +85,8 @@ Shader "Universal Render Pipeline/2D/Sprite-Lit-Default" Varyings CombinedShapeLightVertex(Attributes v) { Varyings o = (Varyings)0; + UNITY_SETUP_INSTANCE_ID(v); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); o.positionCS = TransformObjectToHClip(v.positionOS); o.uv = TRANSFORM_TEX(v.uv, _MainTex); @@ -118,6 +122,7 @@ Shader "Universal Render Pipeline/2D/Sprite-Lit-Default" float4 color : COLOR; float2 uv : TEXCOORD0; float4 tangent : TANGENT; + UNITY_VERTEX_INPUT_INSTANCE_ID }; struct Varyings @@ -128,6 +133,7 @@ Shader "Universal Render Pipeline/2D/Sprite-Lit-Default" float3 normalWS : TEXCOORD1; float3 tangentWS : TEXCOORD2; float3 bitangentWS : TEXCOORD3; + UNITY_VERTEX_OUTPUT_STEREO }; TEXTURE2D(_MainTex); @@ -139,6 +145,8 @@ Shader "Universal Render Pipeline/2D/Sprite-Lit-Default" Varyings NormalsRenderingVertex(Attributes attributes) { Varyings o = (Varyings)0; + UNITY_SETUP_INSTANCE_ID(attributes); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); o.positionCS = TransformObjectToHClip(attributes.positionOS); o.uv = TRANSFORM_TEX(attributes.uv, _NormalMap); @@ -174,6 +182,7 @@ Shader "Universal Render Pipeline/2D/Sprite-Lit-Default" float3 positionOS : POSITION; float4 color : COLOR; float2 uv : TEXCOORD0; + UNITY_VERTEX_INPUT_INSTANCE_ID }; struct Varyings @@ -181,6 +190,7 @@ Shader "Universal Render Pipeline/2D/Sprite-Lit-Default" float4 positionCS : SV_POSITION; float4 color : COLOR; float2 uv : TEXCOORD0; + UNITY_VERTEX_OUTPUT_STEREO }; TEXTURE2D(_MainTex); @@ -190,6 +200,8 @@ Shader "Universal Render Pipeline/2D/Sprite-Lit-Default" Varyings UnlitVertex(Attributes attributes) { Varyings o = (Varyings)0; + UNITY_SETUP_INSTANCE_ID(attributes); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); o.positionCS = TransformObjectToHClip(attributes.positionOS); o.uv = TRANSFORM_TEX(attributes.uv, _MainTex);