1-st is obvious because of assert, 2-nd stolen frmo si_draw_vbo(),
and 3-rd is just a small refactoring.
Signed-off-by: Constantine Kharlamov <hi-an...@yandex.ru>
---
src/gallium/drivers/r600/r600_state_common.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/gallium/drivers/r600/r600_state_common.c
b/src/gallium/drivers/r600/r600_state_common.c
index c7379eb8c9..961e04e9db 100644
--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
@@ -1683,7 +1683,7 @@ static void r600_draw_vbo(struct pipe_context *ctx, const
struct pipe_draw_info
return;
}
- if (!rctx->vs_shader || !rctx->ps_shader) {
+ if (unlikely(!rctx->vs_shader || !rctx->ps_shader)) {
assert(0);
return;
}
@@ -1695,7 +1695,7 @@ static void r600_draw_vbo(struct pipe_context *ctx, const
struct pipe_draw_info
/* Re-emit the framebuffer state if needed. */
dirty_tex_counter = p_atomic_read(&rctx->b.screen->dirty_tex_counter);
- if (dirty_tex_counter != rctx->b.last_dirty_tex_counter) {
+ if (unlikely(dirty_tex_counter != rctx->b.last_dirty_tex_counter)) {
rctx->b.last_dirty_tex_counter = dirty_tex_counter;
r600_mark_atom_dirty(rctx, &rctx->framebuffer.atom);
}
@@ -1880,12 +1880,10 @@ static void r600_draw_vbo(struct pipe_context *ctx,
const struct pipe_draw_info
}
/* Draw packets. */
- if (!info->indirect) {
+ if (likely(!info->indirect)) {
radeon_emit(cs, PKT3(PKT3_NUM_INSTANCES, 0, 0));
radeon_emit(cs, info->instance_count);
- }
-
- if (unlikely(info->indirect)) {
+ } else {
uint64_t va = r600_resource(info->indirect)->gpu_address;
assert(rctx->b.chip_class >= EVERGREEN);
--
2.12.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
