aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver McFadden <[email protected]>2007-05-09 03:36:28 +0000
committerOliver McFadden <[email protected]>2007-05-09 03:36:28 +0000
commitb8640db021feca2765df8ad3d31e9c818cc352ac (patch)
tree8429b5e3895a7e5c700c3d2aec4ff3f2aa4edd3f
parent28b47110b617c137ba18b9273c6172135a99b29d (diff)
r300: Corrected the exit codes for consistency; they are all -1 for error now.
The one exception is 300FlushCmdBuf.
-rw-r--r--src/mesa/drivers/dri/r300/r300_cmdbuf.c2
-rw-r--r--src/mesa/drivers/dri/r300/r300_maos.c4
-rw-r--r--src/mesa/drivers/dri/r300/r300_state.c2
-rw-r--r--src/mesa/drivers/dri/r300/r300_texmem.c2
-rw-r--r--src/mesa/drivers/dri/r300/r300_vertprog.c6
5 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_cmdbuf.c b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
index 9bfdc85c4ab..294fcd75948 100644
--- a/src/mesa/drivers/dri/r300/r300_cmdbuf.c
+++ b/src/mesa/drivers/dri/r300/r300_cmdbuf.c
@@ -121,7 +121,7 @@ int r300FlushCmdBuf(r300ContextPtr r300, const char *caller)
UNLOCK_HARDWARE(&r300->radeon);
if (ret) {
- fprintf(stderr, "drmRadeonCmdBuffer: %d (exiting)\n", ret);
+ fprintf(stderr, "drmRadeonCmdBuffer: %d\n", ret);
_mesa_exit(ret);
}
diff --git a/src/mesa/drivers/dri/r300/r300_maos.c b/src/mesa/drivers/dri/r300/r300_maos.c
index 94b1f65f263..d3105e0d160 100644
--- a/src/mesa/drivers/dri/r300/r300_maos.c
+++ b/src/mesa/drivers/dri/r300/r300_maos.c
@@ -217,7 +217,7 @@ static void emit_vector(GLcontext * ctx,
break;
default:
assert(0);
- _mesa_exit(1);
+ _mesa_exit(-1);
break;
}
@@ -243,7 +243,7 @@ void r300EmitElts(GLcontext * ctx, void *elts, unsigned long n_elts,
return;
} else if (r300IsGartMemory(rmesa, elts, 1)) {
WARN_ONCE("Pointer not within GART memory!\n");
- _mesa_exit(1);
+ _mesa_exit(-1);
}
r300AllocDmaRegion(rmesa, rvb, n_elts * elt_size, elt_size);
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index fbdb4ca98f4..18c15ae83de 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -1514,7 +1514,7 @@ void r300_setup_rs_unit(GLcontext * ctx)
if (i == ctx->Const.MaxTextureUnits) {
fprintf(stderr, "\tno free texcoord found...\n");
- _mesa_exit(0);
+ _mesa_exit(-1);
}
InputsRead |= (FRAG_BIT_TEX0 << i);
diff --git a/src/mesa/drivers/dri/r300/r300_texmem.c b/src/mesa/drivers/dri/r300/r300_texmem.c
index 4750c468db4..5d52f777e3b 100644
--- a/src/mesa/drivers/dri/r300/r300_texmem.c
+++ b/src/mesa/drivers/dri/r300/r300_texmem.c
@@ -485,7 +485,7 @@ static void uploadSubImage( r300ContextPtr rmesa, r300TexObjPtr t,
fprintf( stderr, " blit width=%d height=%d data=%p\n",
t->image[face][hwlevel].width, t->image[face][hwlevel].height,
t->image[face][hwlevel].data );
- _mesa_exit( 1 );
+ _mesa_exit(-1);
}
}
diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.c b/src/mesa/drivers/dri/r300/r300_vertprog.c
index c7bfd8e8a81..245ceb4d122 100644
--- a/src/mesa/drivers/dri/r300/r300_vertprog.c
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.c
@@ -173,7 +173,7 @@ static unsigned long t_dst_class(enum register_file file)
*/
default:
fprintf(stderr, "problem in %s", __FUNCTION__);
- _mesa_exit(0);
+ _mesa_exit(-1);
}
}
@@ -207,7 +207,7 @@ static unsigned long t_src_class(enum register_file file)
*/
default:
fprintf(stderr, "problem in %s", __FUNCTION__);
- _mesa_exit(0);
+ _mesa_exit(-1);
}
}
@@ -1080,7 +1080,7 @@ void r300_select_vertex_shader(r300ContextPtr r300)
if(i == ctx->Const.MaxTextureUnits){
fprintf(stderr, "\tno free texcoord found\n");
- _mesa_exit(0);
+ _mesa_exit(-1);
}
InputsRead |= (FRAG_BIT_TEX0 << i);