mesa: updated comments in _make_current()
This commit is contained in:
parent
016621ee14
commit
2960526816
|
@ -1430,7 +1430,8 @@ _mesa_make_current( struct gl_context *newCtx,
|
|||
}
|
||||
|
||||
if (curCtx &&
|
||||
(curCtx->WinSysDrawBuffer || curCtx->WinSysReadBuffer) && /* make sure this context is valid for flushing */
|
||||
(curCtx->WinSysDrawBuffer || curCtx->WinSysReadBuffer) &&
|
||||
/* make sure this context is valid for flushing */
|
||||
curCtx != newCtx)
|
||||
_mesa_flush(curCtx);
|
||||
|
||||
|
@ -1445,8 +1446,6 @@ _mesa_make_current( struct gl_context *newCtx,
|
|||
_glapi_set_dispatch(newCtx->CurrentDispatch);
|
||||
|
||||
if (drawBuffer && readBuffer) {
|
||||
/* TODO: check if newCtx and buffer's visual match??? */
|
||||
|
||||
ASSERT(drawBuffer->Name == 0);
|
||||
ASSERT(readBuffer->Name == 0);
|
||||
_mesa_reference_framebuffer(&newCtx->WinSysDrawBuffer, drawBuffer);
|
||||
|
@ -1457,11 +1456,9 @@ _mesa_make_current( struct gl_context *newCtx,
|
|||
* or not bound to a user-created FBO.
|
||||
*/
|
||||
if (!newCtx->DrawBuffer || newCtx->DrawBuffer->Name == 0) {
|
||||
/* KW: merge conflict here, revisit.
|
||||
*/
|
||||
/* fix up the fb fields - these will end up wrong otherwise
|
||||
* if the DRIdrawable changes, and everything relies on them.
|
||||
* This is a bit messy (same as needed in _mesa_BindFramebufferEXT)
|
||||
/* Update the FBO's list of drawbuffers/renderbuffers.
|
||||
* For winsys FBOs this comes from the GL state (which may have
|
||||
* changed since the last time this FBO was bound).
|
||||
*/
|
||||
unsigned int i;
|
||||
GLenum buffers[MAX_DRAW_BUFFERS];
|
||||
|
|
Loading…
Reference in New Issue