AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asahi: use #defines for uniforms

Browse Source 
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35658>
This commit is contained in:
Alyssa Rosenzweig
2025-05-30 11:48:34 -04:00
committed by Marge Bot
parent c3b449ff98
commit 53bbd850f5
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/asahi/lib/agx_abi.h
+3 -3
View File
@@ -36,9 +36,9 @@
#define AGX_ABI_VUNI_INPUT_ASSEMBLY(nr_vbos) \
(AGX_ABI_VUNI_FIRST_VERTEX(nr_vbos) + 8)
#define AGX_ABI_VUNI_COUNT(nr_vbos, hw) \
(hw ? (AGX_ABI_VUNI_BASE_INSTANCE(nr_vbos) + 5) \
: (AGX_ABI_VUNI_INPUT_ASSEMBLY(nr_vbos) + 4))
#define AGX_ABI_VUNI_COUNT_GL(nr_vbos, sw) \
(sw ? (AGX_ABI_VUNI_INPUT_ASSEMBLY(nr_vbos) + 4) \
: (AGX_ABI_VUNI_BASE_INSTANCE(nr_vbos) + 2))
#define AGX_ABI_VUNI_COUNT_VK(nr_vbos) \
ALIGN_POT(AGX_ABI_VUNI_INPUT_ASSEMBLY(nr_vbos) + 4, 4)
src/gallium/drivers/asahi/agx_nir_lower_sysvals.c
+13 -13
View File
@@ -7,6 +7,7 @@
#include "pipe/p_defines.h"
#include "util/bitset.h"
#include "util/u_dynarray.h"
#include "agx_abi.h"
#include "agx_nir_lower_gs.h"
#include "agx_state.h"
#include "nir.h"
@@ -388,14 +389,14 @@ lay_out_uniforms(struct agx_compiled_shader *shader, struct state *state)
if (count) {
shader->push[shader->push_range_count++] = (struct agx_push_range){
.uniform = 0,
.uniform = AGX_ABI_VUNI_VBO_BASE(0),
.table = AGX_SYSVAL_TABLE_ROOT,
.offset = (uintptr_t)&u->attrib_base,
.length = 4 * count,
};
shader->push[shader->push_range_count++] = (struct agx_push_range){
.uniform = 4 * count,
.uniform = AGX_ABI_VUNI_VBO_CLAMP(count, 0),
.table = AGX_SYSVAL_TABLE_ROOT,
.offset = (uintptr_t)&u->attrib_clamp,
.length = 2 * count,
@@ -403,49 +404,48 @@ lay_out_uniforms(struct agx_compiled_shader *shader, struct state *state)
}
shader->push[shader->push_range_count++] = (struct agx_push_range){
.uniform = 6 * count,
.uniform = AGX_ABI_VUNI_FIRST_VERTEX(count),
.table = AGX_SYSVAL_TABLE_PARAMS,
.offset = 0,
.length = 4,
};
uniform = (6 * count) + 4;
if (state->hw_stage == PIPE_SHADER_COMPUTE) {
bool sw = state->hw_stage == PIPE_SHADER_COMPUTE;
if (sw) {
shader->push[shader->push_range_count++] = (struct agx_push_range){
.uniform = (6 * count) + 8,
.uniform = AGX_ABI_VUNI_INPUT_ASSEMBLY(count),
.table = AGX_SYSVAL_TABLE_ROOT,
.offset = (uintptr_t)&u->input_assembly,
.length = 4,
};
uniform = (6 * count) + 12;
}
uniform = AGX_ABI_VUNI_COUNT_GL(count, sw);
} else if (state->stage == PIPE_SHADER_FRAGMENT) {
struct agx_draw_uniforms *u = NULL;
struct agx_stage_uniforms *s = NULL;
shader->push[shader->push_range_count++] = (struct agx_push_range){
.uniform = 0,
.uniform = AGX_ABI_FUNI_EMRT_HEAP,
.table = AGX_SYSVAL_TABLE_FS,
.offset = (uintptr_t)&s->texture_base,
.length = 4,
};
shader->push[shader->push_range_count++] = (struct agx_push_range){
.uniform = 4,
.uniform = AGX_ABI_FUNI_BLEND_R,
.table = AGX_SYSVAL_TABLE_ROOT,
.offset = (uintptr_t)&u->blend_constant,
.length = 8,
};
shader->push[shader->push_range_count++] = (struct agx_push_range){
.uniform = 12,
.uniform = AGX_ABI_FUNI_ROOT,
.table = AGX_SYSVAL_TABLE_ROOT,
.offset = (uintptr_t)&u->tables[AGX_SYSVAL_TABLE_ROOT],
.length = 4,
};
uniform = 16;
uniform = AGX_ABI_FUNI_COUNT;
}
/* Lay out each system value table. We do this backwards to ensure the first