nv50: fully migrate away from util_framebuffer_init

somehow missed those.. oops.

Fixes: facb048cdb ("nouveau: move util_framebuffer_init into the driver")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36500>
(cherry picked from commit cbb2881716)
This commit is contained in:
Karol Herbst 2025-07-31 21:56:18 +02:00 committed by Eric Engestrom
parent 04352acc96
commit ccfab45fe2
3 changed files with 3 additions and 3 deletions

View file

@ -3144,7 +3144,7 @@
"description": "nv50: fully migrate away from util_framebuffer_init",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "facb048cdbbe1acffb41cdfbebc9042c1d539cd4",
"notes": null

View file

@ -150,7 +150,7 @@ nv50_context_unreference_resources(struct nv50_context *nv50)
nouveau_bufctx_del(&nv50->bufctx);
nouveau_bufctx_del(&nv50->bufctx_cp);
util_framebuffer_init(&nv50->base.pipe, NULL, nv50->fb_cbufs, &nv50->fb_zsbuf);
nv50_framebuffer_init(&nv50->base.pipe, NULL, nv50->fb_cbufs, &nv50->fb_zsbuf);
util_unreference_framebuffer_state(&nv50->framebuffer);
assert(nv50->num_vtxbufs <= PIPE_MAX_ATTRIBS);

View file

@ -1006,7 +1006,7 @@ nv50_set_framebuffer_state(struct pipe_context *pipe,
nouveau_bufctx_reset(nv50->bufctx_3d, NV50_BIND_3D_FB);
util_framebuffer_init(pipe, fb, nv50->fb_cbufs, &nv50->fb_zsbuf);
nv50_framebuffer_init(pipe, fb, nv50->fb_cbufs, &nv50->fb_zsbuf);
util_copy_framebuffer_state(&nv50->framebuffer, fb);
nv50->dirty_3d |= NV50_NEW_3D_FRAMEBUFFER | NV50_NEW_3D_TEXTURES;