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

nak: Disable cbuf textures on blackwell

Browse Source 
There are bound texture forms on blackwell, but they don't correspond
directly to the cbuf textures we have on sm70. Switch to only bindless
for now.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34334>
This commit is contained in:
Mel Henning
2025-04-03 18:25:23 -04:00
committed by Marge Bot
parent fd90b072f1
commit 5f5cb088a9
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nouveau/compiler/nak_nir_lower_tex.c
+9 -3
View File
@@ -9,6 +9,12 @@
#include "util/u_math.h"
static bool
has_cbuf_tex(const struct nak_compiler *nak) {
/* TODO: Figure out how bound textures work on blackwell */
return nak->sm >= 70 && nak->sm < 100;
}
static bool
tex_handle_as_cbuf(nir_def *tex_h, uint32_t *cbuf_out)
{
@@ -73,7 +79,7 @@ lower_tex(nir_builder *b, nir_tex_instr *tex, const struct nak_compiler *nak)
}
enum nak_nir_tex_ref_type ref_type = NAK_NIR_TEX_REF_TYPE_BINDLESS;
if (nak->sm >= 70 && tex_handle_as_cbuf(tex_h, &tex->texture_index)) {
if (has_cbuf_tex(nak) && tex_handle_as_cbuf(tex_h, &tex->texture_index)) {
ref_type = NAK_NIR_TEX_REF_TYPE_CBUF;
tex_h = NULL;
}
@@ -362,7 +368,7 @@ lower_txq(nir_builder *b, nir_tex_instr *tex, const struct nak_compiler *nak)
}
enum nak_nir_tex_ref_type ref_type = NAK_NIR_TEX_REF_TYPE_BINDLESS;
if (nak->sm >= 70 && tex_handle_as_cbuf(tex_h, &tex->texture_index)) {
if (has_cbuf_tex(nak) && tex_handle_as_cbuf(tex_h, &tex->texture_index)) {
ref_type = NAK_NIR_TEX_REF_TYPE_CBUF;
tex_h = NULL;
}
@@ -654,7 +660,7 @@ lower_image_txq(nir_builder *b, nir_intrinsic_instr *intrin,
uint32_t texture_index = 0;
enum nak_nir_tex_ref_type ref_type = NAK_NIR_TEX_REF_TYPE_BINDLESS;
if (nak->sm >= 70 && tex_handle_as_cbuf(img_h, &texture_index)) {
if (has_cbuf_tex(nak) && tex_handle_as_cbuf(img_h, &texture_index)) {
ref_type = NAK_NIR_TEX_REF_TYPE_CBUF;
img_h = NULL;
}