From 1552fc843ac2157087d71a942eb4d7cbada083ec Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Tue, 13 Dec 2022 18:43:47 +0100 Subject: [PATCH] [unity] Fixed blend mode shaders being broken on Unity 2017. Closes #2212. --- .../Shaders/BlendModes/Spine-Skeleton-PMA-Additive.shader | 7 +++++++ .../Shaders/BlendModes/Spine-Skeleton-PMA-Multiply.shader | 7 +++++++ .../Shaders/BlendModes/Spine-Skeleton-PMA-Screen.shader | 7 +++++++ .../Shaders/CGIncludes/Spine-BlendModes-NormalPass.cginc | 3 --- .../CGIncludes/Spine-BlendModes-ShadowCasterPass.cginc | 4 ---- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/Spine-Skeleton-PMA-Additive.shader b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/Spine-Skeleton-PMA-Additive.shader index 95f608a33..3e962ac2c 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/Spine-Skeleton-PMA-Additive.shader +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/Spine-Skeleton-PMA-Additive.shader @@ -44,6 +44,9 @@ Shader "Spine/Blend Modes/Skeleton PMA Additive" { Pass { Name "Normal" CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma shader_feature _ _STRAIGHT_ALPHA_INPUT #include "../CGIncludes/Spine-BlendModes-NormalPass.cginc" ENDCG } @@ -57,6 +60,10 @@ Shader "Spine/Blend Modes/Skeleton PMA Additive" { ZTest LEqual CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma multi_compile_shadowcaster + #pragma fragmentoption ARB_precision_hint_fastest #include "../CGIncludes/Spine-BlendModes-ShadowCasterPass.cginc" ENDCG } diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/Spine-Skeleton-PMA-Multiply.shader b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/Spine-Skeleton-PMA-Multiply.shader index 0fa270294..7261ba339 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/Spine-Skeleton-PMA-Multiply.shader +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/Spine-Skeleton-PMA-Multiply.shader @@ -44,6 +44,9 @@ Shader "Spine/Blend Modes/Skeleton PMA Multiply" { Pass { Name "Normal" CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma shader_feature _ _STRAIGHT_ALPHA_INPUT #include "../CGIncludes/Spine-BlendModes-NormalPass.cginc" ENDCG } @@ -57,6 +60,10 @@ Shader "Spine/Blend Modes/Skeleton PMA Multiply" { ZTest LEqual CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma multi_compile_shadowcaster + #pragma fragmentoption ARB_precision_hint_fastest #include "../CGIncludes/Spine-BlendModes-ShadowCasterPass.cginc" ENDCG } diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/Spine-Skeleton-PMA-Screen.shader b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/Spine-Skeleton-PMA-Screen.shader index 9ddb59854..ce9306480 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/Spine-Skeleton-PMA-Screen.shader +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/Spine-Skeleton-PMA-Screen.shader @@ -44,6 +44,9 @@ Shader "Spine/Blend Modes/Skeleton PMA Screen" { Pass { Name "Normal" CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma shader_feature _ _STRAIGHT_ALPHA_INPUT #include "../CGIncludes/Spine-BlendModes-NormalPass.cginc" ENDCG } @@ -57,6 +60,10 @@ Shader "Spine/Blend Modes/Skeleton PMA Screen" { ZTest LEqual CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma multi_compile_shadowcaster + #pragma fragmentoption ARB_precision_hint_fastest #include "../CGIncludes/Spine-BlendModes-ShadowCasterPass.cginc" ENDCG } diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/CGIncludes/Spine-BlendModes-NormalPass.cginc b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/CGIncludes/Spine-BlendModes-NormalPass.cginc index 9f6f85b53..297b469f6 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/CGIncludes/Spine-BlendModes-NormalPass.cginc +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/CGIncludes/Spine-BlendModes-NormalPass.cginc @@ -1,9 +1,6 @@ #ifndef BLENDMODES_NORMAL_PASS_INCLUDED #define BLENDMODES_NORMAL_PASS_INCLUDED -#pragma shader_feature _ _STRAIGHT_ALPHA_INPUT -#pragma vertex vert -#pragma fragment frag #include "UnityCG.cginc" #include "../CGIncludes/Spine-Common.cginc" uniform sampler2D _MainTex; diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/CGIncludes/Spine-BlendModes-ShadowCasterPass.cginc b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/CGIncludes/Spine-BlendModes-ShadowCasterPass.cginc index a6c22c458..4021511d6 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/CGIncludes/Spine-BlendModes-ShadowCasterPass.cginc +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/CGIncludes/Spine-BlendModes-ShadowCasterPass.cginc @@ -1,10 +1,6 @@ #ifndef BLENDMODES_SHADOWCASTER_PASS_INCLUDED #define BLENDMODES_SHADOWCASTER_PASS_INCLUDED -#pragma vertex vert -#pragma fragment frag -#pragma multi_compile_shadowcaster -#pragma fragmentoption ARB_precision_hint_fastest #include "UnityCG.cginc" struct v2f { V2F_SHADOW_CASTER;