summaryrefslogtreecommitdiff
path: root/src/mesa/shader/slang/slang_link.c
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2007-03-26 16:01:58 -0600
committerBrian <brian@yutani.localnet.net>2007-03-26 16:01:58 -0600
commit813a0e11f1eb903883aef18c5cb5c4702dcb6213 (patch)
tree2a0c6a902ec57e7ba536bad088a6efe39cd4ba58 /src/mesa/shader/slang/slang_link.c
parent52cc32378c541261d045f160a14ab0cfd27009ad (diff)
remove debug abort() calls
Diffstat (limited to 'src/mesa/shader/slang/slang_link.c')
-rw-r--r--src/mesa/shader/slang/slang_link.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 39df256b00..0cad69d410 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -208,10 +208,11 @@ link_uniform_vars(struct gl_shader_program *shProg, struct gl_program *prog)
j = _mesa_add_sampler(shProg->Uniforms, p->Name);
break;
default:
- abort();
+ _mesa_problem(NULL, "bad parameter type in link_uniform_vars()");
+ return GL_FALSE;
}
-
}
+
ASSERT(j >= 0);
size = p->Size;
@@ -544,7 +545,7 @@ _slang_link(GLcontext *ctx,
if (!_slang_resolve_attributes(shProg, &shProg->VertexProgram->Base)) {
/*goto cleanup;*/
_mesa_problem(ctx, "_slang_resolve_attributes() failed");
- abort(); /* XXX fix */
+ return;
}
}