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

nvk: Enable cbufs

Browse source 
Just in case this breaks and blows up the universe, we'll add a NO_CBUFS
debug flag as a back-door.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26615>
This commit is contained in:
Faith Ekstrand 2023-12-08 18:43:55 -06:00 • committed by Marge Bot
parent d41fe63d99
commit 45f320e97f
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/nouveau/vulkan/nvk_shader.c
View file

@ -80,18 +80,20 @@ use_nak(const struct nvk_physical_device *pdev, gl_shader_stage stage)
uint64_t uint64_t
nvk_physical_device_compiler_flags(const struct nvk_physical_device *pdev) nvk_physical_device_compiler_flags(const struct nvk_physical_device *pdev)
{ {
bool no_cbufs = pdev->debug_flags & NVK_DEBUG_NO_CBUF;
uint64_t prog_debug = nvk_cg_get_prog_debug(); uint64_t prog_debug = nvk_cg_get_prog_debug();
uint64_t prog_optimize = nvk_cg_get_prog_optimize(); uint64_t prog_optimize = nvk_cg_get_prog_optimize();
uint64_t nak_stages = nvk_nak_stages(&pdev->info); uint64_t nak_stages = nvk_nak_stages(&pdev->info);
uint64_t nak_flags = nak_debug_flags(pdev->nak); uint64_t nak_flags = nak_debug_flags(pdev->nak);
assert(prog_debug <= UINT8_MAX); assert(prog_debug <= UINT8_MAX);
assert(prog_optimize <= UINT8_MAX); assert(prog_optimize < 16);
assert(nak_stages <= UINT32_MAX); assert(nak_stages <= UINT32_MAX);
assert(nak_flags <= UINT16_MAX); assert(nak_flags <= UINT16_MAX);
return prog_debug return prog_debug
| (prog_optimize << 8) | (prog_optimize << 8)
| ((uint64_t)no_cbufs << 12)
| (nak_stages << 16) | (nak_stages << 16)
| (nak_flags << 48); | (nak_flags << 48);
} }
@ -350,7 +352,8 @@ nvk_lower_nir(struct nvk_device *dev, nir_shader *nir,
assert(dev->pdev->info.cls_eng3d >= MAXWELL_A || !nir_has_image_var(nir)); assert(dev->pdev->info.cls_eng3d >= MAXWELL_A || !nir_has_image_var(nir));
struct nvk_cbuf_map *cbuf_map = NULL; struct nvk_cbuf_map *cbuf_map = NULL;
if (use_nak(pdev, nir->info.stage) && 0) { if (use_nak(pdev, nir->info.stage) &&
!(pdev->debug_flags & NVK_DEBUG_NO_CBUF)) {
cbuf_map = &shader->cbuf_map; cbuf_map = &shader->cbuf_map;
} else { } else {
/* Codegen sometimes puts stuff in cbuf 1 and adds 1 to our cbuf indices /* Codegen sometimes puts stuff in cbuf 1 and adds 1 to our cbuf indices

1
src/nouveau/winsys/nouveau_device.c
View file

@ -132,6 +132,7 @@ nouveau_ws_device_set_dbg_flags(struct nouveau_ws_device *dev)
{ "push_sync", NVK_DEBUG_PUSH_SYNC }, { "push_sync", NVK_DEBUG_PUSH_SYNC },
{ "zero_memory", NVK_DEBUG_ZERO_MEMORY }, { "zero_memory", NVK_DEBUG_ZERO_MEMORY },
{ "vm", NVK_DEBUG_VM }, { "vm", NVK_DEBUG_VM },
{ "no_cbuf", NVK_DEBUG_NO_CBUF },
{ NULL, 0 }, { NULL, 0 },
}; };

6
src/nouveau/winsys/nouveau_device.h
View file

@ -34,6 +34,12 @@ enum nvk_debug {
/* Dump VM bind/unbinds /* Dump VM bind/unbinds
*/ */
NVK_DEBUG_VM = 1ull << 3, NVK_DEBUG_VM = 1ull << 3,
/* Disable most cbufs
*
* Root descriptors still end up in a cbuf
*/
NVK_DEBUG_NO_CBUF = 1ull << 5,
}; };
struct nouveau_ws_device { struct nouveau_ws_device {