Browse Source

r300: Corrected the exit codes for consistency; they are all -1 for error now.

The one exception is 300FlushCmdBuf.
tags/mesa_7_0
Oliver McFadden 18 years ago
parent
commit
b8640db021

+ 1
- 1
src/mesa/drivers/dri/r300/r300_cmdbuf.c View File

@@ -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);
}


+ 2
- 2
src/mesa/drivers/dri/r300/r300_maos.c View File

@@ -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);

+ 1
- 1
src/mesa/drivers/dri/r300/r300_state.c View File

@@ -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);

+ 1
- 1
src/mesa/drivers/dri/r300/r300_texmem.c View File

@@ -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);
}
}


+ 3
- 3
src/mesa/drivers/dri/r300/r300_vertprog.c View File

@@ -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);

Loading…
Cancel
Save