fixed shader compatibility issue

i-saint · i-saint · commit 022e0086e983 · 2015-04-03T16:53:59.000+09:00
diff --git a/Assets/UnityChan/CandyRockStar/Shader/CharaMain.cg b/Assets/UnityChan/CandyRockStar/Shader/CharaMain.cg
@@ -120,7 +120,7 @@ inline float3_t GetNormalFromMap( v2f input )
 #endif
 
 // Fragment shader
-float4 frag( v2f i ) : COLOR
+float4 frag( v2f i ) : SV_Target
 {
 	float4_t diffSamplerColor = tex2D( _MainTex, i.uv.xy );
 
diff --git a/Assets/UnityChan/CandyRockStar/Shader/CharaOutline.cg b/Assets/UnityChan/CandyRockStar/Shader/CharaOutline.cg
@@ -45,7 +45,7 @@ v2f vert( appdata_base v )
 }
 
 // Fragment shader
-float4 frag( v2f i ) : COLOR
+float4 frag( v2f i ) : SV_Target
 {
 	float4_t diffuseMapColor = tex2D( _MainTex, i.uv );
 
diff --git a/Assets/UnityChan/CandyRockStar/Shader/CharaSkin.cg b/Assets/UnityChan/CandyRockStar/Shader/CharaSkin.cg
@@ -70,7 +70,7 @@ v2f vert( appdata_base v )
 }
 
 // Fragment shader
-float4 frag( v2f i ) : COLOR
+float4 frag( v2f i ) : SV_Target
 {
 	float4_t diffSamplerColor = tex2D( _MainTex, i.uv );
 
diff --git a/Assets/UnityChan/CandyRockStar/Shader/Unitychan_chara_akarami_blend.shader b/Assets/UnityChan/CandyRockStar/Shader/Unitychan_chara_akarami_blend.shader
@@ -42,3 +42,4 @@ ENDCG
 
 	FallBack "Transparent/Diffuse"
 }
+
diff --git a/Assets/UnityChan/CandyRockStar/Shader/Unitychan_chara_eye.shader b/Assets/UnityChan/CandyRockStar/Shader/Unitychan_chara_eye.shader
@@ -39,3 +39,4 @@ ENDCG
 
 	FallBack "Diffuse"
 }
+
diff --git a/Assets/UnityChan/CandyRockStar/Shader/Unitychan_chara_eye_blend.shader b/Assets/UnityChan/CandyRockStar/Shader/Unitychan_chara_eye_blend.shader
@@ -41,3 +41,4 @@ ENDCG
 
 	FallBack "Transparent/Diffuse"
 }
+
diff --git a/Assets/UnityChan/CandyRockStar/Shader/Unitychan_chara_eyelash_blend.shader b/Assets/UnityChan/CandyRockStar/Shader/Unitychan_chara_eyelash_blend.shader
@@ -41,3 +41,4 @@ ENDCG
 
 	FallBack "Transparent/Diffuse"
 }
+
diff --git a/Assets/UnityChan/CandyRockStar/Shader/Unitychan_chara_fuku.shader b/Assets/UnityChan/CandyRockStar/Shader/Unitychan_chara_fuku.shader
@@ -186,3 +186,4 @@ ENDCG
 
 	FallBack "Diffuse"
 }
+
diff --git a/Assets/UnityChan/CandyRockStar/Shader/Unitychan_chara_fuku_ds.shader b/Assets/UnityChan/CandyRockStar/Shader/Unitychan_chara_fuku_ds.shader
@@ -189,3 +189,4 @@ ENDCG
 
 	FallBack "Diffuse"
 }
+
diff --git a/Assets/UnityChan/CandyRockStar/Shader/Unitychan_chara_hada.shader b/Assets/UnityChan/CandyRockStar/Shader/Unitychan_chara_hada.shader
@@ -109,3 +109,4 @@ ENDCG
 
 	FallBack "Diffuse"
 }
+
diff --git a/Assets/UnityChan/CandyRockStar/Shader/Unitychan_chara_hada_blend.shader b/Assets/UnityChan/CandyRockStar/Shader/Unitychan_chara_hada_blend.shader
@@ -41,3 +41,4 @@ ENDCG
 
 	FallBack "Transparent/Diffuse"
 }
+
diff --git a/Assets/UnityChan/CandyRockStar/Shader/Unitychan_chara_hair.shader b/Assets/UnityChan/CandyRockStar/Shader/Unitychan_chara_hair.shader
@@ -186,3 +186,4 @@ ENDCG
 
 	FallBack "Diffuse"
 }
+
diff --git a/Assets/UnityChan/CandyRockStar/Shader/Unitychan_chara_hair_ds.shader b/Assets/UnityChan/CandyRockStar/Shader/Unitychan_chara_hair_ds.shader
@@ -188,3 +188,4 @@ ENDCG
 
 	FallBack "Diffuse"
 }
+
diff --git a/Assets/UnityChanStage/Visualizer/CopyDepth.shader b/Assets/UnityChanStage/Visualizer/CopyDepth.shader
@@ -24,7 +24,7 @@ SubShader {
 
 	struct ps_out
 	{
-		float4 color : COLOR0;
+		float4 color : SV_Target;
 	};
 
 

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ inline float3_t GetNormalFromMap( v2f input )`
`120`	`120`	`#endif`
`121`	`121`
`122`	`122`	`// Fragment shader`
`123`		`-float4 frag( v2f i ) : COLOR`
	`123`	`+float4 frag( v2f i ) : SV_Target`
`124`	`124`	`{`
`125`	`125`	`float4_t diffSamplerColor = tex2D( _MainTex, i.uv.xy );`
`126`	`126`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ v2f vert( appdata_base v )`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`// Fragment shader`
`48`		`-float4 frag( v2f i ) : COLOR`
	`48`	`+float4 frag( v2f i ) : SV_Target`
`49`	`49`	`{`
`50`	`50`	`float4_t diffuseMapColor = tex2D( _MainTex, i.uv );`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ v2f vert( appdata_base v )`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`// Fragment shader`
`73`		`-float4 frag( v2f i ) : COLOR`
	`73`	`+float4 frag( v2f i ) : SV_Target`
`74`	`74`	`{`
`75`	`75`	`float4_t diffSamplerColor = tex2D( _MainTex, i.uv );`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -42,3 +42,4 @@ ENDCG`
`42`	`42`
`43`	`43`	`FallBack "Transparent/Diffuse"`
`44`	`44`	`}`
	`45`	`+`
Original file line number	Diff line number	Diff line change
`@@ -39,3 +39,4 @@ ENDCG`
`39`	`39`
`40`	`40`	`FallBack "Diffuse"`
`41`	`41`	`}`
	`42`	`+`
Original file line number	Diff line number	Diff line change
`@@ -41,3 +41,4 @@ ENDCG`
`41`	`41`
`42`	`42`	`FallBack "Transparent/Diffuse"`
`43`	`43`	`}`
	`44`	`+`
Original file line number	Diff line number	Diff line change
`@@ -186,3 +186,4 @@ ENDCG`
`186`	`186`
`187`	`187`	`FallBack "Diffuse"`
`188`	`188`	`}`
	`189`	`+`
Original file line number	Diff line number	Diff line change
`@@ -189,3 +189,4 @@ ENDCG`
`189`	`189`
`190`	`190`	`FallBack "Diffuse"`
`191`	`191`	`}`
	`192`	`+`
Original file line number	Diff line number	Diff line change
`@@ -109,3 +109,4 @@ ENDCG`
`109`	`109`
`110`	`110`	`FallBack "Diffuse"`
`111`	`111`	`}`
	`112`	`+`