From a074257314caaf2824b597c7b64307be7a8d220c Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Wed, 1 Jul 2020 22:54:30 -0700 Subject: [PATCH] Tweak and compile shaders --- Assets/Shaders/StandardDecal.shader | 4 +++- GameData/ConformalDecals/Resources/conformaldecals.shab | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Assets/Shaders/StandardDecal.shader b/Assets/Shaders/StandardDecal.shader index cc59fbe..cf4f013 100644 --- a/Assets/Shaders/StandardDecal.shader +++ b/Assets/Shaders/StandardDecal.shader @@ -25,7 +25,7 @@ Shader "ConformalDecals/Decal/Standard" } SubShader { - Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true"} + Tags { "Queue" = "Geometry+100" "IgnoreProjector" = "true" "DisableBatching" = "true"} Cull [_Cull] Ztest LEqual @@ -40,6 +40,7 @@ Shader "ConformalDecals/Decal/Standard" #pragma fragment frag_forward #pragma multi_compile_fwdbase nolightmap nodirlightmap nodynlightmap + #pragma skip_variants SHADOWS_DEPTH SHADOWS_CUBE SHADOWS_SHADOWMASK LIGHTMAP_SHADOW_MIXING POINT_COOKIE #pragma multi_compile_local __ DECAL_PREVIEW #pragma multi_compile_local __ DECAL_BASE_NORMAL DECAL_BUMPMAP #pragma multi_compile_local __ DECAL_SPECMAP @@ -65,6 +66,7 @@ Shader "ConformalDecals/Decal/Standard" #pragma fragment frag_forward #pragma multi_compile_fwdadd nolightmap nodirlightmap nodynlightmap + #pragma skip_variants SHADOWS_DEPTH SHADOWS_CUBE SHADOWS_SHADOWMASK LIGHTMAP_SHADOW_MIXING POINT_COOKIE #pragma multi_compile_local __ DECAL_PREVIEW #pragma multi_compile_local __ DECAL_BASE_NORMAL DECAL_BUMPMAP #pragma multi_compile_local __ DECAL_SPECMAP diff --git a/GameData/ConformalDecals/Resources/conformaldecals.shab b/GameData/ConformalDecals/Resources/conformaldecals.shab index e24bce0..69eba6e 100644 --- a/GameData/ConformalDecals/Resources/conformaldecals.shab +++ b/GameData/ConformalDecals/Resources/conformaldecals.shab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0f28c5cee84474aed6d74cb4d6be9a996ae8bc8791b60d12009605f3dc913d65 -size 170325 +oid sha256:500f84a610c52edfa15d1629433e3cede58ca2ad8c1a94c2171e8d8ea8009218 +size 570981