diff --git a/shaderc-rs/src/lib.rs b/shaderc-rs/src/lib.rs index e8a18e3..3394a8b 100644 --- a/shaderc-rs/src/lib.rs +++ b/shaderc-rs/src/lib.rs @@ -179,12 +179,11 @@ pub enum EnvVersion { Vulkan1_1 = (1 << 22) | (1 << 12), Vulkan1_2 = (1 << 22) | (2 << 12), // For OpenGL, use the number from #version in shaders. - // TODO(dneto): Currently no difference between OpenGL 4.5 and 4.6. + // Currently no difference between OpenGL 4.5 and 4.6. // See glslang/Standalone/Standalone.cpp - // TODO(dneto): Glslang doesn't accept a OpenGL client version of 460. + // Glslang doesn't accept a OpenGL client version of 460. OpenGL4_5 = 450, - // Currently WebGPU doesn't have versioning, since it isn't finalized. This - // will have to be updated once the spec is finished. + // Deprecated, WebGPU env never defined versions WebGPU, } @@ -203,6 +202,7 @@ pub enum SpirvVersion { V1_3 = 0x0001_0300, V1_4 = 0x0001_0400, V1_5 = 0x0001_0500, + V1_6 = 0x0001_0600, } /// Source language. @@ -1973,7 +1973,7 @@ void main() { my_ssbo.x = 1.0; }"; #[test] fn test_get_spirv_version() { let (version, _) = get_spirv_version(); - assert_eq!((1 << 16) + (5 << 8), version); + assert_eq!((1 << 16) + (6 << 8), version); } #[test] diff --git a/shaderc-sys/build/glslang b/shaderc-sys/build/glslang index 3d935ea..9b20b25 160000 --- a/shaderc-sys/build/glslang +++ b/shaderc-sys/build/glslang @@ -1 +1 @@ -Subproject commit 3d935ea2243b4fffd9694191834d8573270dc869 +Subproject commit 9b20b25138bfe916173c9341075b996be14baa69 diff --git a/shaderc-sys/build/shaderc b/shaderc-sys/build/shaderc index fadb0ed..e72186b 160000 --- a/shaderc-sys/build/shaderc +++ b/shaderc-sys/build/shaderc @@ -1 +1 @@ -Subproject commit fadb0edb247a1daa74f9a206a27e9a1c0417ce49 +Subproject commit e72186b66bb90ed06aaf15cbdc9a053581a0616b diff --git a/shaderc-sys/build/spirv-headers b/shaderc-sys/build/spirv-headers index f836486..eddd4df 160000 --- a/shaderc-sys/build/spirv-headers +++ b/shaderc-sys/build/spirv-headers @@ -1 +1 @@ -Subproject commit f836486eb164603f3c8cc7c272f4d3b953d6aa25 +Subproject commit eddd4dfc930f1374a70797460240a501c7d333f7 diff --git a/shaderc-sys/build/spirv-tools b/shaderc-sys/build/spirv-tools index d07505c..7d76881 160000 --- a/shaderc-sys/build/spirv-tools +++ b/shaderc-sys/build/spirv-tools @@ -1 +1 @@ -Subproject commit d07505c761f5a0013cf3134f1d912ec775ad49c7 +Subproject commit 7d768812e20296c877a44ce0633d71f952fbf83c