diff options
author | Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> | 2021-07-20 14:31:19 +0200 |
---|---|---|
committer | Dylan Baker <dylan.c.baker@intel.com> | 2021-07-27 11:43:33 -0700 |
commit | 0eb551f658e444fa2f70653355db3e2c5c025e0f (patch) | |
tree | 81186a78cd904deaabc099dcf6af3bd52ddf1ae6 /.pick_status.json | |
parent | f27415c22399aa5605c9004644d9126cde3e068a (diff) |
dlist: don't handle unmerged draws as merged
The comment was incorrect: we can have N draws using the
same mode with N > 1 (eg: GL_QUAD_STRIP draws
cannot be merged).
This commit fixes the drawing code to use the correct draw
function.
This fixes a hang in Starsector (see issue #5086).
Fixes: b328d8e9bc9 ("dlist: use an union instead of allocating a 1-sized array")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11978>
(cherry picked from commit 11d6441b94c7bf59ee32c8bcb0e30d370f3bd42c)
Diffstat (limited to '.pick_status.json')
-rw-r--r-- | .pick_status.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index 7be072e7d5e..5068d56d55b 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -121,7 +121,7 @@ "description": "dlist: don't handle unmerged draws as merged", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "b328d8e9bc9900a0372d7c3307f18ad11d708af9" }, |