fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-26 09:10:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

asahi: Add sampler heap data structure

Browse source 
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26056>
This commit is contained in:
Alyssa Rosenzweig 2023-10-06 10:38:36 -04:00 • committed by Marge Bot
parent 9c575eb18a
commit dc44619c62
3 changed files with 44 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/drivers/asahi/agx_batch.c
View file

@ -120,6 +120,9 @@ agx_batch_init(struct agx_context *ctx,
batch->any_draws = false;
batch->initialized = false;
batch->draws = 0;
agx_bo_unreference(batch->sampler_heap.bo);
batch->sampler_heap.bo = NULL;
batch->sampler_heap.count = 0;
/* We need to emit prim state at the start. Max collides with all. */
batch->reduced_prim = MESA_PRIM_COUNT;

25
src/gallium/drivers/asahi/agx_state.c
View file

@ -2242,6 +2242,28 @@ agx_upload_textures(struct agx_batch *batch, struct agx_compiled_shader *cs,
batch->textures[stage] = T_tex.gpu;
}
uint16_t
agx_sampler_heap_add(struct agx_device *dev, struct agx_sampler_heap *heap,
struct agx_sampler_packed *sampler)
{
/* Allocate (maximally sized) BO if we haven't already */
if (!heap->bo) {
heap->bo = agx_bo_create(dev, AGX_SAMPLER_HEAP_SIZE * AGX_SAMPLER_LENGTH,
AGX_BO_WRITEBACK, "Sampler heap");
assert(heap->count == 0);
}
/* TODO search */
/* Precondition: there is room in the heap */
assert(heap->count < AGX_SAMPLER_HEAP_SIZE);
struct agx_sampler_packed *samplers = heap->bo->ptr.cpu;
memcpy(samplers + heap->count, sampler, sizeof(*sampler));
return heap->count++;
}
static void
agx_upload_samplers(struct agx_batch *batch, struct agx_compiled_shader *cs,
enum pipe_shader_type stage)
@ -3320,6 +3342,9 @@ agx_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info,
} else if (unlikely(batch->draws > 100000)) {
/* Mostly so drawoverhead doesn't OOM */
agx_flush_batch_for_reason(ctx, batch, "Absurd number of draws");
} else if (unlikely(batch->sampler_heap.count >
(AGX_SAMPLER_HEAP_SIZE - (PIPE_MAX_SAMPLERS * 6)))) {
agx_flush_batch_for_reason(ctx, batch, "Sampler heap overflow");
}
}

16
src/gallium/drivers/asahi/agx_state.h
View file

@ -247,6 +247,20 @@ struct agx_stage {
union agx_batch_result {
};
/* This is a firmware limit. It should be possible to raise to 2048 in the
* future... still not good enough for VK though :-(
*/
#define AGX_SAMPLER_HEAP_SIZE (1024)
struct agx_sampler_heap {
struct agx_bo *bo;
uint16_t count;
};
uint16_t agx_sampler_heap_add(struct agx_device *dev,
struct agx_sampler_heap *heap,
struct agx_sampler_packed *sampler);
struct agx_batch {
struct agx_context *ctx;
struct pipe_framebuffer_state key;
@ -280,6 +294,8 @@ struct agx_batch {
uint64_t samplers[PIPE_SHADER_TYPES];
uint32_t sampler_count[PIPE_SHADER_TYPES];
struct agx_sampler_heap sampler_heap;
/* Resource list requirements, represented as a bit set indexed by BO
* handles (GEM handles on Linux, or IOGPU's equivalent on macOS)
*/