fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-07 12:38:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r200: fix up swtcl/tcl flushes

Browse source
This commit is contained in:
Dave Airlie 2009-01-22 22:49:16 +10:00
parent d93dc43382
commit f69e2f42d5
6 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mesa/drivers/dri/r200/r200_cmdbuf.c
View file

@ -272,8 +272,9 @@ static void r200FireEB(r200ContextPtr rmesa, int vertex_count, int type)
}
}
void r200FlushElts( r200ContextPtr rmesa )
void r200FlushElts(GLcontext *ctx)
{
r200ContextPtr rmesa = R200_CONTEXT(ctx);
int dwords;
int nr, elt_used = rmesa->tcl.elt_used;

4
src/mesa/drivers/dri/r200/r200_context.h
View file

@ -548,7 +548,7 @@ struct r200_tcl_info {
int elt_dma_offset; /** Offset into this buffer object, in bytes */
int elt_used;
void (*flush) (r200ContextPtr);
void (*flush) (GLcontext *ctx);
struct radeon_dma_region vertex_data[15];
};
@ -606,7 +606,7 @@ struct r200_swtcl_info {
GLboolean needproj;
struct radeon_bo *bo;
void (*flush) (r200ContextPtr);
void (*flush) (GLcontext *ctx);
};

6
src/mesa/drivers/dri/r200/r200_ioctl.c
View file

@ -277,11 +277,11 @@ void r200Flush( GLcontext *ctx )
if (R200_DEBUG & DEBUG_IOCTL)
fprintf(stderr, "%s\n", __FUNCTION__);
if (rmesa->dma.flush)
rmesa->dma.flush( ctx );
if (rmesa->swtcl.flush)
rmesa->swtcl.flush( ctx );
if (rmesa->tcl.flush)
rmesa->tcl.flush( rmesa );
rmesa->tcl.flush( ctx );
r200EmitState( rmesa );

9
src/mesa/drivers/dri/r200/r200_ioctl.h
View file

@ -53,8 +53,7 @@ extern void r200EmitVbufPrim( r200ContextPtr rmesa,
GLuint primitive,
GLuint vertex_nr );
extern void r200FlushElts(r200ContextPtr rmesa);
extern void r200FlushElts(GLcontext *ctx);
extern GLushort *r200AllocEltsOpenEnded( r200ContextPtr rmesa,
GLuint primitive,
@ -113,8 +112,8 @@ void r200SetUpAtomList( r200ContextPtr rmesa );
*/
#define R200_NEWPRIM( rmesa ) \
do { \
if ( rmesa->dma.flush ) \
rmesa->dma.flush( rmesa->radeon.glCtx ); \
if ( rmesa->swtcl.flush ) \
rmesa->swtcl.flush( rmesa->radeon.glCtx ); \
} while (0)
/* Can accomodate several state changes and primitive changes without
@ -154,7 +153,7 @@ static INLINE int R200_DB_STATECHANGE(
*/
#define R200_FIREVERTICES( rmesa ) \
do { \
if ( rmesa->store.cmd_used || rmesa->dma.flush ) { \
if ( rmesa->swtcl.flush || rmesa->tcl.flush ) { \
r200Flush( rmesa->radeon.glCtx ); \
} \
} while (0)

6
src/mesa/drivers/dri/r200/r200_swtcl.c
View file

@ -210,10 +210,6 @@ static void r200RenderStart( GLcontext *ctx )
r200ContextPtr rmesa = R200_CONTEXT( ctx );
r200SetVertexFormat( ctx );
if (rmesa->dma.flush != 0 &&
rmesa->dma.flush != flush_last_swtcl_prim)
rmesa->dma.flush( ctx );
}
@ -283,7 +279,7 @@ static void flush_last_swtcl_prim(GLcontext *ctx)
if (R200_DEBUG & DEBUG_IOCTL)
fprintf(stderr, "%s\n", __FUNCTION__);
rmesa->dma.flush = NULL;
rmesa->swtcl.flush = NULL;
radeon_bo_unmap(rmesa->swtcl.bo);
rcommonEnsureCmdBufSpace(rmesa,

8
src/mesa/drivers/dri/r200/r200_tcl.c
View file

@ -155,7 +155,7 @@ static GLushort *r200AllocElts( r200ContextPtr rmesa, GLuint nr )
}
else {
if (rmesa->tcl.flush)
rmesa->tcl.flush( rmesa );
rmesa->tcl.flush( rmesa->radeon.glCtx );
rcommonEnsureCmdBufSpace(rmesa, AOS_BUFSZ(rmesa->tcl.nr_aos_components));
@ -564,10 +564,10 @@ static void transition_to_hwtnl( GLcontext *ctx )
tnl->Driver.NotifyMaterialChange = r200UpdateMaterial;
if ( rmesa->dma.flush )
rmesa->dma.flush( rmesa->radeon.glCtx );
if ( rmesa->swtcl.flush )
rmesa->swtcl.flush( rmesa->radeon.glCtx );
rmesa->dma.flush = NULL;
rmesa->swtcl.flush = NULL;
R200_STATECHANGE( rmesa, vap );
rmesa->hw.vap.cmd[VAP_SE_VAP_CNTL] |= R200_VAP_TCL_ENABLE;