diff options
author | Gert Wollny <[email protected]> | 2020-02-27 08:14:15 +0100 |
---|---|---|
committer | Gert Wollny <[email protected]> | 2020-03-02 20:00:26 +0100 |
commit | adcb365c1dae5e97f6863d320a774753bf76780b (patch) | |
tree | 3612bd5a66270abb6494f3cb0ba62052538fdd00 /src/gallium | |
parent | b66170b53785dea3bfc00901277273b7bde9b561 (diff) |
r600/sfn: Don't try to catch exceptions, the driver doesn't throw any
Signed-off-by: Gert Wollny <[email protected]>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3974>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3974>
Diffstat (limited to 'src/gallium')
-rw-r--r-- | src/gallium/drivers/r600/sfn/sfn_nir.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/gallium/drivers/r600/sfn/sfn_nir.cpp b/src/gallium/drivers/r600/sfn/sfn_nir.cpp index ff7bee26b4f..bdecf75ae1f 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_nir.cpp @@ -659,18 +659,12 @@ int r600_shader_from_nir(struct r600_context *rctx, sel->nir->info.clip_distance_array_size)) - 1; } - // For learning we print out the complete failed shader - // and instead of asserts we use exceptions - bool r; - try { - struct r600_shader* gs_shader = nullptr; - if (rctx->gs_shader) - gs_shader = &rctx->gs_shader->current->shader; - r = convert.lower(sel->nir, pipeshader, sel, *key, gs_shader); - - } catch (std::logic_error& x) { - r = false; - } + struct r600_shader* gs_shader = nullptr; + if (rctx->gs_shader) + gs_shader = &rctx->gs_shader->current->shader; + + bool r = convert.lower(sel->nir, pipeshader, sel, *key, gs_shader); + if (!r || rctx->screen->b.debug_flags & DBG_ALL_SHADERS) { static int shnr = 0; |