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

mesa/st: move manager colorbuffer interface to gl_context. 

This just avoids some st_context in main.

Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14675>
This commit is contained in:
Dave Airlie 2022-01-24 16:21:30 +10:00
parent 2f14e0d695
commit 0ba5def21a
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/main/buffers.c
View File

@ -947,7 +947,7 @@ read_buffer(struct gl_context *ctx, struct gl_framebuffer *fb,
fb->Attachment[fb->_ColorReadBufferIndex].Type == GL_NONE) {
assert(_mesa_is_winsys_fbo(fb));
/* add the buffer */
st_manager_add_color_renderbuffer(st_context(ctx), fb, fb->_ColorReadBufferIndex);
st_manager_add_color_renderbuffer(ctx, fb, fb->_ColorReadBufferIndex);
_mesa_update_state(ctx);
st_validate_state(st_context(ctx), ST_PIPELINE_UPDATE_FRAMEBUFFER);
}

2
src/mesa/main/framebuffer.c
View File

@ -600,7 +600,7 @@ _mesa_draw_buffer_allocate(struct gl_context *ctx)
gl_buffer_index idx = fb->_ColorDrawBufferIndexes[i];
if (idx != BUFFER_NONE) {
st_manager_add_color_renderbuffer(st_context(ctx), fb, idx);
st_manager_add_color_renderbuffer(ctx, fb, idx);
}
}
}

4
src/mesa/state_tracker/st_manager.c
View File

@ -1362,7 +1362,7 @@ st_manager_flush_swapbuffers(void)
* not a user-created FBO.
*/
bool
st_manager_add_color_renderbuffer(struct st_context *st,
st_manager_add_color_renderbuffer(struct gl_context *ctx,
struct gl_framebuffer *fb,
gl_buffer_index idx)
{
@ -1401,7 +1401,7 @@ st_manager_add_color_renderbuffer(struct st_context *st,
if (stfb->iface)
stfb->iface_stamp = p_atomic_read(&stfb->iface->stamp) - 1;
st_invalidate_buffers(st);
st_invalidate_buffers(st_context(ctx));
return true;
}

2
src/mesa/state_tracker/st_manager.h
View File

@ -47,7 +47,7 @@ void
st_manager_validate_framebuffers(struct st_context *st);
bool
st_manager_add_color_renderbuffer(struct st_context *st, struct gl_framebuffer *fb,
st_manager_add_color_renderbuffer(struct gl_context *ctx, struct gl_framebuffer *fb,
gl_buffer_index idx);
void