Skip to content

Shaders: remove unnecessary dependency on packing.glsl #14437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 10, 2018
Merged

Shaders: remove unnecessary dependency on packing.glsl #14437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion examples/js/shaders/BokehShader2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ THREE.BokehShader = {
fragmentShader: [

"#include <common>",
"#include <packing>",

"varying vec2 vUv;",

Expand Down
5 changes: 1 addition & 4 deletions examples/webgl_postprocessing_procedural.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@
}
</script>
<script id="noiseRandom1D-frag" type="x-shader/x-fragment">
#include <common>
#include <packing>
#include <common>

varying vec2 vUv;

Expand All @@ -52,7 +51,6 @@
</script>
<script id="noiseRandom2D-frag" type="x-shader/x-fragment">
#include <common>
#include <packing>

varying vec2 vUv;

Expand All @@ -64,7 +62,6 @@
</script>
<script id="noiseRandom3D-frag" type="x-shader/x-fragment">
#include <common>
#include <packing>

varying vec2 vUv;

Expand Down
1 change: 0 additions & 1 deletion src/renderers/shaders/ShaderLib/points_frag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ uniform vec3 diffuse;
uniform float opacity;

#include <common>
#include <packing>
#include <color_pars_fragment>
#include <map_particle_pars_fragment>
#include <fog_pars_fragment>
Expand Down
1 change: 0 additions & 1 deletion src/renderers/shaders/ShaderLib/sprite_frag.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ uniform vec3 diffuse;
uniform float opacity;

#include <common>
#include <packing>
#include <uv_pars_fragment>
#include <map_pars_fragment>
#include <fog_pars_fragment>
Expand Down