UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[unity] Fixed fragment shader output (from COLOR to SV_Target), fixes ps4 shader compile error. Closes #1374.

Browse Source
This commit is contained in:
Harald Csaszar 2019-07-10 12:38:21 +02:00
parent 713e24c0a0
commit e229dab539
9 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Shaders/Spine-Special-Skeleton-Grayscale.shader
View File

@ -102,7 +102,7 @@ Shader "Spine/Special/Skeleton Grayscale" {
return o; return o;
} }
float4 frag (VertexOutput i) : COLOR { float4 frag (VertexOutput i) : SV_Target {
fixed4 texcol = tex2D(_MainTex, i.uvAndAlpha.xy); fixed4 texcol = tex2D(_MainTex, i.uvAndAlpha.xy);
clip(texcol.a * i.uvAndAlpha.a - _Cutoff); clip(texcol.a * i.uvAndAlpha.a - _Cutoff);
SHADOW_CASTER_FRAGMENT(i) SHADOW_CASTER_FRAGMENT(i)

2
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Shaders/Sprite/CGIncludes/SpriteShadows.cginc
View File

@ -40,7 +40,7 @@ vertexOutput vert(vertexInput v, float4 vertexColor : COLOR)
uniform fixed _ShadowAlphaCutoff; uniform fixed _ShadowAlphaCutoff;
fixed4 frag(vertexOutput IN) : COLOR fixed4 frag(vertexOutput IN) : SV_Target
{ {
fixed4 texureColor = calculateTexturePixel(IN.texcoordAndAlpha.xy); fixed4 texureColor = calculateTexturePixel(IN.texcoordAndAlpha.xy);
clip(texureColor.a * IN.texcoordAndAlpha.a - _ShadowAlphaCutoff); clip(texureColor.a * IN.texcoordAndAlpha.a - _ShadowAlphaCutoff);

2
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Shaders/Sprite/SpriteShadows.cginc
View File

@ -43,7 +43,7 @@ vertexOutput vert(vertexInput v, float4 vertexColor : COLOR)
uniform fixed _ShadowAlphaCutoff; uniform fixed _ShadowAlphaCutoff;
fixed4 frag(vertexOutput IN) : COLOR fixed4 frag(vertexOutput IN) : SV_Target
{ {
fixed4 texureColor = tex2D(_MainTex, IN.texcoordAndAlpha.xy); fixed4 texureColor = tex2D(_MainTex, IN.texcoordAndAlpha.xy);
clip(texureColor.a * IN.texcoordAndAlpha.a - _ShadowAlphaCutoff); clip(texureColor.a * IN.texcoordAndAlpha.a - _ShadowAlphaCutoff);

4
spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/Spine-Skeleton-PMA-Additive.shader
View File

@ -60,7 +60,7 @@ Shader "Spine/Blend Modes/Skeleton PMA Additive" {
return o; return o;
} }
float4 frag (VertexOutput i) : COLOR { float4 frag (VertexOutput i) : SV_Target {
float4 texColor = tex2D(_MainTex, i.uv); float4 texColor = tex2D(_MainTex, i.uv);
#if defined(_STRAIGHT_ALPHA_INPUT) #if defined(_STRAIGHT_ALPHA_INPUT)
@ -105,7 +105,7 @@ Shader "Spine/Blend Modes/Skeleton PMA Additive" {
uniform sampler2D _MainTex; uniform sampler2D _MainTex;
uniform fixed _Cutoff; uniform fixed _Cutoff;
float4 frag (v2f i) : COLOR { float4 frag (v2f i) : SV_Target {
fixed4 texcol = tex2D(_MainTex, i.uvAndAlpha.xy); fixed4 texcol = tex2D(_MainTex, i.uvAndAlpha.xy);
clip(texcol.a * i.uvAndAlpha.a - _Cutoff); clip(texcol.a * i.uvAndAlpha.a - _Cutoff);
SHADOW_CASTER_FRAGMENT(i) SHADOW_CASTER_FRAGMENT(i)

2
spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/Spine-Skeleton-PMA-Multiply.shader
View File

@ -60,7 +60,7 @@ Shader "Spine/Blend Modes/Skeleton PMA Multiply" {
return o; return o;
} }
float4 frag (VertexOutput i) : COLOR { float4 frag (VertexOutput i) : SV_Target {
float4 texColor = tex2D(_MainTex, i.uv); float4 texColor = tex2D(_MainTex, i.uv);
#if defined(_STRAIGHT_ALPHA_INPUT) #if defined(_STRAIGHT_ALPHA_INPUT)

4
spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/Spine-Skeleton-PMA-Screen.shader
View File

@ -60,7 +60,7 @@ Shader "Spine/Blend Modes/Skeleton PMA Screen" {
return o; return o;
} }
float4 frag (VertexOutput i) : COLOR { float4 frag (VertexOutput i) : SV_Target {
float4 texColor = tex2D(_MainTex, i.uv); float4 texColor = tex2D(_MainTex, i.uv);
#if defined(_STRAIGHT_ALPHA_INPUT) #if defined(_STRAIGHT_ALPHA_INPUT)
@ -105,7 +105,7 @@ Shader "Spine/Blend Modes/Skeleton PMA Screen" {
uniform sampler2D _MainTex; uniform sampler2D _MainTex;
uniform fixed _Cutoff; uniform fixed _Cutoff;
float4 frag (v2f i) : COLOR { float4 frag (v2f i) : SV_Target {
fixed4 texcol = tex2D(_MainTex, i.uvAndAlpha.xy); fixed4 texcol = tex2D(_MainTex, i.uvAndAlpha.xy);
clip(texcol.a * i.uvAndAlpha.a - _Cutoff); clip(texcol.a * i.uvAndAlpha.a - _Cutoff);
SHADOW_CASTER_FRAGMENT(i) SHADOW_CASTER_FRAGMENT(i)

4
spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Spine-Skeleton-TintBlack.shader
View File

@ -69,7 +69,7 @@ Shader "Spine/Skeleton Tint Black" {
return o; return o;
} }
float4 frag (VertexOutput i) : COLOR { float4 frag (VertexOutput i) : SV_Target {
float4 texColor = tex2D(_MainTex, i.uv); float4 texColor = tex2D(_MainTex, i.uv);
#if defined(_STRAIGHT_ALPHA_INPUT) #if defined(_STRAIGHT_ALPHA_INPUT)
@ -111,7 +111,7 @@ Shader "Spine/Skeleton Tint Black" {
return o; return o;
} }
float4 frag (v2f i) : COLOR { float4 frag (v2f i) : SV_Target {
fixed4 texcol = tex2D(_MainTex, i.uvAndAlpha.xy); fixed4 texcol = tex2D(_MainTex, i.uvAndAlpha.xy);
clip(texcol.a * i.uvAndAlpha.a - _Cutoff); clip(texcol.a * i.uvAndAlpha.a - _Cutoff);
SHADOW_CASTER_FRAGMENT(i) SHADOW_CASTER_FRAGMENT(i)

4
spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Spine-Skeleton.shader
View File

@ -50,7 +50,7 @@ Shader "Spine/Skeleton" {
return o; return o;
} }
float4 frag (VertexOutput i) : COLOR { float4 frag (VertexOutput i) : SV_Target {
float4 texColor = tex2D(_MainTex, i.uv); float4 texColor = tex2D(_MainTex, i.uv);
#if defined(_STRAIGHT_ALPHA_INPUT) #if defined(_STRAIGHT_ALPHA_INPUT)
@ -95,7 +95,7 @@ Shader "Spine/Skeleton" {
return o; return o;
} }
float4 frag (VertexOutput i) : COLOR { float4 frag (VertexOutput i) : SV_Target {
fixed4 texcol = tex2D(_MainTex, i.uvAndAlpha.xy); fixed4 texcol = tex2D(_MainTex, i.uvAndAlpha.xy);
clip(texcol.a * i.uvAndAlpha.a - _Cutoff); clip(texcol.a * i.uvAndAlpha.a - _Cutoff);
SHADOW_CASTER_FRAGMENT(i) SHADOW_CASTER_FRAGMENT(i)

2
spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Spine-SkeletonLit.shader
View File

@ -196,7 +196,7 @@ Shader "Spine/Skeleton Lit" {
uniform sampler2D _MainTex; uniform sampler2D _MainTex;
uniform fixed _Cutoff; uniform fixed _Cutoff;
float4 frag (v2f i) : COLOR { float4 frag (v2f i) : SV_Target {
fixed4 texcol = tex2D(_MainTex, i.uvAndAlpha.xy); fixed4 texcol = tex2D(_MainTex, i.uvAndAlpha.xy);
clip(texcol.a * i.uvAndAlpha.a - _Cutoff); clip(texcol.a * i.uvAndAlpha.a - _Cutoff);
SHADOW_CASTER_FRAGMENT(i) SHADOW_CASTER_FRAGMENT(i)