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

st/mesa: use a helper for st_framebuffer creation 

In st_api_make_current, we would like to reuse the exising
st_framebuffer if possible.  Use a helper function to make the code
clearer.
This commit is contained in:
Chia-I Wu 2011-06-22 11:02:27 +09:00
parent 1a339b6c71
commit 7587c140cd
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -716,38 +716,49 @@ st_api_get_current(struct st_api *stapi)
return (st) ? &st->iface : NULL;
}
static struct st_framebuffer *
st_framebuffer_reuse_or_create(struct gl_framebuffer *fb,
struct st_framebuffer_iface *stfbi)
{
struct st_framebuffer *cur = st_ws_framebuffer(fb), *stfb = NULL;
if (cur && cur->iface == stfbi) {
/* reuse the current stfb */
st_framebuffer_reference(&stfb, cur);
}
else {
/* create a new one */
stfb = st_framebuffer_create(stfbi);
}
return stfb;
}
static boolean
st_api_make_current(struct st_api *stapi, struct st_context_iface *stctxi,
struct st_framebuffer_iface *stdrawi,
struct st_framebuffer_iface *streadi)
{
struct st_context *st = (struct st_context *) stctxi;
struct st_framebuffer *stdraw, *stread, *stfb;
struct st_framebuffer *stdraw, *stread;
boolean ret;
_glapi_check_multithread();
if (st) {
/* reuse/create the draw fb */
stfb = st_ws_framebuffer(st->ctx->WinSysDrawBuffer);
if (stfb && stfb->iface == stdrawi) {
stdraw = NULL;
st_framebuffer_reference(&stdraw, stfb);
/* reuse or create the draw fb */
stdraw = st_framebuffer_reuse_or_create(st->ctx->WinSysDrawBuffer,
stdrawi);
if (streadi != stdrawi) {
/* do the same for the read fb */
stread = st_framebuffer_reuse_or_create(st->ctx->WinSysReadBuffer,
streadi);
}
else {
stdraw = st_framebuffer_create(stdrawi);
}
/* reuse/create the read fb */
stfb = st_ws_framebuffer(st->ctx->WinSysReadBuffer);
if (!stfb || stfb->iface != streadi)
stfb = stdraw;
if (stfb && stfb->iface == streadi) {
stread = NULL;
st_framebuffer_reference(&stread, stfb);
}
else {
stread = st_framebuffer_create(streadi);
/* reuse the draw fb for the read fb */
if (stdraw)
st_framebuffer_reference(&stread, stdraw);
}
if (stdraw && stread) {