OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asahi: handle read-only SSBOs

Browse Source 
reduces silliness in Yuzu.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27616>
This commit is contained in:
Alyssa Rosenzweig
2024-01-18 20:00:14 -04:00
committed by Marge Bot
parent 97a945246c
commit 793ac04077
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/asahi/agx_state.c
View File

@@ -177,6 +177,8 @@ agx_set_shader_buffers(struct pipe_context *pctx, enum pipe_shader_type shader,
count); count);
ctx->stage[shader].dirty |= AGX_STAGE_DIRTY_SSBO; ctx->stage[shader].dirty |= AGX_STAGE_DIRTY_SSBO;
ctx->stage[shader].ssbo_writable_mask &= ~(BITFIELD_MASK(count) << start);
ctx->stage[shader].ssbo_writable_mask |= writable_bitmask << start;
} }
static void static void

1
src/gallium/drivers/asahi/agx_state.h
View File

@@ -261,6 +261,7 @@ struct agx_stage {
uint32_t cb_mask; uint32_t cb_mask;
struct pipe_shader_buffer ssbo[PIPE_MAX_SHADER_BUFFERS]; struct pipe_shader_buffer ssbo[PIPE_MAX_SHADER_BUFFERS];
uint32_t ssbo_writable_mask;
uint32_t ssbo_mask; uint32_t ssbo_mask;
struct pipe_image_view images[PIPE_MAX_SHADER_IMAGES]; struct pipe_image_view images[PIPE_MAX_SHADER_IMAGES];

10
src/gallium/drivers/asahi/agx_uniforms.c
View File

@@ -6,6 +6,7 @@
#include "asahi/lib/agx_pack.h" #include "asahi/lib/agx_pack.h"
#include "pipe/p_state.h" #include "pipe/p_state.h"
#include "util/format/u_format.h" #include "util/format/u_format.h"
#include "util/macros.h"
#include "agx_state.h" #include "agx_state.h"
#include "pool.h" #include "pool.h"
@@ -155,9 +156,12 @@ agx_upload_stage_uniforms(struct agx_batch *batch, uint64_t textures,
if (sb->buffer && st->ssbo[cb].buffer_size) { if (sb->buffer && st->ssbo[cb].buffer_size) {
struct agx_resource *rsrc = agx_resource(sb->buffer); struct agx_resource *rsrc = agx_resource(sb->buffer);
/* Assume SSBOs are written. TODO: Optimize read-only SSBOs */ if (st->ssbo_writable_mask & BITFIELD_BIT(cb)) {
agx_batch_writes_range(batch, rsrc, sb->buffer_offset, agx_batch_writes_range(batch, rsrc, sb->buffer_offset,
sb->buffer_size); sb->buffer_size);
} else {
agx_batch_reads(batch, rsrc);
}
uniforms.ssbo_base[cb] = rsrc->bo->ptr.gpu + sb->buffer_offset; uniforms.ssbo_base[cb] = rsrc->bo->ptr.gpu + sb->buffer_offset;
uniforms.ssbo_size[cb] = st->ssbo[cb].buffer_size; uniforms.ssbo_size[cb] = st->ssbo[cb].buffer_size;