From 8b54299c344d9fd35118fab50efa136f8971a7cc Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 14 Feb 2018 09:37:27 -0800 Subject: [PATCH] svga: move duplicated code for setting fillmode/flatshade state Move the calls to svga_hwtnl_set_fillmode() and svga_hwtnl_set_flatshade() out of the two retry_draw_*() functions to the svga_draw_vbo() function. Reviewed-by: Charmaine Lee --- src/gallium/drivers/svga/svga_pipe_draw.c | 30 ++++++++--------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/src/gallium/drivers/svga/svga_pipe_draw.c b/src/gallium/drivers/svga/svga_pipe_draw.c index af538819ea6..c73c406e697 100644 --- a/src/gallium/drivers/svga/svga_pipe_draw.c +++ b/src/gallium/drivers/svga/svga_pipe_draw.c @@ -64,16 +64,6 @@ retry_draw_range_elements(struct svga_context *svga, SVGA_STATS_TIME_PUSH(svga_sws(svga), SVGA_STATS_TIME_DRAWELEMENTS); - svga_hwtnl_set_fillmode(svga->hwtnl, svga->curr.rast->hw_fillmode); - - /** determine if flatshade is to be used after svga_update_state() - * in case the fragment shader is changed. - */ - svga_hwtnl_set_flatshade(svga->hwtnl, - svga->curr.rast->templ.flatshade || - is_using_flat_shading(svga), - svga->curr.rast->templ.flatshade_first); - for (unsigned try = 0; try < 2; try++) { ret = svga_hwtnl_draw_range_elements(svga->hwtnl, index_buffer, index_size, @@ -100,16 +90,6 @@ retry_draw_arrays(struct svga_context *svga, SVGA_STATS_TIME_PUSH(svga_sws(svga), SVGA_STATS_TIME_DRAWARRAYS); - svga_hwtnl_set_fillmode(svga->hwtnl, svga->curr.rast->hw_fillmode); - - /** determine if flatshade is to be used after svga_update_state() - * in case the fragment shader is changed. - */ - svga_hwtnl_set_flatshade(svga->hwtnl, - svga->curr.rast->templ.flatshade || - is_using_flat_shading(svga), - svga->curr.rast->templ.flatshade_first); - for (unsigned try = 0; try < 2; try++) { ret = svga_hwtnl_draw_arrays(svga->hwtnl, prim, start, count, start_instance, instance_count); @@ -230,6 +210,16 @@ svga_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info) assert(ret == PIPE_OK); } + svga_hwtnl_set_fillmode(svga->hwtnl, svga->curr.rast->hw_fillmode); + + /** determine if flatshade is to be used after svga_update_state() + * in case the fragment shader is changed. + */ + svga_hwtnl_set_flatshade(svga->hwtnl, + svga->curr.rast->templ.flatshade || + is_using_flat_shading(svga), + svga->curr.rast->templ.flatshade_first); + if (info->index_size && indexbuf) { unsigned offset; -- 2.30.2