Mesa (master): st/mesa: Fix topogun-1.06-orc-84k-resize.trace crash

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 69d736b17a96a4d7a21c3c88fd787091acc1def0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=69d736b17a96a4d7a21c3c88fd787091acc1def0

Author: Neha Bhende <bhenden at vmware.com>
Date:   Tue Jan 29 12:21:00 2019 -0700

st/mesa: Fix topogun-1.06-orc-84k-resize.trace crash

We need to initialize all fields in rs->prim explicitly while
creating new rastpos stage.

Fixes: bac8534267 ("st/mesa: allow glDrawElements to work with GL_SELECT
feedback")

v2: Initializing all fields in rs->prim as per Ilia.

Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>

---

 src/mesa/state_tracker/st_cb_rasterpos.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/mesa/state_tracker/st_cb_rasterpos.c b/src/mesa/state_tracker/st_cb_rasterpos.c
index fecaaf77da..c54b50dc75 100644
--- a/src/mesa/state_tracker/st_cb_rasterpos.c
+++ b/src/mesa/state_tracker/st_cb_rasterpos.c
@@ -208,6 +208,10 @@ new_draw_rastpos_stage(struct gl_context *ctx, struct draw_context *draw)
    rs->prim.end = 1;
    rs->prim.start = 0;
    rs->prim.count = 1;
+   rs->prim.pad = 0;
+   rs->prim.num_instances = 1;
+   rs->prim.base_instance = 0;
+   rs->prim.is_indirect = 0;
 
    return rs;
 }