move mod: move mod arch::primitive to geometry

Firestar99 · Firestar99 · commit c8e517c54d75 · 2026-03-10T12:41:51.000+01:00
diff --git a/crates/spirv-std/src/arch.rs b/crates/spirv-std/src/arch.rs
@@ -15,7 +15,6 @@ mod barrier;
 mod demote_to_helper_invocation_ext;
 mod derivative;
 mod mesh_shading;
-mod primitive;
 mod ray_tracing;
 mod subgroup;
 
@@ -24,7 +23,6 @@ pub use barrier::*;
 pub use demote_to_helper_invocation_ext::*;
 pub use derivative::*;
 pub use mesh_shading::*;
-pub use primitive::*;
 pub use ray_tracing::*;
 pub use subgroup::*;
 
diff --git a/crates/spirv-std/src/geometry.rs b/crates/spirv-std/src/geometry.rs
@@ -1,3 +1,5 @@
+//! Intrinsics for geometry shaders
+
 #[cfg(target_arch = "spirv")]
 use core::arch::asm;
 
diff --git a/crates/spirv-std/src/lib.rs b/crates/spirv-std/src/lib.rs
@@ -94,6 +94,7 @@ pub mod arch;
 pub mod byte_addressable_buffer;
 pub mod debug_printf;
 pub mod float;
+pub mod geometry;
 pub mod image;
 pub mod indirect_command;
 pub mod matrix;
diff --git a/tests/compiletests/ui/entry/geometry/emit_stream_vertex.rs b/tests/compiletests/ui/entry/geometry/emit_stream_vertex.rs
@@ -6,6 +6,6 @@ use spirv_std::spirv;
 #[spirv(geometry(input_lines = 2, output_points = 2))]
 pub fn main() {
     unsafe {
-        spirv_std::arch::emit_stream_vertex::<2>();
+        spirv_std::geometry::emit_stream_vertex::<2>();
     };
 }
diff --git a/tests/compiletests/ui/entry/geometry/emit_vertex.rs b/tests/compiletests/ui/entry/geometry/emit_vertex.rs
@@ -6,6 +6,6 @@ use spirv_std::spirv;
 #[spirv(geometry(input_lines = 2, output_points = 2))]
 pub fn main() {
     unsafe {
-        spirv_std::arch::emit_vertex();
+        spirv_std::geometry::emit_vertex();
     };
 }
diff --git a/tests/compiletests/ui/entry/geometry/end_primitive.rs b/tests/compiletests/ui/entry/geometry/end_primitive.rs
@@ -6,6 +6,6 @@ use spirv_std::spirv;
 #[spirv(geometry(input_lines = 2, output_points = 2))]
 pub fn main() {
     unsafe {
-        spirv_std::arch::end_primitive();
+        spirv_std::geometry::end_primitive();
     };
 }
diff --git a/tests/compiletests/ui/entry/geometry/end_stream_primitive.rs b/tests/compiletests/ui/entry/geometry/end_stream_primitive.rs
@@ -6,6 +6,6 @@ use spirv_std::spirv;
 #[spirv(geometry(input_lines = 2, output_points = 2))]
 pub fn main() {
     unsafe {
-        spirv_std::arch::end_stream_primitive::<2>();
+        spirv_std::geometry::end_stream_primitive::<2>();
     };
 }
