Add support for the ext_mesh_shader extension

vulkano-shaders/src/lib.rs

@@ -92,10 +92,12 @@
 //! of the following:
 //!
 //! - `vertex`
-//! - `fragment`
-//! - `geometry`
 //! - `tess_ctrl`
 //! - `tess_eval`
+//! - `geometry`
+//! - `task`
+//! - `mesh`
+//! - `fragment`
 //! - `compute`
 //! - `raygen`
 //! - `anyhit`
@@ -421,10 +423,12 @@ impl Parse for MacroInput {
 
                     output.0 = Some(match lit.value().as_str() {
                         "vertex" => ShaderKind::Vertex,
-                        "fragment" => ShaderKind::Fragment,
-                        "geometry" => ShaderKind::Geometry,
                         "tess_ctrl" => ShaderKind::TessControl,
                         "tess_eval" => ShaderKind::TessEvaluation,
+                        "geometry" => ShaderKind::Geometry,
+                        "task" => ShaderKind::Task,
+                        "mesh" => ShaderKind::Mesh,
+                        "fragment" => ShaderKind::Fragment,
                         "compute" => ShaderKind::Compute,
                         "raygen" => ShaderKind::RayGeneration,
                         "anyhit" => ShaderKind::AnyHit,
@@ -434,9 +438,9 @@ impl Parse for MacroInput {
                         "callable" => ShaderKind::Callable,
                         ty => bail!(
                             lit,
-                            "expected `vertex`, `fragment`, `geometry`, `tess_ctrl`, `tess_eval`, \
-                            `compute`, `raygen`, `anyhit`, `closesthit`, `miss`, `intersection` or \
-                            `callable`, found `{ty}`",
+                            "expected `vertex`, `tess_ctrl`, `tess_eval`, `geometry`, `task`, \
+                            `mesh`, `fragment` `compute`, `raygen`, `anyhit`, `closesthit`, \
+                            `miss`, `intersection` or `callable`, found `{ty}`",
                         ),
                     });
                 }

vulkano/src/command_buffer/commands/query.rs

@@ -505,6 +505,22 @@ impl RawRecordingCommandBuffer {
                     }));
                 }
             }
+            QueryType::MeshPrimitivesGenerated => {
+                if !queue_family_properties
+                    .queue_flags
+                    .intersects(QueueFlags::GRAPHICS)
+                {
+                    return Err(Box::new(ValidationError {
+                        problem: "`query_pool.query_type()` is \
+                            `QueryType::MeshPrimitivesGenerated`, but \
+                            the queue family of the command buffer does not support \
+                            graphics operations"
+                            .into(),
+                        vuids: &["VUID-vkCmdBeginQuery-queryType-07070"],
+                        ..Default::default()
+                    }));
+                }
+            }
             QueryType::Timestamp
             | QueryType::AccelerationStructureCompactedSize
             | QueryType::AccelerationStructureSerializationSize

vulkano/src/command_buffer/mod.rs

@@ -172,6 +172,31 @@ pub struct DrawIndirectCommand {
     pub first_instance: u32,
 }
 
+/// Used as buffer contents to provide input for the
+/// [`RecordingCommandBuffer::draw_mesh_tasks_indirect`] command.
+///
+/// # Safety
+///
+/// - If the graphics pipeline **does not** include a task shader, then the
+///   `group_count_x`, `group_count_y` and `group_count_z` values must not be greater than the
+///   respective elements of the
+///   [`max_mesh_work_group_count`](Properties::max_mesh_work_group_count) device limit,
+///   and the product of these three values must not be greater than the
+///   [`max_mesh_work_group_total_count`](Properties::max_mesh_work_group_total_count) device limit.
+/// - If the graphics pipeline **does** include a task shader, then the
+///   `group_count_x`, `group_count_y` and `group_count_z` values must not be greater than the
+///   respective elements of the
+///   [`max_task_work_group_count`](Properties::max_task_work_group_count) device limit,
+///   and the product of these three values must not be greater than the
+///   [`max_task_work_group_total_count`](Properties::max_task_work_group_total_count) device limit.
+#[repr(C)]
+#[derive(Clone, Copy, Debug, Default, Zeroable, Pod, PartialEq, Eq)]
+pub struct DrawMeshTasksIndirectCommand {
+    pub group_count_x: u32,
+    pub group_count_y: u32,
+    pub group_count_z: u32,
+}
+
 /// Used as buffer contents to provide input for the
 /// [`RecordingCommandBuffer::draw_indexed_indirect`] command.
 ///