diff options
author | Roland Scheidegger <[email protected]> | 2009-12-18 16:09:32 +0100 |
---|---|---|
committer | Roland Scheidegger <[email protected]> | 2009-12-18 16:09:32 +0100 |
commit | 9d938e29f202552a98605906b71f31485af1ef60 (patch) | |
tree | 2c0fcde6663816fe308f962e30c9d49986f37a11 | |
parent | 890809d71b6ab40c56d341a5dad9f5e6b06469d0 (diff) |
fix debug output mising from edgeflag changes
-rw-r--r-- | src/mesa/state_tracker/st_mesa_to_tgsi.c | 7 | ||||
-rw-r--r-- | src/mesa/state_tracker/st_program.c | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c b/src/mesa/state_tracker/st_mesa_to_tgsi.c index 7b334e21d23..5c9be46a776 100644 --- a/src/mesa/state_tracker/st_mesa_to_tgsi.c +++ b/src/mesa/state_tracker/st_mesa_to_tgsi.c @@ -918,13 +918,6 @@ out: debug_printf("%s: translate error flag set\n", __FUNCTION__); } -/* ??? - if (!tokens) { - debug_printf("%s: failed to translate Mesa program:\n", __FUNCTION__); - _mesa_print_program(program); - debug_assert(0); - } -*/ return PIPE_ERROR_OUT_OF_MEMORY; } diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index fcc04782de2..feaac013c1a 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -236,6 +236,9 @@ st_translate_vertex_program(struct st_context *st, goto fail; vpv->state.tokens = ureg_get_tokens( ureg, NULL ); + if (!vpv->state.tokens) + goto fail; + ureg_destroy( ureg ); vpv->driver_shader = pipe->create_vs_state(pipe, &vpv->state); @@ -253,6 +256,10 @@ st_translate_vertex_program(struct st_context *st, return vpv; fail: + debug_printf("%s: failed to translate Mesa program:\n", __FUNCTION__); + _mesa_print_program(&stvp->Base.Base); + debug_assert(0); + ureg_destroy( ureg ); return NULL; } |