svga: replace gotos with conditionals in array drawing code

No Piglit regressions.

Reviewed-by: Charmaine Lee <charmainel@vmware.com>
This commit is contained in:
Brian Paul 2017-08-18 21:18:47 -06:00
parent d50b8b91d7
commit 4d2b21a326
2 changed files with 29 additions and 29 deletions

View File

@ -286,25 +286,25 @@ svga_hwtnl_draw_arrays(struct svga_hwtnl *hwtnl,
gen_type,
gen_nr,
gen_size, gen_func, &gen_buf);
if (ret != PIPE_OK)
goto done;
if (ret == PIPE_OK) {
pipe_debug_message(&svga->debug.callback, PERF_INFO,
"generating temporary index buffer for drawing %s",
u_prim_name(prim));
pipe_debug_message(&svga->debug.callback, PERF_INFO,
"generating temporary index buffer for drawing %s",
u_prim_name(prim));
ret = svga_hwtnl_simple_draw_range_elements(hwtnl,
gen_buf,
gen_size,
start,
0,
count - 1,
gen_prim, 0, gen_nr,
start_instance,
instance_count);
}
ret = svga_hwtnl_simple_draw_range_elements(hwtnl,
gen_buf,
gen_size,
start,
0,
count - 1,
gen_prim, 0, gen_nr,
start_instance,
instance_count);
done:
if (gen_buf)
if (gen_buf) {
pipe_resource_reference(&gen_buf, NULL);
}
}
SVGA_STATS_TIME_POP(svga_sws(svga));

View File

@ -242,21 +242,21 @@ svga_hwtnl_draw_range_elements(struct svga_hwtnl *hwtnl,
prim, gen_prim,
count, gen_nr, gen_size,
gen_func, &gen_buf);
if (ret != PIPE_OK)
goto done;
if (ret == PIPE_OK) {
ret = svga_hwtnl_simple_draw_range_elements(hwtnl,
gen_buf,
gen_size,
index_bias,
min_index,
max_index,
gen_prim, 0, gen_nr,
start_instance,
instance_count);
}
ret = svga_hwtnl_simple_draw_range_elements(hwtnl,
gen_buf,
gen_size,
index_bias,
min_index,
max_index,
gen_prim, 0, gen_nr,
start_instance,
instance_count);
done:
if (gen_buf)
if (gen_buf) {
pipe_resource_reference(&gen_buf, NULL);
}
}
SVGA_STATS_TIME_POP(svga_sws(hwtnl->svga));