Fix shader breaking (galacean#1463)

* fix: shader breaking
ottomao · Apr 12, 2023 · c0f997d · c0f997d
1 parent c0bd7b6
commit c0f997d
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 6 deletions.
diff --git a/packages/core/src/shaderlib/RendererFragmentDeclaration.glsl b/packages/core/src/shaderlib/RendererFragmentDeclaration.glsl
diff --git a/packages/core/src/shaderlib/ShaderLib.ts b/packages/core/src/shaderlib/ShaderLib.ts
@@ -4,7 +4,6 @@ import common_vert from "./common_vert.glsl";
 import transform_declare from "./transform_declare.glsl";
 
 import color_share from "./color_share.glsl";
-import RendererFragmentDeclaration from "./RendererFragmentDeclaration.glsl";
 import FogFragmentDeclaration from "./FogFragmentDeclaration.glsl";
 import FogVertexDeclaration from "./FogVertexDeclaration.glsl";
 import normal_share from "./normal_share.glsl";
@@ -65,7 +64,6 @@ export const ShaderLib = {
   normal_share,
   uv_share,
   worldpos_share,
-  RendererFragmentDeclaration,
   FogVertexDeclaration,
   FogFragmentDeclaration,
 

diff --git a/packages/core/src/shaderlib/extra/blinn-phong.fs.glsl b/packages/core/src/shaderlib/extra/blinn-phong.fs.glsl
@@ -10,7 +10,6 @@
 #include <ShadowFragmentDeclaration>
 #include <mobile_material_frag>
 
-#include <RendererFragmentDeclaration>
 #include <FogFragmentDeclaration>
 #include <normal_get>
 

diff --git a/packages/core/src/shaderlib/extra/pbr.fs.glsl b/packages/core/src/shaderlib/extra/pbr.fs.glsl
@@ -2,7 +2,6 @@
 #include <common>
 #include <camera_declare>
 
-#include <RendererFragmentDeclaration>
 #include <FogFragmentDeclaration>
 
 #include <uv_share>

diff --git a/packages/core/src/shaderlib/light_frag_define.glsl b/packages/core/src/shaderlib/light_frag_define.glsl
@@ -62,6 +62,7 @@ struct EnvMapLight {
 
 
 uniform EnvMapLight u_envMapLight;
+uniform ivec4 oasis_RendererLayer;
 
 #ifdef O3_USE_SH
     uniform vec3 u_env_sh[9];