Minecraft: Java Edition 26.3 rewritten from scratch in Rust, checked against vanilla with 281 differential harnesses. Get it with the Horizon launcher.
Rust differential-testinggame-enginegamedevlinuxminecraftminecraft-javareimplementationrustvoxelvulkanwgpu
Shader translator: keep the buffer keyword in extension-enabled legacy SSBO blocks
gigamans442d4b773dadf18
diff --git a/crates/horizon-shaders/src/translate/mod.rs b/crates/horizon-shaders/src/translate/mod.rsindex e45815a33..b4ab9987b 100644--- a/crates/horizon-shaders/src/translate/mod.rs+++ b/crates/horizon-shaders/src/translate/mod.rs@@ -2362,4 +2362,23 @@ mod tests {"the uniform is back after the block");}++ #[test]+ fn storage_buffer_extension_keeps_the_legacy_buffer_keyword() {+ let fragment = "#version 130\n#extension GL_ARB_shader_storage_buffer_object : enable\nlayout(std430,binding=0) readonly buffer Data{uvec4 cells[4];}data;void main(){gl_FragColor=vec4(data.cells[0]);}";+ let result = program(+ &[("composite.vsh", VSH_120), ("composite.fsh", fragment)],+ Target::Window,+ );+ assert!(result.is_ok(), "{:?}", result.err());+ }+ #[test]+ fn ordinary_legacy_buffer_identifiers_still_translate() {+ let fragment = "#version 120\nuniform float buffer;void main(){gl_FragColor=vec4(buffer);}";+ let result = program(+ &[("composite.vsh", VSH_120), ("composite.fsh", fragment)],+ Target::Window,+ );+ assert!(result.is_ok(), "{:?}", result.err());+ }}diff --git a/crates/horizon-shaders/src/translate/scan.rs b/crates/horizon-shaders/src/translate/scan.rsindex a3a8389fb..89038a33f 100644--- a/crates/horizon-shaders/src/translate/scan.rs+++ b/crates/horizon-shaders/src/translate/scan.rs@@ -729,6 +729,11 @@ impl<'p> Stage<'p> {let mut binding = None;for (k, &i) in words.iter().enumerate() {match self.tokens[i] {+ // An extension adds real buffer syntax even in a GLSL 1.x stage.+ // It must not take the legacy identifier rename for `buffer`.+ "buffer" => {+ self.replaced.insert(i, "buffer".into());+ }"binding" => {binding = words.get(k + 2)