summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoridr <idr>2003-03-27 02:00:58 +0000
committeridr <idr>2003-03-27 02:00:58 +0000
commitdc46ae6919b8c47a552d8efade888eb617112250 (patch)
treef6232c99a5b928173d3a9b0bbbf402ff1a1cd56f
parenta4f047557c30e0bcd7e86f46fc1a2ec174605b1d (diff)
Removed redundant R200_FIREVERTICIES before r200Flush. Changed logtexmem-0-0-1-20030328-freeze
messages under DEBUG_SYNC to be more useful / less irritating.
-rw-r--r--xc/lib/GL/mesa/src/drv/r200/r200_cmdbuf.c3
-rw-r--r--xc/lib/GL/mesa/src/drv/r200/r200_texmem.c5
2 files changed, 3 insertions, 5 deletions
diff --git a/xc/lib/GL/mesa/src/drv/r200/r200_cmdbuf.c b/xc/lib/GL/mesa/src/drv/r200/r200_cmdbuf.c
index aea170c6d..7513ced2e 100644
--- a/xc/lib/GL/mesa/src/drv/r200/r200_cmdbuf.c
+++ b/xc/lib/GL/mesa/src/drv/r200/r200_cmdbuf.c
@@ -156,8 +156,7 @@ void r200FlushElts( r200ContextPtr rmesa )
cmd[2] |= nr << R200_VF_VERTEX_NUMBER_SHIFT;
if (R200_DEBUG & DEBUG_SYNC) {
- fprintf(stderr, "\nSyncing in %s\n\n", __FUNCTION__);
- R200_FIREVERTICES( rmesa );
+ fprintf(stderr, "%s: Syncing\n", __FUNCTION__);
r200Finish( rmesa->glCtx );
}
}
diff --git a/xc/lib/GL/mesa/src/drv/r200/r200_texmem.c b/xc/lib/GL/mesa/src/drv/r200/r200_texmem.c
index 1472ab830..9f2a28729 100644
--- a/xc/lib/GL/mesa/src/drv/r200/r200_texmem.c
+++ b/xc/lib/GL/mesa/src/drv/r200/r200_texmem.c
@@ -451,8 +451,7 @@ int r200UploadTexImages( r200ContextPtr rmesa, r200TexObjPtr t, GLuint face )
return 0;
if (R200_DEBUG & DEBUG_SYNC) {
- fprintf(stderr, "\nSyncing\n\n");
- R200_FIREVERTICES( rmesa );
+ fprintf(stderr, "%s: Syncing\n", __FUNCTION__ );
r200Finish( rmesa->glCtx );
}
@@ -498,7 +497,7 @@ int r200UploadTexImages( r200ContextPtr rmesa, r200TexObjPtr t, GLuint face )
if (R200_DEBUG & DEBUG_SYNC) {
- fprintf(stderr, "\nSyncing\n\n");
+ fprintf(stderr, "%s: Syncing\n", __FUNCTION__ );
r200Finish( rmesa->glCtx );
}