a4xx: add logic to emit image/ssbo state
authorIlia Mirkin <imirkin@alum.mit.edu>
Sun, 14 Nov 2021 17:59:40 +0000 (12:59 -0500)
committerIlia Mirkin <imirkin@alum.mit.edu>
Sat, 5 Mar 2022 08:21:05 +0000 (03:21 -0500)
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14794>

src/gallium/drivers/freedreno/a4xx/fd4_emit.c
src/gallium/drivers/freedreno/a4xx/fd4_image.c [new file with mode: 0644]
src/gallium/drivers/freedreno/a4xx/fd4_image.h [new file with mode: 0644]
src/gallium/drivers/freedreno/a4xx/fd4_program.c
src/gallium/drivers/freedreno/meson.build

index 73c4fd6..2697d44 100644 (file)
@@ -38,6 +38,7 @@
 #include "fd4_context.h"
 #include "fd4_emit.h"
 #include "fd4_format.h"
+#include "fd4_image.h"
 #include "fd4_program.h"
 #include "fd4_rasterizer.h"
 #include "fd4_texture.h"
@@ -460,6 +461,54 @@ fd4_emit_gmem_restore_tex(struct fd_ringbuffer *ring, unsigned nr_bufs,
                      A4XX_RB_RENDER_COMPONENTS_RT7(mrt_comp[7]));
 }
 
