fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-23 19:10:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Simplify radeonSetCliprects(). Remove the 'mode' parameter.

Browse source
This commit is contained in:
Brian Paul 2005-09-04 22:20:07 +00:00
parent 87ce68e1b3
commit 16e7aebfe3
3 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/mesa/drivers/dri/radeon/radeon_lock.c
View file

@ -89,10 +89,7 @@ void radeonGetLock( radeonContextPtr rmesa, GLuint flags )
if ( rmesa->lastStamp != dPriv->lastStamp ) {
radeonUpdatePageFlipping( rmesa );
if (rmesa->glCtx->DrawBuffer->_ColorDrawBufferMask[0] == BUFFER_BIT_BACK_LEFT)
radeonSetCliprects( rmesa, GL_BACK_LEFT );
else
radeonSetCliprects( rmesa, GL_FRONT_LEFT );
radeonSetCliprects( rmesa );
radeonUpdateViewportOffset( rmesa->glCtx );
rmesa->lastStamp = dPriv->lastStamp;
}

35
src/mesa/drivers/dri/radeon/radeon_state.c
View file

@ -1468,6 +1468,11 @@ static void radeonClearStencil( GLcontext *ctx, GLint s )
#define SUBPIXEL_X 0.125
#define SUBPIXEL_Y 0.125
/**
* Called when window size or position changes or viewport or depth range
* state is changed. We update the hardware viewport state here.
*/
void radeonUpdateWindow( GLcontext *ctx )
{
radeonContextPtr rmesa = RADEON_CONTEXT(ctx);
@ -1617,16 +1622,15 @@ static void radeonLogicOpCode( GLcontext *ctx, GLenum opcode )
}
void radeonSetCliprects( radeonContextPtr rmesa, GLenum mode )
/**
* Set up the cliprects for either front or back-buffer drawing.
*/
void radeonSetCliprects( radeonContextPtr rmesa )
{
__DRIdrawablePrivate *dPriv = rmesa->dri.drawable;
switch ( mode ) {
case GL_FRONT_LEFT:
rmesa->numClipRects = dPriv->numClipRects;
rmesa->pClipRects = dPriv->pClipRects;
break;
case GL_BACK_LEFT:
if (rmesa->glCtx->DrawBuffer->_ColorDrawBufferMask[0]
== BUFFER_BIT_BACK_LEFT) {
/* Can't ignore 2d windows if we are page flipping.
*/
if ( dPriv->numBackClipRects == 0 || rmesa->doPageFlip ) {
@ -1637,10 +1641,11 @@ void radeonSetCliprects( radeonContextPtr rmesa, GLenum mode )
rmesa->numClipRects = dPriv->numBackClipRects;
rmesa->pClipRects = dPriv->pBackClipRects;
}
break;
default:
fprintf(stderr, "bad mode in radeonSetCliprects\n");
return;
}
else {
/* front buffer (or none, or multiple buffers */
rmesa->numClipRects = dPriv->numClipRects;
rmesa->pClipRects = dPriv->pClipRects;
}
if (rmesa->state.scissor.enabled)
@ -1667,19 +1672,17 @@ static void radeonDrawBuffer( GLcontext *ctx, GLenum mode )
*/
switch ( ctx->DrawBuffer->_ColorDrawBufferMask[0] ) {
case BUFFER_BIT_FRONT_LEFT:
FALLBACK( rmesa, RADEON_FALLBACK_DRAW_BUFFER, GL_FALSE );
radeonSetCliprects( rmesa, GL_FRONT_LEFT );
break;
case BUFFER_BIT_BACK_LEFT:
FALLBACK( rmesa, RADEON_FALLBACK_DRAW_BUFFER, GL_FALSE );
radeonSetCliprects( rmesa, GL_BACK_LEFT );
break;
default:
/* GL_NONE or GL_FRONT_AND_BACK or stereo left&right, etc */
/* 0 (GL_NONE) buffers or multiple color drawing buffers */
FALLBACK( rmesa, RADEON_FALLBACK_DRAW_BUFFER, GL_TRUE );
return;
}
radeonSetCliprects( rmesa );
/* We'll set the drawing engine's offset/pitch parameters later
* when we update other state.
*/

2
src/mesa/drivers/dri/radeon/radeon_state.h
View file

@ -45,7 +45,7 @@ extern void radeonInitStateFuncs( GLcontext *ctx );
extern void radeonUpdateMaterial( GLcontext *ctx );
extern void radeonSetCliprects( radeonContextPtr rmesa, GLenum mode );
extern void radeonSetCliprects( radeonContextPtr rmesa );
extern void radeonRecalcScissorRects( radeonContextPtr rmesa );
extern void radeonUpdateViewportOffset( GLcontext *ctx );
extern void radeonUpdateWindow( GLcontext *ctx );