Skip to content

Commit aa32177

Browse files
committed
Phase 5E: remove legacy shader string wrapper
1 parent d8f96df commit aa32177

2 files changed

Lines changed: 4 additions & 30 deletions

File tree

webrender_build/src/shader.rs

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -111,36 +111,6 @@ pub fn shader_source_from_file(shader_path: &Path) -> String {
111111
source
112112
}
113113

114-
/// Creates heap-allocated strings for both vertex and fragment shaders.
115-
pub fn build_shader_strings<G: Fn(&str) -> Cow<'static, str>>(
116-
gl_version: ShaderVersion,
117-
features: &[&str],
118-
base_filename: &str,
119-
get_source: &G,
120-
) -> (String, String) {
121-
let mut vs_source = String::new();
122-
do_build_shader_string(
123-
gl_version,
124-
features,
125-
ShaderKind::Vertex,
126-
base_filename,
127-
get_source,
128-
|s| vs_source.push_str(s),
129-
);
130-
131-
let mut fs_source = String::new();
132-
do_build_shader_string(
133-
gl_version,
134-
features,
135-
ShaderKind::Fragment,
136-
base_filename,
137-
get_source,
138-
|s| fs_source.push_str(s),
139-
);
140-
141-
(vs_source, fs_source)
142-
}
143-
144114
/// Walks the given shader string and applies the output to the provided
145115
/// callback. Assuming an override path is not used, does no heap allocation
146116
/// and no I/O.

wr-wgpu-notes/2026-04-18_spirv_shader_pipeline_plan.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,10 @@ Validation should follow the canonical artifact graph.
473473
`webrender_build/tests/generated_output_validation.rs`, while Wrench keeps
474474
exercising runtime shader compilation through its normal GL initialization and
475475
parity lanes.
476+
- the full vertex+fragment legacy GLSL string assembly wrapper is gone as well.
477+
Remaining legacy GLSL users call the lower-level streaming prefix/main helpers
478+
directly, which keeps `gpu_cache_update` and explicit shader override loading
479+
working without preserving the old validator-oriented full-corpus API.
476480

477481
#### Current branch status
478482

0 commit comments

Comments
 (0)