diff --git a/src/gallium/frontends/rusticl/core/memory.rs b/src/gallium/frontends/rusticl/core/memory.rs
index bbb50836a2b..a27f3e6a379 100644
--- a/src/gallium/frontends/rusticl/core/memory.rs
+++ b/src/gallium/frontends/rusticl/core/memory.rs
@@ -2140,7 +2140,7 @@ impl Image {
     pub fn sampler_view<'c>(&self, ctx: &'c QueueContext) -> CLResult<PipeSamplerView<'c, '_>> {
         let res = self.get_res_for_access(ctx, RWFlags::RD)?;
 
-        let template = if let Some(Mem::Buffer(parent)) = self.parent() {
+        let mut template = if let Some(Mem::Buffer(parent)) = self.parent() {
             if self.mem_type == CL_MEM_OBJECT_IMAGE2D {
                 res.pipe_sampler_view_template_2d_buffer(
                     self.pipe_format,
@@ -2161,6 +2161,13 @@ impl Image {
             res.pipe_sampler_view_template()
         };
 
+        // Some drivers won't do it themselves.
+        if self.image_format.image_channel_order == CL_INTENSITY {
+            template.set_swizzle_g(pipe_swizzle::PIPE_SWIZZLE_X);
+            template.set_swizzle_b(pipe_swizzle::PIPE_SWIZZLE_X);
+            template.set_swizzle_a(pipe_swizzle::PIPE_SWIZZLE_X);
+        }
+
         PipeSamplerView::new(ctx, res, &template).ok_or(CL_OUT_OF_HOST_MEMORY)
     }
 
diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build
index 426b0a9b993..232337e80f9 100644
--- a/src/gallium/frontends/rusticl/meson.build
+++ b/src/gallium/frontends/rusticl/meson.build
@@ -303,6 +303,8 @@ rusticl_mesa_bindings = rust.bindgen(
     '--constified-enum-module', 'pipe_tex_filter',
     '--allowlist-type',         'pipe_tex_wrap',
     '--constified-enum-module', 'pipe_tex_wrap',
+    '--allowlist-type',         'pipe_swizzle',
+    '--constified-enum-module', 'pipe_swizzle',
 
     # rusticl C functions
     '--allowlist-function',     'rusticl_.*',