+static void
+emit_ssbos(struct fd_context *ctx, struct fd_ringbuffer *ring,
+      enum a4xx_state_block sb, struct fd_shaderbuf_stateobj *so)
+{
+   unsigned count = util_last_bit(so->enabled_mask);
+
+   if (count == 0)
+      return;
+
+   OUT_PKT3(ring, CP_LOAD_STATE4, 2 + (4 * count));
+   OUT_RING(ring, CP_LOAD_STATE4_0_DST_OFF(0) |
+         CP_LOAD_STATE4_0_STATE_SRC(SS4_DIRECT) |
+         CP_LOAD_STATE4_0_STATE_BLOCK(sb) |
+         CP_LOAD_STATE4_0_NUM_UNIT(count));
+   OUT_RING(ring, CP_LOAD_STATE4_1_STATE_TYPE(0) |
+         CP_LOAD_STATE4_1_EXT_SRC_ADDR(0));
+   for (unsigned i = 0; i < count; i++) {
+      struct pipe_shader_buffer *buf = &so->sb[i];
+      if (buf->buffer) {
+         struct fd_resource *rsc = fd_resource(buf->buffer);
+         OUT_RELOC(ring, rsc->bo, buf->buffer_offset, 0, 0);
+      } else {
+         OUT_RING(ring, 0x00000000);
+      }
+      OUT_RING(ring, 0x00000000);
+      OUT_RING(ring, 0x00000000);
+      OUT_RING(ring, 0x00000000);
+   }
+
+   OUT_PKT3(ring, CP_LOAD_STATE4, 2 + (2 * count));
+   OUT_RING(ring, CP_LOAD_STATE4_0_DST_OFF(0) |
+         CP_LOAD_STATE4_0_STATE_SRC(SS4_DIRECT) |
+         CP_LOAD_STATE4_0_STATE_BLOCK(sb) |
+         CP_LOAD_STATE4_0_NUM_UNIT(count));
+   OUT_RING(ring, CP_LOAD_STATE4_1_STATE_TYPE(1) |
+         CP_LOAD_STATE4_1_EXT_SRC_ADDR(0));
+   for (unsigned i = 0; i < count; i++) {
+      struct pipe_shader_buffer *buf = &so->sb[i];
+      unsigned sz = buf->buffer_size;
+
+      /* width is in dwords, overflows into height: */
+      sz /= 4;
+
+      OUT_RING(ring, A4XX_SSBO_1_0_WIDTH(sz));
+      OUT_RING(ring, A4XX_SSBO_1_1_HEIGHT(sz >> 16));
+   }
+}
+
 void
 fd4_emit_vertex_bufs(struct fd_ringbuffer *ring, struct fd4_emit *emit)
 {
@@ -850,6 +899,14 @@ fd4_emit_state(struct fd_context *ctx, struct fd_ringbuffer *ring,
 
    if (ctx->dirty_shader[PIPE_SHADER_FRAGMENT] & FD_DIRTY_SHADER_TEX)
       emit_textures(ctx, ring, SB4_FS_TEX, &ctx->tex[PIPE_SHADER_FRAGMENT], fp);
+
+   if (!emit->binning_pass) {
+      if (ctx->dirty_shader[PIPE_SHADER_FRAGMENT] & FD_DIRTY_SHADER_SSBO)
+         emit_ssbos(ctx, ring, SB4_SSBO, &ctx->shaderbuf[PIPE_SHADER_FRAGMENT]);
+
+      if (ctx->dirty_shader[PIPE_SHADER_FRAGMENT] & FD_DIRTY_SHADER_IMAGE)
+         fd4_emit_images(ctx, ring, PIPE_SHADER_FRAGMENT, fp);
+   }
 }
 
 /* emit setup at begin of new cmdstream buffer (don't rely on previous
@@ -868,7 +925,7 @@ fd4_emit_restore(struct fd_batch *batch, struct fd_ringbuffer *ring)
    OUT_RING(ring, 0x00000000);
 
    OUT_PKT0(ring, REG_A4XX_SP_MODE_CONTROL, 1);
-   OUT_RING(ring, 0x00000006);
+   OUT_RING(ring, 0x0000001e);
 
    OUT_PKT0(ring, REG_A4XX_TPL1_TP_MODE_CONTROL, 1);
    OUT_RING(ring, 0x0000003a);
@@ -890,7 +947,7 @@ fd4_emit_restore(struct fd_batch *batch, struct fd_ringbuffer *ring)
    OUT_RING(ring, 0x00000012);
 
    OUT_PKT0(ring, REG_A4XX_HLSQ_MODE_CONTROL, 1);
-   OUT_RING(ring, 0x00000000);
+   OUT_RING(ring, 0x00000003);
 
    OUT_PKT0(ring, REG_A4XX_UNKNOWN_0CC5, 1);
    OUT_RING(ring, 0x00000006);
diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_image.c b/src/gallium/drivers/freedreno/a4xx/fd4_image.c
new file mode 100644 (file)
index 0000000..20e4190
--- /dev/null
@@ -0,0 +1,252 @@
+/*
+ * Copyright (C) 2017 Rob Clark <robclark@freedesktop.org>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Authors:
+ *    Rob Clark <robclark@freedesktop.org>
+ */
+
+#include "pipe/p_state.h"
+
+#include "freedreno_resource.h"
+#include "fd4_image.h"
+#include "fd4_format.h"
+#include "fd4_texture.h"
+
+static enum a4xx_state_block texsb[] = {
+   [PIPE_SHADER_COMPUTE] = SB4_CS_TEX,
+   [PIPE_SHADER_FRAGMENT] = SB4_FS_TEX,
+};
+
+static enum a4xx_state_block imgsb[] = {
+   [PIPE_SHADER_COMPUTE] = SB4_CS_SSBO,
+   [PIPE_SHADER_FRAGMENT] = SB4_SSBO,
+};
+
+struct fd4_image {
+   enum pipe_format pfmt;
+   enum a4xx_color_fmt fmt;
+   enum a4xx_tex_fmt texfmt;
+   enum a4xx_tex_type type;
+   bool srgb;
+   uint32_t cpp;
+   uint32_t width;
+   uint32_t height;
+   uint32_t depth;
+   uint32_t pitch;
+   uint32_t array_pitch;
+   uint32_t pitchalign;
+   struct fd_bo *bo;
+   uint32_t offset;
+   bool buffer;
+   uint32_t texconst4;
+};
+
+static void translate_image(struct fd4_image *img, struct pipe_image_view *pimg)
+{
+   enum pipe_format format = pimg->format;
+   struct pipe_resource *prsc = pimg->resource;
+   struct fd_resource *rsc = fd_resource(prsc);
+
+   if (!pimg->resource) {
+      memset(img, 0, sizeof(*img));
+      return;
+   }
+
+   img->pfmt      = format;
+   img->fmt       = fd4_pipe2color(format);
+   img->texfmt    = fd4_pipe2tex(format);
+   img->type      = fd4_tex_type(prsc->target);
+   img->srgb      = util_format_is_srgb(format);
+   img->bo        = rsc->bo;
+   img->texconst4 = 0;
+
+   /* Treat cube textures as 2d-array: */
+   if (img->type == A4XX_TEX_CUBE)
+      img->type = A4XX_TEX_2D;
+
+   if (prsc->target == PIPE_BUFFER) {
+      img->buffer = true;
+      img->offset = pimg->u.buf.offset;
+      img->cpp = util_format_get_blocksize(format);
+      img->array_pitch = 0;
+      img->pitch = 0;
+      img->pitchalign = 0;
+
+      /* size is encoded with low 16b in WIDTH and high bits in
+       * HEIGHT, in units of elements:
+       */
+      unsigned sz = pimg->u.buf.size / img->cpp;
+      img->width = sz & MASK(16);
+      img->height = sz >> 16;
+      img->depth = 0;
+
+      /* Note that the blob sets the PITCH to the CPP in the SSBO descriptor,
+       * but that messes up the sampler we create, so skip that.
+       */
+   } else {
+      img->buffer = false;
+      img->cpp = rsc->layout.cpp;
+
+      unsigned lvl = pimg->u.tex.level;
+      img->offset = fd_resource_offset(rsc, lvl, pimg->u.tex.first_layer);
+      img->pitch = fd_resource_pitch(rsc, lvl);
+      img->pitchalign = rsc->layout.pitchalign - 5;
+
+      img->width = u_minify(prsc->width0, lvl);
+      img->height = u_minify(prsc->height0, lvl);
+
+      unsigned layers = pimg->u.tex.last_layer - pimg->u.tex.first_layer + 1;
+
+      switch (prsc->target) {
+      case PIPE_TEXTURE_RECT:
+      case PIPE_TEXTURE_1D:
+      case PIPE_TEXTURE_2D:
+         img->array_pitch = rsc->layout.layer_size;
+         img->depth = 1;
+         break;
+      case PIPE_TEXTURE_1D_ARRAY:
+      case PIPE_TEXTURE_2D_ARRAY:
+         img->array_pitch = rsc->layout.layer_size;
+         img->depth = layers;
+         break;
+      case PIPE_TEXTURE_CUBE:
+      case PIPE_TEXTURE_CUBE_ARRAY:
+         img->array_pitch = rsc->layout.layer_size;
+         img->depth = layers;
+         break;
+      case PIPE_TEXTURE_3D:
+         img->array_pitch = fd_resource_slice(rsc, lvl)->size0;
+         img->depth = u_minify(prsc->depth0, lvl);
+         if (layers == 1 && img->depth > 1) {
+            img->type = A4XX_TEX_2D;
+            img->depth = 1;
+         } else {
+            img->texconst4 = A4XX_TEX_CONST_4_LAYERSZ(img->array_pitch);
+         }
+         break;
+      default:
+         img->array_pitch = 0;
+         img->depth = 0;
+         break;
+      }
+   }
+}
+
+static void emit_image_tex(struct fd_ringbuffer *ring, unsigned slot,
+      struct fd4_image *img, enum pipe_shader_type shader)
+{
+   OUT_PKT3(ring, CP_LOAD_STATE4, 2 + 8);
+   OUT_RING(ring, CP_LOAD_STATE4_0_DST_OFF(slot) |
+      CP_LOAD_STATE4_0_STATE_SRC(SS4_DIRECT) |
+      CP_LOAD_STATE4_0_STATE_BLOCK(texsb[shader]) |
+      CP_LOAD_STATE4_0_NUM_UNIT(1));
+   OUT_RING(ring, CP_LOAD_STATE4_1_STATE_TYPE(ST4_CONSTANTS) |
+      CP_LOAD_STATE4_1_EXT_SRC_ADDR(0));
+
+   OUT_RING(ring, A4XX_TEX_CONST_0_FMT(img->texfmt) |
+          A4XX_TEX_CONST_0_TYPE(img->type) |
+          fd4_tex_swiz(img->pfmt, PIPE_SWIZZLE_X, PIPE_SWIZZLE_Y,
+                    PIPE_SWIZZLE_Z, PIPE_SWIZZLE_W) |
+          COND(img->srgb, A4XX_TEX_CONST_0_SRGB));
+   OUT_RING(ring, A4XX_TEX_CONST_1_WIDTH(img->width) |
+      A4XX_TEX_CONST_1_HEIGHT(img->height));
+   OUT_RING(ring, A4XX_TEX_CONST_2_PITCHALIGN(img->pitchalign) |
+      A4XX_TEX_CONST_2_PITCH(img->pitch) |
+      COND(img->buffer, A4XX_TEX_CONST_2_BUFFER));
+   OUT_RING(ring, A4XX_TEX_CONST_3_DEPTH(img->depth) |
+          A4XX_TEX_CONST_3_LAYERSZ(img->array_pitch));
+   if (img->bo) {
+      OUT_RELOC(ring, img->bo, img->offset, img->texconst4, 0);
+   } else {
+      OUT_RING(ring, 0x00000000);
+   }
+   OUT_RING(ring, 0x00000000);
+   OUT_RING(ring, 0x00000000);
+   OUT_RING(ring, 0x00000000);
+
+   /* Per fd4_emit.c, some of the hw likes samplers in pairs */
+   OUT_PKT3(ring, CP_LOAD_STATE4, 2 + 4);
+   OUT_RING(ring, CP_LOAD_STATE4_0_DST_OFF(slot) |
+      CP_LOAD_STATE4_0_STATE_SRC(SS4_DIRECT) |
+      CP_LOAD_STATE4_0_STATE_BLOCK(texsb[shader]) |
+      CP_LOAD_STATE4_0_NUM_UNIT(2));
+   OUT_RING(ring, CP_LOAD_STATE4_1_STATE_TYPE(ST4_SHADER) |
+      CP_LOAD_STATE4_1_EXT_SRC_ADDR(0));
+   OUT_RING(ring, 0x00000000);
+   OUT_RING(ring, 0x00000000);
+   OUT_RING(ring, 0x00000000);
+   OUT_RING(ring, 0x00000000);
+}
+
+static void emit_image_ssbo(struct fd_ringbuffer *ring, unsigned slot,
+      struct fd4_image *img, enum pipe_shader_type shader)
+{
+   OUT_PKT3(ring, CP_LOAD_STATE4, 2 + 4);
+   OUT_RING(ring, CP_LOAD_STATE4_0_DST_OFF(slot) |
+      CP_LOAD_STATE4_0_STATE_SRC(SS4_DIRECT) |
+      CP_LOAD_STATE4_0_STATE_BLOCK(imgsb[shader]) |
+      CP_LOAD_STATE4_0_NUM_UNIT(1));
+   OUT_RING(ring, CP_LOAD_STATE4_1_STATE_TYPE(0) |
+      CP_LOAD_STATE4_1_EXT_SRC_ADDR(0));
+   OUT_RELOC(ring, img->bo, img->offset, 0, 0);
+   OUT_RING(ring, A4XX_SSBO_0_1_PITCH(img->pitch));
+   OUT_RING(ring, A4XX_SSBO_0_2_ARRAY_PITCH(img->array_pitch));
+   OUT_RING(ring, A4XX_SSBO_0_3_CPP(img->cpp));
+
+   OUT_PKT3(ring, CP_LOAD_STATE4, 2 + 2);
+   OUT_RING(ring, CP_LOAD_STATE4_0_DST_OFF(slot) |
+      CP_LOAD_STATE4_0_STATE_SRC(SS4_DIRECT) |
+      CP_LOAD_STATE4_0_STATE_BLOCK(imgsb[shader]) |
+      CP_LOAD_STATE4_0_NUM_UNIT(1));
+   OUT_RING(ring, CP_LOAD_STATE4_1_STATE_TYPE(1) |
+      CP_LOAD_STATE4_1_EXT_SRC_ADDR(0));
+   OUT_RING(ring, A4XX_SSBO_1_0_CPP(img->cpp) |
+      A4XX_SSBO_1_0_FMT(img->fmt) |
+      A4XX_SSBO_1_0_WIDTH(img->width));
+   OUT_RING(ring, A4XX_SSBO_1_1_HEIGHT(img->height) |
+      A4XX_SSBO_1_1_DEPTH(img->depth));
+}
+
+/* Emit required "SSBO" and sampler state.  The sampler state is used by the
+ * hw for imageLoad(), and "SSBO" state for imageStore().  Returns max sampler
+ * used.
+ */
+void
+fd4_emit_images(struct fd_context *ctx, struct fd_ringbuffer *ring,
+      enum pipe_shader_type shader,
+      const struct ir3_shader_variant *v)
+{
+   struct fd_shaderimg_stateobj *so = &ctx->shaderimg[shader];
+   unsigned enabled_mask = so->enabled_mask;
+   const struct ir3_ibo_mapping *m = &v->image_mapping;
+
+   while (enabled_mask) {
+      unsigned index = u_bit_scan(&enabled_mask);
+      struct fd4_image img;
+
+      translate_image(&img, &so->si[index]);
+
+      if (m->image_to_tex[index] != IBO_INVALID)
+         emit_image_tex(ring, m->image_to_tex[index] + m->tex_base, &img, shader);
+      emit_image_ssbo(ring, v->shader->nir->info.num_ssbos + index, &img, shader);
+   }
+}
diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_image.h b/src/gallium/drivers/freedreno/a4xx/fd4_image.h
new file mode 100644 (file)
index 0000000..3aea380
--- /dev/null
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2017 Rob Clark <robclark@freedesktop.org>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Authors:
+ *    Rob Clark <robclark@freedesktop.org>
+ */
+
+#ifndef FD4_IMAGE_H_
+#define FD4_IMAGE_H_
+
+#include "freedreno_context.h"
+
+struct ir3_shader_variant;
+
+void fd4_emit_images(struct fd_context *ctx, struct fd_ringbuffer *ring,
+      enum pipe_shader_type shader, const struct ir3_shader_variant *v);
+
+#endif /* FD4_IMAGE_H_ */
index d2eeab5..6c04571 100644 (file)
@@ -250,26 +250,33 @@ fd4_program_emit(struct fd_ringbuffer *ring, struct fd4_emit *emit, int nr,
    OUT_RING(ring,
             A4XX_HLSQ_VS_CONTROL_REG_CONSTLENGTH(s[VS].constlen) |
                A4XX_HLSQ_VS_CONTROL_REG_CONSTOBJECTOFFSET(s[VS].constoff) |
+               COND(s[VS].v && s[VS].v->has_ssbo, A4XX_HLSQ_VS_CONTROL_REG_SSBO_ENABLE) |
+               COND(s[VS].v, A4XX_HLSQ_VS_CONTROL_REG_ENABLED) |
                A4XX_HLSQ_VS_CONTROL_REG_INSTRLENGTH(s[VS].instrlen) |
                A4XX_HLSQ_VS_CONTROL_REG_SHADEROBJOFFSET(s[VS].instroff));
    OUT_RING(ring,
             A4XX_HLSQ_FS_CONTROL_REG_CONSTLENGTH(s[FS].constlen) |
                A4XX_HLSQ_FS_CONTROL_REG_CONSTOBJECTOFFSET(s[FS].constoff) |
+               COND(s[FS].v && s[FS].v->has_ssbo, A4XX_HLSQ_FS_CONTROL_REG_SSBO_ENABLE) |
+               COND(s[FS].v, A4XX_HLSQ_FS_CONTROL_REG_ENABLED) |
                A4XX_HLSQ_FS_CONTROL_REG_INSTRLENGTH(s[FS].instrlen) |
                A4XX_HLSQ_FS_CONTROL_REG_SHADEROBJOFFSET(s[FS].instroff));
    OUT_RING(ring,
             A4XX_HLSQ_HS_CONTROL_REG_CONSTLENGTH(s[HS].constlen) |
                A4XX_HLSQ_HS_CONTROL_REG_CONSTOBJECTOFFSET(s[HS].constoff) |
+               COND(s[HS].v && s[HS].v->has_ssbo, A4XX_HLSQ_HS_CONTROL_REG_SSBO_ENABLE) |
                A4XX_HLSQ_HS_CONTROL_REG_INSTRLENGTH(s[HS].instrlen) |
                A4XX_HLSQ_HS_CONTROL_REG_SHADEROBJOFFSET(s[HS].instroff));
    OUT_RING(ring,
             A4XX_HLSQ_DS_CONTROL_REG_CONSTLENGTH(s[DS].constlen) |
                A4XX_HLSQ_DS_CONTROL_REG_CONSTOBJECTOFFSET(s[DS].constoff) |
+               COND(s[DS].v && s[DS].v->has_ssbo, A4XX_HLSQ_DS_CONTROL_REG_SSBO_ENABLE) |
                A4XX_HLSQ_DS_CONTROL_REG_INSTRLENGTH(s[DS].instrlen) |
                A4XX_HLSQ_DS_CONTROL_REG_SHADEROBJOFFSET(s[DS].instroff));
    OUT_RING(ring,
             A4XX_HLSQ_GS_CONTROL_REG_CONSTLENGTH(s[GS].constlen) |
                A4XX_HLSQ_GS_CONTROL_REG_CONSTOBJECTOFFSET(s[GS].constoff) |
+               COND(s[GS].v && s[GS].v->has_ssbo, A4XX_HLSQ_GS_CONTROL_REG_SSBO_ENABLE) |
                A4XX_HLSQ_GS_CONTROL_REG_INSTRLENGTH(s[GS].instrlen) |
                A4XX_HLSQ_GS_CONTROL_REG_SHADEROBJOFFSET(s[GS].instroff));
 
index 7b0ba2b..854cdf5 100644 (file)
@@ -128,6 +128,8 @@ files_libfreedreno = files(
   'a4xx/fd4_format.h',
   'a4xx/fd4_gmem.c',
   'a4xx/fd4_gmem.h',
+  'a4xx/fd4_image.c',
+  'a4xx/fd4_image.h',
   'a4xx/fd4_program.c',
   'a4xx/fd4_program.h',
   'a4xx/fd4_query.c',