fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

asahi: Implement lod queries

Browse source 
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26861>
This commit is contained in:
Alyssa Rosenzweig 2023-12-10 17:05:55 -04:00 • committed by Marge Bot
parent d32daa3fb2
commit e7f3112eb9
6 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/asahi/compiler/agx_compile.c
View file

@ -7,7 +7,6 @@
#include "agx_compile.h"
#include "compiler/nir/nir_builder.h"
#include "glsl_types.h"
#include "util/glheader.h"
#include "util/macros.h"
#include "util/u_debug.h"
@ -16,6 +15,7 @@
#include "agx_debug.h"
#include "agx_internal_formats.h"
#include "agx_nir.h"
#include "glsl_types.h"
#include "nir.h"
#include "nir_intrinsics.h"
#include "nir_intrinsics_indices.h"
@ -1713,7 +1713,7 @@ agx_emit_alu(agx_builder *b, nir_alu_instr *instr)
}
static enum agx_lod_mode
agx_lod_mode_for_nir(nir_texop op)
agx_lod_mode_for_nir(nir_texop op, bool biased)
{
switch (op) {
case nir_texop_tex:
@ -1721,6 +1721,8 @@ agx_lod_mode_for_nir(nir_texop op)
return AGX_LOD_MODE_AUTO_LOD;
case nir_texop_txb:
return AGX_LOD_MODE_AUTO_LOD_BIAS;
case nir_texop_lod:
return biased ? AGX_LOD_MODE_AUTO_LOD_BIAS : AGX_LOD_MODE_AUTO_LOD;
case nir_texop_txd:
return AGX_LOD_MODE_LOD_GRAD;
case nir_texop_txl:
@ -1847,8 +1849,10 @@ agx_emit_tex(agx_builder *b, nir_tex_instr *instr)
agx_instr *I = agx_texture_sample_to(
b, tmp, coords, lod, bindless, texture, sampler, compare_offset,
agx_tex_dim(instr->sampler_dim, instr->is_array),
agx_lod_mode_for_nir(instr->op), 0, 0, !agx_is_null(packed_offset),
!agx_is_null(compare), agx_gather_for_nir(instr));
agx_lod_mode_for_nir(
instr->op, nir_tex_instr_src_index(instr, nir_tex_src_bias) >= 0),
0, 0, !agx_is_null(packed_offset), !agx_is_null(compare),
instr->op == nir_texop_lod, agx_gather_for_nir(instr));
if (txf)
I->op = AGX_OPCODE_TEXTURE_LOAD;

3
src/asahi/compiler/agx_compiler.h
View file

@ -311,6 +311,7 @@ typedef struct {
enum agx_dim dim : 4;
bool offset : 1;
bool shadow : 1;
bool query_lod : 1;
enum agx_gather gather : 3;
/* TODO: Handle iter ops more efficient */
@ -330,7 +331,7 @@ typedef struct {
bool saturate : 1;
unsigned mask : 4;
unsigned padding : 9;
unsigned padding : 8;
} agx_instr;
static inline void

7
src/asahi/compiler/agx_nir_lower_texture.c
View file

@ -150,7 +150,7 @@ lower_regular_texture(nir_builder *b, nir_instr *instr, UNUSED void *data)
nir_tex_instr *tex = nir_instr_as_tex(instr);
b->cursor = nir_before_instr(instr);
if (nir_tex_instr_is_query(tex))
if (nir_tex_instr_is_query(tex) && tex->op != nir_texop_lod)
return false;
if (tex->sampler_dim == GLSL_SAMPLER_DIM_BUF)
@ -306,6 +306,11 @@ lower_sampler_bias(nir_builder *b, nir_instr *instr, UNUSED void *data)
return true;
}
case nir_texop_lod: {
nir_tex_instr_add_src(tex, nir_tex_src_bias, bias_for_tex(b, tex));
return true;
}
case nir_texop_txf:
case nir_texop_txf_ms:
case nir_texop_txs:

3
src/asahi/compiler/agx_opcodes.py
View file

@ -104,6 +104,7 @@ GATHER = enum("gather", {
OFFSET = immediate("offset", "bool")
SHADOW = immediate("shadow", "bool")
QUERY_LOD = immediate("query_lod", "bool")
SCOREBOARD = immediate("scoreboard")
ICOND = immediate("icond", "enum agx_icond")
FCOND = immediate("fcond", "enum agx_fcond")
@ -276,7 +277,7 @@ op("fcmp", _, srcs = 2, imms = [FCOND, INVERT_COND])
op("texture_sample",
encoding_32 = (0x31, 0x7F, 8, 10), # XXX WRONG SIZE
srcs = 6, imms = [DIM, LOD_MODE, MASK, SCOREBOARD, OFFSET, SHADOW,
GATHER])
QUERY_LOD, GATHER])
for memory, can_reorder in [("texture", True), ("image", False)]:
op(f"{memory}_load", encoding_32 = (0x71, 0x7F, 8, 10), # XXX WRONG SIZE
srcs = 6, imms = [DIM, LOD_MODE, MASK, SCOREBOARD, OFFSET],

2
src/asahi/compiler/agx_pack.c
View file

@ -794,7 +794,7 @@ agx_pack_instr(struct util_dynarray *emission, struct util_dynarray *fixups,
unsigned D = agx_pack_lod(I->src[1], &lod_mode);
unsigned q1 = I->shadow;
unsigned q2 = 0; // XXX
unsigned q2 = I->query_lod ? 2 : 0;
unsigned q3 = 12; // XXX
unsigned kill = 0; // helper invocation kill bit

1
src/gallium/drivers/asahi/agx_pipe.c
View file

@ -1736,6 +1736,7 @@ agx_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
return 7;
case PIPE_CAP_DRAW_INDIRECT:
case PIPE_CAP_TEXTURE_QUERY_SAMPLES:
case PIPE_CAP_TEXTURE_QUERY_LOD:
return true;
case PIPE_CAP_MAX_VIEWPORTS: