vbo: Only mark merged line strips as lines when actually converting them
authorKenneth Graunke <kenneth@whitecape.org>
Fri, 15 Jan 2021 01:29:14 +0000 (17:29 -0800)
committerMarge Bot <eric+marge@anholt.net>
Wed, 20 Jan 2021 00:29:04 +0000 (00:29 +0000)
commit14ae5069da896cc93953e935051a76884800cac9
tree2a4d9879903cb8934a67ce3258abc13712e0373c
parent44bdd5225c48d266e42d93defbb7ca9ae74aa21b
vbo: Only mark merged line strips as lines when actually converting them

We only convert line strips to lines in certain cases, but were flagging
node->merged.prim as GL_LINES even if we simply copied a GL_LINE_STRIP
prim[0] over without modifying it.

Fixes Piglit's lineloop test (which triggers loop -> strip conversion
earlier in this path, then was incorrectly triggering strip -> list
mode modification with no changes to the underlying data).

Fixes: 310991415ee ("vbo/dlist: implement primitive merging")
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8522>
src/mesa/vbo/vbo_save_api.c