chore: Release gpupaper version 0.1.3

Alpine has no libxkbcommon.a, so static linking fails at ld.

.cargo/config.toml

@@ -0,0 +1,11 @@
+# Alpine/musl hosts: rustup's *-linux-musl targets default to crt-static, which
+# tries to statically link system libraries as well. Alpine ships libxkbcommon.so
+# but no libxkbcommon.a, so the final link fails with:
+#     ld: cannot find -lxkbcommon
+#     ld: have you installed the static version of the xkbcommon library ?
+# Link dynamically instead, which is what a binary running on the host wants.
+[target.aarch64-unknown-linux-musl]
+rustflags = ["-C", "target-feature=-crt-static"]
+
+[target.x86_64-unknown-linux-musl]
+rustflags = ["-C", "target-feature=-crt-static"]

.gitea/workflows/release.yml

@@ -122,6 +122,7 @@ jobs:
           echo "  User aur" >> ~/.ssh/config
           ssh-keyscan aur.archlinux.org >> ~/.ssh/known_hosts 2>/dev/null
 
+          rm -rf /tmp/aur-gpupaper
           git clone ssh://aur@aur.archlinux.org/gpupaper.git /tmp/aur-gpupaper
           cp aur/PKGBUILD /tmp/aur-gpupaper/
           cd /tmp/aur-gpupaper

Cargo.lock

@@ -473,7 +473,7 @@ dependencies = [
 
 [[package]]
 name = "gpupaper"
-version = "0.1.1"
+version = "0.1.3"
 dependencies = [
  "anyhow",
  "bytemuck",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gpupaper"
-version = "0.1.1"
+version = "0.1.3"
 edition = "2021"
 
 [[bin]]

aur/PKGBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Bendik Aagaard Lynghaug <bendik.lynghaug@gmail.com>
 pkgname=gpupaper
-pkgver=0.1.1
+pkgver=0.1.3
 pkgrel=1
 pkgdesc="Wayland layer-surface wallpaper runner powered by GLSL/WGSL fragment shaders (wgpu)"
 arch=('x86_64' 'aarch64')

shaders/fuzzy_clouds.frag

@@ -0,0 +1,29 @@
+// i don't remember what i based this off of or if it was just fiddling,
+// found it in my shader list and thought the clouds were pretty good,
+// for what it is
+uniform float time;
+uniform vec2 resolution;
+
+float noise(vec3 p) {
+	float v = 0.0, a;
+	for (a = .85; a > .15; a *=.75) {
+		v += a * abs(dot( sin( .1*time + .1*p.z + .1*p/a) , vec3(a*3.)) );
+		p += p;
+	}
+	return v;
+}
+
+void mainImage(out vec4 o, vec2 u) {
+    float i = 0.0, s = 0.0;
+    o = vec4(0.0);
+    vec3 p = vec3(0.0);
+    vec2 r = resolution;
+    u = ( u+u - r.xy ) / r.y;
+    for( ; i++ < 1e2; ) {
+        p += vec3(u * s, s);
+        s = .1 + .2* abs( 12.-abs(p.y) - noise(p) );
+        o += 1./s;
+    }
+    o = tanh(vec4(5,2,1,0)*o /3e3/ length(u));
+}
+

src/renderer.rs

@@ -243,11 +243,21 @@ impl SurfaceRenderer {
         fps: u32,
     ) -> Result<Self> {
         let caps = surface.get_capabilities(&gpu.adapter);
+
+        // A surface may advertise formats that need features we never requested when
+        // creating the device (see `required_features` above). Picking one of those
+        // fails validation at `create_render_pipeline`. Turnip/Adreno enumerates
+        // 16-bit-norm formats (needing TEXTURE_FORMAT_16BIT_NORM) before the plain
+        // 8-bit ones, so filter by what the device actually supports rather than
+        // relying on enumeration order.
+        let supported = gpu.device.features();
+        let usable = |f: &wgpu::TextureFormat| supported.contains(f.required_features());
         let format = caps
             .formats
             .iter()
             .copied()
-            .find(|f| !f.is_srgb())
+            .find(|f| !f.is_srgb() && usable(f))
+            .or_else(|| caps.formats.iter().copied().find(usable))
             .unwrap_or(caps.formats[0]);
 
         let present_mode =

src/wayland.rs

@@ -168,14 +168,11 @@ pub fn run(
     let is_all = target_output == "all" || target_output == "*";
 
     if is_all {
-        let wl_outputs: Vec<_> = state.output_state.outputs().collect();
-        if wl_outputs.is_empty() {
-            // No outputs reported yet; let the compositor assign.
+        // OutputHandler::new_output already attached one layer per existing
+        // output during the roundtrip above. Only fall back to a compositor-
+        // assigned surface if none arrived.
+        if state.outputs.is_empty() {
             state.attach_output(&qh, None);
-        } else {
-            for wl_out in &wl_outputs {
-                state.attach_output(&qh, Some(wl_out));
-            }
         }
     } else {
         let wl_out = find_output(&state.output_state, &target_output);
@@ -343,6 +340,12 @@ impl OutputHandler for AppState {
         output: wl_output::WlOutput,
     ) {
         if self.target_output == "all" || self.target_output == "*" {
+            let name = self
+                .output_state
+                .info(&output)
+                .and_then(|i| i.name)
+                .unwrap_or_else(|| "<unnamed>".into());
+            log::info!("attaching output: {}", name);
             self.attach_output(qh, Some(&output));
         }
     }