diff --git a/src/compiler/nir/nir_intrinsics.py b/src/compiler/nir/nir_intrinsics.py
index 86917935bec..1a7b029a3b6 100644
--- a/src/compiler/nir/nir_intrinsics.py
+++ b/src/compiler/nir/nir_intrinsics.py
@@ -3017,7 +3017,7 @@ intrinsic("smp_coeffs_pco", src_comp=[16, 4, 4], dest_comp=16, indices=[SMP_FLAG
 # smp_raw_pco(data, tex_state, smp_state)
 # Returns the raw sampling data for the given data and state words.
 # Actually outputs 4/8/12/16 components, but NIR doesn't support num_components == 12, so fake it as 8 for now.
-intrinsic("smp_raw_pco", src_comp=[16, 4, 4], dest_comp=16, indices=[SMP_FLAGS_PCO, RANGE], bit_sizes=[32])
+intrinsic("smp_raw_pco", src_comp=[16, 4, 4], dest_comp=16, indices=[SMP_FLAGS_PCO, RANGE, ENABLED_CHANNELS], bit_sizes=[32])
 
 # smp_write_pco(data, tex_state, smp_state)
 # Performs a sample write for the given data and state words.
diff --git a/src/imagination/pco/pco_nir_tex.c b/src/imagination/pco/pco_nir_tex.c
index c2db95997b9..a902d3943b6 100644
--- a/src/imagination/pco/pco_nir_tex.c
+++ b/src/imagination/pco/pco_nir_tex.c
@@ -370,7 +370,7 @@ nir_intrinsic_instr *pco_emit_nir_smp(nir_builder *b, pco_smp_params *params)
 
    if (params->sample_raw) {
       assert(!params->sample_coeffs);
-      assert(!params->sample_components);
+      assert(params->sample_components >= 1 && params->sample_components <= 4);
       assert(!params->write_data);
 
       nir_def *def = nir_smp_raw_pco(b,
@@ -378,7 +378,8 @@ nir_intrinsic_instr *pco_emit_nir_smp(nir_builder *b, pco_smp_params *params)
                                      params->tex_state,
                                      params->smp_state,
                                      .smp_flags_pco = smp_flags._,
-                                     .range = count);
+                                     .range = count,
+                                     .enabled_channels = params->sample_components);
 
       return nir_def_as_intrinsic(def);
    }
@@ -419,7 +420,7 @@ lower_tex_gather(nir_builder *b, nir_tex_instr *tex, nir_def *raw_data)
 {
    assert(!nir_tex_instr_has_explicit_tg4_offsets(tex));
 
-#define TG4_SEL(sample) (((sample) * 4) + tex->component)
+#define TG4_SEL(sample) (((sample) * (tex->component + 1)) + tex->component)
    unsigned swiz[] = { TG4_SEL(2), TG4_SEL(3), TG4_SEL(1), TG4_SEL(0) };
 #undef TG4_SEL
 
@@ -739,6 +740,7 @@ static bool lower_tex(nir_builder *b, nir_tex_instr *tex, void *cb_data)
 
    case nir_texop_tg4:
       params.sample_raw = true;
+      params.sample_components = tex->component + 1;
       smp = pco_emit_nir_smp(b, &params);
       result = lower_tex_gather(b, tex, &smp->def);
       break;
diff --git a/src/imagination/pco/pco_trans_nir.c b/src/imagination/pco/pco_trans_nir.c
index 269602d1f5c..ce930fd3d6d 100644
--- a/src/imagination/pco/pco_trans_nir.c
+++ b/src/imagination/pco/pco_trans_nir.c
@@ -1708,7 +1708,9 @@ static pco_instr *lower_smp(trans_ctx *tctx,
       break;
 
    case nir_intrinsic_smp_raw_pco:
-      chans = 4;
+      chans = nir_intrinsic_enabled_channels(intr);
+      /* Shrink the destination to its actual size. */
+      *dest = pco_ref_chans(*dest, chans * 4);
       sb_mode = PCO_SB_MODE_RAWDATA;
       break;