diff --git a/tests/compiletests/ui/entry/geometry/geometry_shader.rs b/tests/compiletests/ui/entry/geometry/geometry_shader.rs
@@ -0,0 +1,32 @@
+// build-pass
+// compile-flags: -Ctarget-feature=+Geometry
+// compile-flags: -C llvm-args=--disassemble
+// normalize-stderr-test "OpSource .*\n" -> ""
+// normalize-stderr-test "OpLine .*\n" -> ""
+// normalize-stderr-test "%\d+ = OpString .*\n" -> ""
+// normalize-stderr-test "; .*\n" -> ""
+// normalize-stderr-test "OpCapability VulkanMemoryModel\n" -> ""
+// normalize-stderr-test "OpMemoryModel Logical Vulkan" -> "OpMemoryModel Logical Simple"
+// ignore-spv1.0
+// ignore-spv1.1
+// ignore-spv1.2
+// ignore-spv1.3
+// ignore-vulkan1.0
+// ignore-vulkan1.1
+
+use spirv_std::geometry::{emit_vertex, end_primitive};
+use spirv_std::glam::*;
+use spirv_std::spirv;
+
+#[spirv(geometry(input_points = 2, output_triangle_strip = 1))]
+pub fn main(#[spirv(position)] position_in: [Vec4; 2], #[spirv(position)] position_out: &mut Vec4) {
+    unsafe {
+        *position_out = position_in[0] + vec4(-0.1, 0.0, 0.0, 0.0);
+        emit_vertex();
+        *position_out = position_in[1] + vec4(0.1, 0.0, 0.0, 0.0);
+        emit_vertex();
+        *position_out = position_in[1] + vec4(0.0, 0.1, 0.0, 0.0);
+        emit_vertex();
+        end_primitive();
+    };
+}
diff --git a/tests/compiletests/ui/entry/geometry/geometry_shader.stderr b/tests/compiletests/ui/entry/geometry/geometry_shader.stderr
@@ -0,0 +1,51 @@
+OpCapability Shader
+OpCapability Geometry
+OpMemoryModel Logical Simple
+OpEntryPoint Geometry %1 "main" %2 %3
+OpExecutionMode %1 InputPoints
+OpExecutionMode %1 OutputTriangleStrip
+OpName %2 "position_in"
+OpName %3 "position_out"
+OpDecorate %2 BuiltIn Position
+OpDecorate %8 ArrayStride 16
+OpDecorate %3 BuiltIn Position
+%9 = OpTypeFloat 32
+%10 = OpTypeVector %9 4
+%11 = OpTypeInt 32 0
+%12 = OpConstant  %11  2
+%13 = OpTypeArray %10 %12
+%14 = OpTypePointer Input %13
+%15 = OpTypePointer Output %10
+%16 = OpTypeVoid
+%17 = OpTypeFunction %16
+%2 = OpVariable  %14  Input
+%8 = OpTypeArray %10 %12
+%18 = OpConstant  %9  -0.1
+%19 = OpConstant  %9  0
+%3 = OpVariable  %15  Output
+%20 = OpConstant  %9  0.1
+%1 = OpFunction  %16  None %17
+%21 = OpLabel
+%22 = OpLoad  %13  %2
+%23 = OpCompositeExtract  %10  %22 0
+%24 = OpCompositeExtract  %10  %22 1
+%25 = OpCompositeConstruct  %8  %23 %24
+%26 = OpCompositeExtract  %10  %25 0
+%27 = OpCompositeConstruct  %10  %18 %19 %19 %19
+%28 = OpFAdd  %10  %26 %27
+OpStore %3 %28
+OpEmitVertex
+%29 = OpCompositeExtract  %10  %25 1
+%30 = OpCompositeConstruct  %10  %20 %19 %19 %19
+%31 = OpFAdd  %10  %29 %30
+OpStore %3 %31
+OpEmitVertex
+%32 = OpCompositeExtract  %10  %25 1
+%33 = OpCompositeConstruct  %10  %19 %20 %19 %19
+%34 = OpFAdd  %10  %32 %33
+OpStore %3 %34
+OpEmitVertex
+OpEndPrimitive
+OpNoLine
+OpReturn
+OpFunctionEnd
diff --git a/tests/compiletests/ui/spirv-attr/location_assignment/geometry_shader.rs b/tests/compiletests/ui/spirv-attr/location_assignment/geometry_shader.rs
@@ -14,7 +14,7 @@
 // ignore-vulkan1.0
 // ignore-vulkan1.1
 
-use spirv_std::arch::{emit_vertex, end_primitive};
+use spirv_std::geometry::{emit_vertex, end_primitive};
 use spirv_std::glam::*;
 use spirv_std::spirv;
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+//! Intrinsics for geometry shaders`
	`2`	`+`
`1`	`3`	`#[cfg(target_arch = "spirv")]`
`2`	`4`	`use core::arch::asm;`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@ use spirv_std::spirv;`
`6`	`6`	`#[spirv(geometry(input_lines = 2, output_points = 2))]`
`7`	`7`	`pub fn main() {`
`8`	`8`	`unsafe {`
`9`		`- spirv_std::arch::emit_stream_vertex::<2>();`
	`9`	`+ spirv_std::geometry::emit_stream_vertex::<2>();`
`10`	`10`	`};`
`11`	`11`	`}`