From 8985445393000ef10cf4ea86c6dff079f2cbf00d Mon Sep 17 00:00:00 2001 From: mob-sakai Date: Wed, 17 Jul 2019 02:56:11 +0900 Subject: [PATCH] multi_compile shader keyword --- .../UIEffect/Shaders/UI-Effect-Dissolve.shader | 2 +- .../UIEffect/Shaders/UI-Effect-Transition.shader | 2 +- .../Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.shader | 8 ++++---- .../UIExtensions/UIEffect/Shaders/UI-EffectCapture.shader | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect-Dissolve.shader b/Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect-Dissolve.shader index 6970efe..e0ae649 100644 --- a/Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect-Dissolve.shader +++ b/Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect-Dissolve.shader @@ -59,7 +59,7 @@ Shader "UI/Hidden/UI-Effect-Dissolve" #define DISSOLVE 1 #pragma multi_compile __ UNITY_UI_ALPHACLIP - #pragma shader_feature __ ADD SUBTRACT FILL + #pragma multi_compile __ ADD SUBTRACT FILL #include "UnityCG.cginc" #include "UnityUI.cginc" diff --git a/Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect-Transition.shader b/Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect-Transition.shader index ec53f75..9e99491 100644 --- a/Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect-Transition.shader +++ b/Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect-Transition.shader @@ -60,7 +60,7 @@ Shader "UI/Hidden/UI-Effect-Transition" #define ADD 1 #pragma multi_compile __ UNITY_UI_ALPHACLIP - #pragma shader_feature __ FADE CUTOFF DISSOLVE + #pragma multi_compile __ FADE CUTOFF DISSOLVE #include "UnityCG.cginc" #include "UnityUI.cginc" diff --git a/Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.shader b/Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.shader index 993c045..37a4174 100644 --- a/Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.shader +++ b/Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-Effect.shader @@ -60,10 +60,10 @@ Shader "UI/Hidden/UI-Effect" #pragma multi_compile __ UNITY_UI_ALPHACLIP - #pragma shader_feature __ GRAYSCALE SEPIA NEGA PIXEL - #pragma shader_feature __ ADD SUBTRACT FILL - #pragma shader_feature __ FASTBLUR MEDIUMBLUR DETAILBLUR - #pragma shader_feature __ EX + #pragma multi_compile __ GRAYSCALE SEPIA NEGA PIXEL + #pragma multi_compile __ ADD SUBTRACT FILL + #pragma multi_compile __ FASTBLUR MEDIUMBLUR DETAILBLUR + #pragma multi_compile __ EX #include "UnityCG.cginc" #include "UnityUI.cginc" diff --git a/Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-EffectCapture.shader b/Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-EffectCapture.shader index 6dd26c0..ecd8dcf 100644 --- a/Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-EffectCapture.shader +++ b/Assets/Coffee/UIExtensions/UIEffect/Shaders/UI-EffectCapture.shader @@ -21,8 +21,8 @@ Shader "UI/Hidden/UI-EffectCapture" #pragma fragment frag #pragma target 2.0 - #pragma shader_feature __ GRAYSCALE SEPIA NEGA PIXEL - #pragma shader_feature __ ADD SUBTRACT FILL + #pragma multi_compile __ GRAYSCALE SEPIA NEGA PIXEL + #pragma multi_compile __ ADD SUBTRACT FILL #include "UnityCG.cginc" #include "UI-Effect.cginc" @@ -79,7 +79,7 @@ Shader "UI/Hidden/UI-EffectCapture" #pragma fragment frag_blur #pragma target 2.0 - #pragma shader_feature __ FASTBLUR MEDIUMBLUR DETAILBLUR + #pragma multi_compile __ FASTBLUR MEDIUMBLUR DETAILBLUR #include "UnityCG.cginc" #include "UI-Effect.cginc"