fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-15 20:48:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vbo: Only mark merged line strips as lines when actually converting them

Browse source 
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: 310991415e ("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>
(cherry picked from commit 14ae5069da)
This commit is contained in:
Kenneth Graunke 2021-01-14 17:29:14 -08:00 • committed by Dylan Baker
parent 8d07282a20
commit e8c31e0367
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -274,7 +274,7 @@
"description": "vbo: Only mark merged line strips as lines when actually converting them",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "310991415ee1f5bcdd91460f00205190e8e0c2d9"
},

5
src/mesa/vbo/vbo_save_api.c
View file

@ -688,7 +688,7 @@ compile_vertex_list(struct gl_context *ctx)
continue;
}
/* Line strips get converted to lines */
/* Line strips may get converted to lines */
if (mode == GL_LINE_STRIP)
mode = GL_LINES;
@ -739,6 +739,9 @@ compile_vertex_list(struct gl_context *ctx)
}
}
} else {
/* We didn't convert to LINES, so restore the original mode */
mode = original_prims[i].mode;
for (unsigned j = 0; j < vertex_count; j++) {
indices[idx++] = original_prims[i].start + j;
}