diff options
| -rw-r--r-- | src/mesa/shader/slang/slang_codegen.c | 14 | ||||
| -rw-r--r-- | src/mesa/shader/slang/slang_emit.c | 1 | ||||
| -rw-r--r-- | src/mesa/shader/slang/slang_link.c | 7 | ||||
| -rw-r--r-- | src/mesa/shader/slang/slang_print.c | 2 |
4 files changed, 10 insertions, 14 deletions
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c index 98596288ce..c2a33778c6 100644 --- a/src/mesa/shader/slang/slang_codegen.c +++ b/src/mesa/shader/slang/slang_codegen.c @@ -681,11 +681,8 @@ slang_substitute(slang_assemble_ctx *A, slang_operation *oper, GLuint i; v = _slang_locate_variable(oper->locals, id, GL_TRUE); if (!v) { - printf("var %s not found!\n", (char *) oper->a_id); - _slang_print_var_scope(oper->locals, 6); - - abort(); - break; + _mesa_problem(NULL, "var %s not found!\n", (char *) oper->a_id); + return; } /* look for a substitution */ @@ -1134,7 +1131,8 @@ make_writemask(const char *field) mask |= WRITEMASK_W; break; default: - abort(); + _mesa_problem(NULL, "invalid writemask in make_writemask()"); + return 0; } field++; } @@ -2619,8 +2617,8 @@ _slang_gen_operation(slang_assemble_ctx * A, slang_operation *oper) return new_node0(IR_NOP); default: - printf("Unhandled node type %d\n", oper->type); - abort(); + _mesa_problem(NULL, "bad node type %d in _slang_gen_operation", + oper->type); return new_node0(IR_NOP); } diff --git a/src/mesa/shader/slang/slang_emit.c b/src/mesa/shader/slang/slang_emit.c index 6507cde0c1..109b2df7aa 100644 --- a/src/mesa/shader/slang/slang_emit.c +++ b/src/mesa/shader/slang/slang_emit.c @@ -1535,7 +1535,6 @@ emit(slang_emit_info *emitInfo, slang_ir_node *n) default: _mesa_problem(NULL, "Unexpected IR opcode in emit()\n"); - abort(); } return NULL; } 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; } } diff --git a/src/mesa/shader/slang/slang_print.c b/src/mesa/shader/slang/slang_print.c index 4be9041c78..c80a6c7e11 100644 --- a/src/mesa/shader/slang/slang_print.c +++ b/src/mesa/shader/slang/slang_print.c @@ -274,10 +274,8 @@ slang_print_tree(const slang_operation *op, int indent) */ } else { - abort(); spaces(indent); printf("DECL %s (anonymous variable!!!!)\n", (char *) op->a_id); - /*abort();*/ } } break; |