Module: Mesa Branch: staging/20.0 Commit: 6f9a26ac25a28ab5dc57fc4c3a96e6beaa208d27 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6f9a26ac25a28ab5dc57fc4c3a96e6beaa208d27
Author: Marek Olšák <[email protected]> Date: Thu Feb 13 22:56:54 2020 -0500 mesa: fix incorrect prim.begin/end for glMultiDrawElements This has no effect on Gallium, but it affects tnl. Cc: 19.3 20.0 <[email protected]> Reviewed-by: Mathias Fröhlich <[email protected]> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3990> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3990> (cherry picked from commit 1a61a5b1d4693631a1b6fb7e83c877792dfbf33d) Conflicts Resolved by Dylan Baker Conflicts: src/mesa/main/draw.c --- .pick_status.json | 2 +- src/mesa/main/draw.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index aec87ae34ae..b93b336ca45 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -526,7 +526,7 @@ "description": "mesa: fix incorrect prim.begin/end for glMultiDrawElements", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/mesa/main/draw.c b/src/mesa/main/draw.c index bfa318553f6..e5c1faecb89 100644 --- a/src/mesa/main/draw.c +++ b/src/mesa/main/draw.c @@ -1228,8 +1228,8 @@ _mesa_validated_multidrawelements(struct gl_context *ctx, GLenum mode, ib.ptr = (void *) min_index_ptr; for (i = 0; i < primcount; i++) { - prim[i].begin = (i == 0); - prim[i].end = (i == primcount - 1); + prim[i].begin = 1; + prim[i].end = 1; prim[i].pad = 0; prim[i].mode = mode; prim[i].start = _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
