From c8e55eb75e18ecbd09b3a66d5b76d89b067f25d1 Mon Sep 17 00:00:00 2001 From: lghassen Date: Sun, 19 Dec 2021 10:56:35 +0100 Subject: [PATCH] Remove currently unused native cubemaps from shader variants --- Assets/Shaders/CloudShadow.shader | 8 ++++---- Assets/Shaders/GeometryCloudVolumeParticle.shader | 8 ++++---- .../Shaders/GeometryCloudVolumeParticleToTexture.shader | 8 ++++---- Assets/Shaders/ScreenSpaceCloudShadow.shader | 8 ++++---- Assets/Shaders/SphereCloud.shader | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Assets/Shaders/CloudShadow.shader b/Assets/Shaders/CloudShadow.shader index ba49dab2..f245ed85 100644 --- a/Assets/Shaders/CloudShadow.shader +++ b/Assets/Shaders/CloudShadow.shader @@ -37,10 +37,10 @@ Shader "EVE/CloudShadow" { #pragma vertex vert #pragma fragment frag #pragma multi_compile WORLD_SPACE_OFF WORLD_SPACE_ON -#pragma multi_compile MAP_TYPE_1 MAP_TYPE_CUBE_1 MAP_TYPE_CUBE2_1 MAP_TYPE_CUBE6_1 -#ifndef MAP_TYPE_CUBE2_1 -#pragma multi_compile ALPHAMAP_N_1 ALPHAMAP_1 -#endif + #pragma multi_compile MAP_TYPE_1 MAP_TYPE_CUBE2_1 MAP_TYPE_CUBE6_1 //MAP_TYPE_CUBE_1 + #ifndef MAP_TYPE_CUBE2_1 + #pragma multi_compile ALPHAMAP_N_1 ALPHAMAP_1 + #endif #include "alphaMap.cginc" #include "cubeMap.cginc" diff --git a/Assets/Shaders/GeometryCloudVolumeParticle.shader b/Assets/Shaders/GeometryCloudVolumeParticle.shader index 05262e47..a02a9e79 100644 --- a/Assets/Shaders/GeometryCloudVolumeParticle.shader +++ b/Assets/Shaders/GeometryCloudVolumeParticle.shader @@ -51,10 +51,10 @@ Shader "EVE/GeometryCloudVolumeParticle" { #pragma fragmentoption ARB_precision_hint_fastest #pragma multi_compile_fwdbase #pragma multi_compile SOFT_DEPTH_OFF SOFT_DEPTH_ON -#pragma multi_compile MAP_TYPE_1 MAP_TYPE_CUBE_1 MAP_TYPE_CUBE2_1 MAP_TYPE_CUBE6_1 -#ifndef MAP_TYPE_CUBE2_1 -#pragma multi_compile ALPHAMAP_N_1 ALPHAMAP_1 -#endif + #pragma multi_compile MAP_TYPE_1 MAP_TYPE_CUBE2_1 MAP_TYPE_CUBE6_1 //MAP_TYPE_CUBE_1 + #ifndef MAP_TYPE_CUBE2_1 + #pragma multi_compile ALPHAMAP_N_1 ALPHAMAP_1 + #endif #include "noiseSimplex.cginc" #include "alphaMap.cginc" diff --git a/Assets/Shaders/GeometryCloudVolumeParticleToTexture.shader b/Assets/Shaders/GeometryCloudVolumeParticleToTexture.shader index 096f43fc..4ebd6c20 100644 --- a/Assets/Shaders/GeometryCloudVolumeParticleToTexture.shader +++ b/Assets/Shaders/GeometryCloudVolumeParticleToTexture.shader @@ -52,10 +52,10 @@ Shader "EVE/GeometryCloudVolumeParticleToTexture" { #pragma fragmentoption ARB_precision_hint_fastest #pragma multi_compile_fwdbase #pragma multi_compile SOFT_DEPTH_OFF SOFT_DEPTH_ON -#pragma multi_compile MAP_TYPE_1 MAP_TYPE_CUBE_1 MAP_TYPE_CUBE2_1 MAP_TYPE_CUBE6_1 -#ifndef MAP_TYPE_CUBE2_1 -#pragma multi_compile ALPHAMAP_N_1 ALPHAMAP_1 -#endif + #pragma multi_compile MAP_TYPE_1 MAP_TYPE_CUBE2_1 MAP_TYPE_CUBE6_1 //MAP_TYPE_CUBE_1 + #ifndef MAP_TYPE_CUBE2_1 + #pragma multi_compile ALPHAMAP_N_1 ALPHAMAP_1 + #endif #include "noiseSimplex.cginc" #include "alphaMap.cginc" diff --git a/Assets/Shaders/ScreenSpaceCloudShadow.shader b/Assets/Shaders/ScreenSpaceCloudShadow.shader index 719432a1..946754be 100644 --- a/Assets/Shaders/ScreenSpaceCloudShadow.shader +++ b/Assets/Shaders/ScreenSpaceCloudShadow.shader @@ -36,10 +36,10 @@ Shader "EVE/ScreenSpaceCloudShadow" { #pragma glsl #pragma vertex vert #pragma fragment frag -#pragma multi_compile MAP_TYPE_1 MAP_TYPE_CUBE_1 MAP_TYPE_CUBE2_1 MAP_TYPE_CUBE6_1 -#ifndef MAP_TYPE_CUBE2_1 -#pragma multi_compile ALPHAMAP_N_1 ALPHAMAP_1 -#endif + #pragma multi_compile MAP_TYPE_1 MAP_TYPE_CUBE2_1 MAP_TYPE_CUBE6_1 //MAP_TYPE_CUBE_1 + #ifndef MAP_TYPE_CUBE2_1 + #pragma multi_compile ALPHAMAP_N_1 ALPHAMAP_1 + #endif #include "alphaMap.cginc" #include "cubeMap.cginc" diff --git a/Assets/Shaders/SphereCloud.shader b/Assets/Shaders/SphereCloud.shader index 3a1de964..7b71a729 100644 --- a/Assets/Shaders/SphereCloud.shader +++ b/Assets/Shaders/SphereCloud.shader @@ -59,7 +59,7 @@ Shader "EVE/Cloud" { #pragma multi_compile_fwdbase #pragma multi_compile SOFT_DEPTH_OFF SOFT_DEPTH_ON #pragma multi_compile WORLD_SPACE_OFF WORLD_SPACE_ON - #pragma multi_compile MAP_TYPE_1 MAP_TYPE_CUBE_1 MAP_TYPE_CUBE2_1 MAP_TYPE_CUBE6_1 + #pragma multi_compile MAP_TYPE_1 MAP_TYPE_CUBE2_1 MAP_TYPE_CUBE6_1 //MAP_TYPE_CUBE_1 #ifndef MAP_TYPE_CUBE2_1 #pragma multi_compile ALPHAMAP_N_1 ALPHAMAP_1 #endif