gsk: Properly gate Vulkan/Broadway renderers

Author: bilelmoussaoui

gsk4/Cargo.toml

@@ -15,7 +15,8 @@ rust-version = "1.64"
 name = "gsk4"
 
 [features]
-broadway = []
+broadway = ["ffi/broadway"]
+vulkan = ["ffi/vulkan"]
 v4_2 = ["ffi/v4_2", "gdk/v4_2"]
 v4_4 = ["ffi/v4_4", "gdk/v4_4", "v4_2"]
 v4_6 = ["ffi/v4_6", "gdk/v4_6", "v4_4"]

gsk4/Gir.toml

@@ -206,6 +206,11 @@ status = "generate"
     name = "parse"
     manual = true # bool_return_is_error doesn't seem to work for it
 
+[[object]]
+name = "Gsk.VulkanRenderer"
+status = "generate"
+cfg_condition = "feature = \"vulkan\""
+
 [[object]]
 name = "Pango.GlyphInfo"
 status = "manual"

gsk4/README.md

@@ -43,6 +43,7 @@ gsk = { git = "https://github.com/gtk-rs/gtk4-rs.git", package = "gsk4" }
 
 | Feature | Description |
 | ---     | ----------- |
+| `vulkan` | Enable `vulkan` Renderer. Only if GTK is compiled with Vulkan support |
 | `broadway` | Enable `broadway` Renderer. Only if GTK is compiled with Broadway support |
 | `v4_10` | Enable the new APIs part of GTK 4.10 |
 | `v4_6` | Enable the new APIs part of GTK 4.6 |

gsk4/src/auto/mod.rs

@@ -113,6 +113,13 @@ pub use self::texture_scale_node::TextureScaleNode;
 mod transform_node;
 pub use self::transform_node::TransformNode;
 
+#[cfg(feature = "vulkan")]
+#[cfg_attr(docsrs, doc(cfg(feature = "vulkan")))]
+mod vulkan_renderer;
+#[cfg(feature = "vulkan")]
+#[cfg_attr(docsrs, doc(cfg(feature = "vulkan")))]
+pub use self::vulkan_renderer::VulkanRenderer;
+
 mod shader_args_builder;
 pub use self::shader_args_builder::ShaderArgsBuilder;
 

gsk4/src/auto/vulkan_renderer.rs

@@ -0,0 +1,36 @@
+// This file was generated by gir (https://github.com/gtk-rs/gir)
+// from gir-files (https://github.com/gtk-rs/gir-files)
+// DO NOT EDIT
+
+use crate::Renderer;
+use glib::{prelude::*, translate::*};
+use std::fmt;
+
+glib::wrapper! {
+    #[doc(alias = "GskVulkanRenderer")]
+    pub struct VulkanRenderer(Object<ffi::GskVulkanRenderer, ffi::GskVulkanRendererClass>) @extends Renderer;
+
+    match fn {
+        type_ => || ffi::gsk_vulkan_renderer_get_type(),
+    }
+}
+
+impl VulkanRenderer {
+    #[doc(alias = "gsk_vulkan_renderer_new")]
+    pub fn new() -> VulkanRenderer {
+        assert_initialized_main_thread!();
+        unsafe { Renderer::from_glib_full(ffi::gsk_vulkan_renderer_new()).unsafe_cast() }
+    }
+}
+
+impl Default for VulkanRenderer {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl fmt::Display for VulkanRenderer {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.write_str("VulkanRenderer")
+    }
+}

gsk4/sys/Cargo.toml

@@ -42,6 +42,8 @@ v4_2 = []
 v4_4 = ["v4_2"]
 v4_6 = ["v4_4"]
 v4_10 = ["v4_6"]
+vulkan = []
+broadway = []
 
 [dependencies]
 libc = "0.2"

gsk4/sys/Gir.toml

@@ -16,3 +16,21 @@ external_libraries = [
 
 [external_libraries]
 gdk4 = "Gdk"
+
+
+[[object]]
+name = "Gsk.BroadwayRenderer"
+status = "generate"
+cfg_condition = "feature = \"broadway\""
+    [[object.function]]
+    pattern = "(new|get_type)"
+    cfg_condition = "feature = \"broadway\""
+    
+
+[[object]]
+name = "Gsk.VulkanRenderer"
+status = "generate"
+cfg_condition = "feature = \"vulkan\""
+    [[object.function]]
+    pattern = "(new|get_type)"
+    cfg_condition = "feature = \"vulkan\""

gsk4/sys/src/lib.rs

@@ -312,12 +312,16 @@ impl ::std::fmt::Debug for GskBorderNode {
     }
 }
 
+#[cfg(feature = "broadway")]
+#[cfg_attr(docsrs, doc(cfg(feature = "broadway")))]
 #[repr(C)]
 pub struct GskBroadwayRenderer {
     _data: [u8; 0],
     _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
 }
 
+#[cfg(feature = "broadway")]
+#[cfg_attr(docsrs, doc(cfg(feature = "broadway")))]
 impl ::std::fmt::Debug for GskBroadwayRenderer {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
         f.debug_struct(&format!("GskBroadwayRenderer @ {self:p}"))
@@ -707,12 +711,16 @@ impl ::std::fmt::Debug for GskTransformNode {
     }
 }
 
+#[cfg(feature = "vulkan")]
+#[cfg_attr(docsrs, doc(cfg(feature = "vulkan")))]
 #[repr(C)]
 pub struct GskVulkanRenderer {
     _data: [u8; 0],
     _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,
 }
 
+#[cfg(feature = "vulkan")]
+#[cfg_attr(docsrs, doc(cfg(feature = "vulkan")))]
 impl ::std::fmt::Debug for GskVulkanRenderer {
     fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
         f.debug_struct(&format!("GskVulkanRenderer @ {self:p}"))
@@ -1008,7 +1016,11 @@ extern "C" {
     //=========================================================================
     // GskBroadwayRenderer
     //=========================================================================
+    #[cfg(feature = "broadway")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "broadway")))]
     pub fn gsk_broadway_renderer_get_type() -> GType;
+    #[cfg(feature = "broadway")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "broadway")))]
     pub fn gsk_broadway_renderer_new() -> *mut GskRenderer;
 
     //=========================================================================
@@ -1532,7 +1544,11 @@ extern "C" {
     //=========================================================================
     // GskVulkanRenderer
     //=========================================================================
+    #[cfg(feature = "vulkan")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "vulkan")))]
     pub fn gsk_vulkan_renderer_get_type() -> GType;
+    #[cfg(feature = "vulkan")]
+    #[cfg_attr(docsrs, doc(cfg(feature = "vulkan")))]
     pub fn gsk_vulkan_renderer_new() -> *mut GskRenderer;
 
     //=========================================================================