diff --git a/Cargo.toml b/Cargo.toml index 927119ccaa15a..2c9d74c29c9b2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -235,9 +235,6 @@ glam_assert = ["bevy_internal/glam_assert"] # Include a default font, containing only ASCII characters, at the cost of a 20kB binary size increase default_font = ["bevy_internal/default_font"] -# Enable support for shaders in GLSL -shader_format_glsl = ["bevy_internal/shader_format_glsl"] - # Enable support for shaders in SPIR-V shader_format_spirv = ["bevy_internal/shader_format_spirv"] diff --git a/crates/bevy_internal/Cargo.toml b/crates/bevy_internal/Cargo.toml index 8c8fa2c4dfb8c..759decd74b6fc 100644 --- a/crates/bevy_internal/Cargo.toml +++ b/crates/bevy_internal/Cargo.toml @@ -59,7 +59,6 @@ symphonia-vorbis = ["bevy_audio/symphonia-vorbis"] symphonia-wav = ["bevy_audio/symphonia-wav"] # Shader formats -shader_format_glsl = ["bevy_render/shader_format_glsl"] shader_format_spirv = ["bevy_render/shader_format_spirv"] # Enable watching file system for asset hot reload diff --git a/crates/bevy_render/Cargo.toml b/crates/bevy_render/Cargo.toml index 08ee1fa9a7344..da32ec4788428 100644 --- a/crates/bevy_render/Cargo.toml +++ b/crates/bevy_render/Cargo.toml @@ -20,7 +20,6 @@ dds = ["ddsfile"] pnm = ["image/pnm"] bevy_ci_testing = ["bevy_app/bevy_ci_testing"] -shader_format_glsl = ["naga/glsl-in", "naga/wgsl-out"] shader_format_spirv = ["wgpu/spirv", "naga/spv-in", "naga/spv-out"] # For ktx2 supercompression diff --git a/crates/bevy_render/src/render_resource/shader.rs b/crates/bevy_render/src/render_resource/shader.rs index 0c1b071f1d93d..7631a1b871c71 100644 --- a/crates/bevy_render/src/render_resource/shader.rs +++ b/crates/bevy_render/src/render_resource/shader.rs @@ -13,8 +13,6 @@ define_atomic_id!(ShaderId); pub enum ShaderReflectError { #[error(transparent)] WgslParse(#[from] naga::front::wgsl::ParseError), - #[cfg(feature = "shader_format_glsl")] - #[error("GLSL Parse Error: {0:?}")] GlslParse(Vec), #[cfg(feature = "shader_format_spirv")] #[error(transparent)] diff --git a/docs/cargo_features.md b/docs/cargo_features.md index bf6a5e55fc643..29a03bc0351ec 100644 --- a/docs/cargo_features.md +++ b/docs/cargo_features.md @@ -59,7 +59,6 @@ The default feature set enables most of the expected features of a game engine, |mp3|MP3 audio format support| |pnm|PNM image format support, includes pam, pbm, pgm and ppm| |serialize|Enable serialization support through serde| -|shader_format_glsl|Enable support for shaders in GLSL| |shader_format_spirv|Enable support for shaders in SPIR-V| |subpixel_glyph_atlas|Enable rendering of font glyphs using subpixel accuracy| |symphonia-aac|AAC audio format support (through symphonia)|