fix: use the same cbuffer for Universal2D pass (#613)

sindharta · web-flow · commit a4dd01bf9a98 · 2025-11-29T17:29:05.000+09:00
* use the same UniversalToonInput
* generate shaders
diff --git a/com.unity.toonshader/Runtime/Integrated/Shaders/UnityToon.shader b/com.unity.toonshader/Runtime/Integrated/Shaders/UnityToon.shader
@@ -1,4 +1,4 @@
-//Auto-generated on Thu Nov 27 05:21:40 UTC 2025
+//Auto-generated on Fri Nov 28 12:09:28 UTC 2025
 Shader "Toon" {
     Properties
     {
@@ -1385,7 +1385,7 @@ Shader "Toon" {
 
             // -------------------------------------
             // Includes
-            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitInput.hlsl"
+            #include "../../UniversalRP/Shaders/UniversalToonInput.hlsl"
             #include "../../UniversalRP/Shaders/UniversalBasic2D.hlsl"
             ENDHLSL
         }
diff --git a/com.unity.toonshader/Runtime/Integrated/Shaders/UnityToonTessellation.shader b/com.unity.toonshader/Runtime/Integrated/Shaders/UnityToonTessellation.shader
@@ -1,4 +1,4 @@
-//Auto-generated on Thu Nov 27 05:21:40 UTC 2025
+//Auto-generated on Fri Nov 28 12:09:28 UTC 2025
 Shader "Toon(Tessellation)" {
     Properties
     {
@@ -1422,7 +1422,7 @@ Shader "Toon(Tessellation)" {
 
             // -------------------------------------
             // Includes
-            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitInput.hlsl"
+            #include "../../UniversalRP/Shaders/UniversalToonInput.hlsl"
             #include "../../UniversalRP/Shaders/UniversalBasic2D.hlsl"
             ENDHLSL
         }
diff --git a/com.unity.toonshader/Runtime/Shaders/Common/Parts/UnityToon.shadertemplate b/com.unity.toonshader/Runtime/Shaders/Common/Parts/UnityToon.shadertemplate
@@ -899,7 +899,7 @@ Shader "Toon" {
 
             // -------------------------------------
             // Includes
-            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitInput.hlsl"
+            #include "../../UniversalRP/Shaders/UniversalToonInput.hlsl"
             #include "../../UniversalRP/Shaders/UniversalBasic2D.hlsl"
             ENDHLSL
         }
diff --git a/com.unity.toonshader/Runtime/Shaders/Common/Parts/UnityToonTessellation.shadertemplate b/com.unity.toonshader/Runtime/Shaders/Common/Parts/UnityToonTessellation.shadertemplate
@@ -920,7 +920,7 @@ Shader "Toon(Tessellation)" {
 
             // -------------------------------------
             // Includes
-            #include "Packages/com.unity.render-pipelines.universal/Shaders/LitInput.hlsl"
+            #include "../../UniversalRP/Shaders/UniversalToonInput.hlsl"
             #include "../../UniversalRP/Shaders/UniversalBasic2D.hlsl"
             ENDHLSL
         }
diff --git a/com.unity.toonshader/Runtime/UniversalRP/Shaders/UniversalBasic2D.hlsl b/com.unity.toonshader/Runtime/UniversalRP/Shaders/UniversalBasic2D.hlsl
@@ -1,9 +1,6 @@
 #ifndef UNIVERSAL_UTS_FALLBACK_2D_INCLUDED
 #define UNIVERSAL_UTS_FALLBACK_2D_INCLUDED
 
-float4 _MainTex_ST;
-TEXTURE2D(_MainTex); SAMPLER(sampler_MainTex);
-
 struct Attributes
 {
     float4 positionOS       : POSITION;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//Auto-generated on Thu Nov 27 05:21:40 UTC 2025`
	`1`	`+//Auto-generated on Fri Nov 28 12:09:28 UTC 2025`
`2`	`2`	`Shader "Toon" {`
`3`	`3`	`Properties`
`4`	`4`	`{`
`@@ -1385,7 +1385,7 @@ Shader "Toon" {`
`1385`	`1385`
`1386`	`1386`	`// -------------------------------------`
`1387`	`1387`	`// Includes`
`1388`		`- #include "Packages/com.unity.render-pipelines.universal/Shaders/LitInput.hlsl"`
	`1388`	`+ #include "../../UniversalRP/Shaders/UniversalToonInput.hlsl"`
`1389`	`1389`	`#include "../../UniversalRP/Shaders/UniversalBasic2D.hlsl"`
`1390`	`1390`	`ENDHLSL`
`1391`	`1391`	`}`
Original file line number	Diff line number	Diff line change
`@@ -899,7 +899,7 @@ Shader "Toon" {`
`899`	`899`
`900`	`900`	`// -------------------------------------`
`901`	`901`	`// Includes`
`902`		`- #include "Packages/com.unity.render-pipelines.universal/Shaders/LitInput.hlsl"`
	`902`	`+ #include "../../UniversalRP/Shaders/UniversalToonInput.hlsl"`
`903`	`903`	`#include "../../UniversalRP/Shaders/UniversalBasic2D.hlsl"`
`904`	`904`	`ENDHLSL`
`905`	`905`	`}`
Original file line number	Diff line number	Diff line change
`@@ -920,7 +920,7 @@ Shader "Toon(Tessellation)" {`
`920`	`920`
`921`	`921`	`// -------------------------------------`
`922`	`922`	`// Includes`
`923`		`- #include "Packages/com.unity.render-pipelines.universal/Shaders/LitInput.hlsl"`
	`923`	`+ #include "../../UniversalRP/Shaders/UniversalToonInput.hlsl"`
`924`	`924`	`#include "../../UniversalRP/Shaders/UniversalBasic2D.hlsl"`
`925`	`925`	`ENDHLSL`
`926`	`926`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,6 @@`
`1`	`1`	`#ifndef UNIVERSAL_UTS_FALLBACK_2D_INCLUDED`
`2`	`2`	`#define UNIVERSAL_UTS_FALLBACK_2D_INCLUDED`
`3`	`3`
`4`		`-float4 _MainTex_ST;`
`5`		`-TEXTURE2D(_MainTex); SAMPLER(sampler_MainTex);`
`6`		`-`
`7`	`4`	`struct Attributes`
`8`	`5`	`{`
`9`	`6`	`float4 positionOS : POSITION;`