Skip to content

Commit c504c12

Browse files
authored
Merge pull request cubedparadox#31 from cubedparadox/development
Moved pragmas from FlatLitToonCore.cginc to Flat Lit Toon.shader.
2 parents c61d38d + 3a46d71 commit c504c12

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

Assets/Cubed's Unity Shaders/Shaders/Flat Lit Toon.shader

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ Shader "CubedParadox/Flat Lit Toon"
4646
#pragma geometry geom
4747
#pragma fragment frag
4848

49+
#pragma only_renderers d3d11 glcore gles
50+
#pragma target 4.0
51+
4952
#pragma multi_compile_fwdbase
5053
#pragma multi_compile_fog
5154

@@ -119,6 +122,9 @@ Shader "CubedParadox/Flat Lit Toon"
119122
#pragma geometry geom
120123
#pragma fragment frag
121124

125+
#pragma only_renderers d3d11 glcore gles
126+
#pragma target 4.0
127+
122128
#pragma multi_compile_fwdadd_fullshadows
123129
#pragma multi_compile_fog
124130

@@ -171,6 +177,10 @@ Shader "CubedParadox/Flat Lit Toon"
171177
#include "FlatLitToonShadows.cginc"
172178

173179
#pragma multi_compile_shadowcaster
180+
#pragma fragmentoption ARB_precision_hint_fastest
181+
182+
#pragma only_renderers d3d11 glcore gles
183+
#pragma target 4.0
174184

175185
#pragma vertex vertShadowCaster
176186
#pragma fragment fragShadowCaster

Assets/Cubed's Unity Shaders/Shaders/FlatLitToonCore.cginc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44
#include "AutoLight.cginc"
55
#include "Lighting.cginc"
66

7-
#pragma multi_compile_fog
8-
#pragma only_renderers d3d9 d3d11 glcore gles
9-
#pragma target 4.0
10-
//#pragma addshadow
11-
127
uniform sampler2D _MainTex; uniform float4 _MainTex_ST;
138
uniform sampler2D _ColorMask; uniform float4 _ColorMask_ST;
149
uniform sampler2D _EmissionMap; uniform float4 _EmissionMap_ST;

Assets/Cubed's Unity Shaders/Shaders/FlatLitToonShadows.cginc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
#include "UnityCG.cginc"
44
#include "UnityShaderVariables.cginc"
55

6-
#pragma multi_compile_shadowcaster
7-
#pragma fragmentoption ARB_precision_hint_fastest
8-
96
// Do dithering for alpha blended shadows on SM3+/desktop;
107
// on lesser systems do simple alpha-tested shadows
118
#if defined(_ALPHABLEND_ON) || defined(_ALPHAPREMULTIPLY_ON)

0 commit comments

Comments
 (0)