summaryrefslogtreecommitdiffstats
path: root/globals.cginc
diff options
context:
space:
mode:
Diffstat (limited to 'globals.cginc')
-rwxr-xr-xglobals.cginc16
1 files changed, 13 insertions, 3 deletions
diff --git a/globals.cginc b/globals.cginc
index 88fb663..a475083 100755
--- a/globals.cginc
+++ b/globals.cginc
@@ -273,16 +273,21 @@ UNITY_INSTANCING_BUFFER_END(InstanceProps)
#endif // _INSTANCE_TEXTURE_OFFSET && UNITY_INSTANCING_ENABLED
#if defined(_PARALLAX_HEIGHTMAP)
-texture2D _Parallax_Heightmap;
-float4 _Parallax_Heightmap_ST;
float _Parallax_Heightmap_Scale;
float _Parallax_Heightmap_Bias;
-#endif // _PARALLAX_HEIGHTMAP
+
+#if defined(_PARALLAX_HEIGHTMAP_TEXTURE)
+texture2D _Parallax_Heightmap;
+float4 _Parallax_Heightmap_ST;
+#endif // _PARALLAX_HEIGHTMAP_TEXTURE
#if defined(_PARALLAX_HEIGHTMAP_RAY_MARCHING)
float _Parallax_Heightmap_Ray_Marching_Steps;
#endif // _PARALLAX_HEIGHTMAP_RAY_MARCHING
+#endif // _PARALLAX_HEIGHTMAP
+
+
#define DECAL_UV_MODE_REPEAT 0
#define DECAL_UV_MODE_MIRROR 1
#define DECAL_UV_MODE_CLAMP 2
@@ -636,4 +641,9 @@ texture2D _Burley_Tiling_Normal_Map_LUT;
float _Burley_Tiling_Normal_Strength;
#endif // _BURLEY_TILING_NORMAL
+#if defined(_BURLEY_TILING_HEIGHTMAP)
+texture2D _Burley_Tiling_Heightmap;
+texture2D _Burley_Tiling_Heightmap_LUT;
+#endif // _BURLEY_TILING_HEIGHTMAP
+
#endif // __GLOBALS_INC