Module: Mesa Branch: master Commit: 6c2c1e0ffeb265aa508e0ce8e552e10b0b5c5962 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6c2c1e0ffeb265aa508e0ce8e552e10b0b5c5962
Author: Roland Scheidegger <[email protected]> Date: Fri Dec 11 04:53:21 2015 +0100 draw: don't assume fixed offset for data in struct vertex_info Otherwise, if struct vertex_info is changed, you're in for some surprises... Reviewed-by: Jose Fonseca <[email protected]> --- src/gallium/auxiliary/draw/draw_pt_fetch.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/gallium/auxiliary/draw/draw_pt_fetch.c b/src/gallium/auxiliary/draw/draw_pt_fetch.c index 3f028ce..84fd6bf 100644 --- a/src/gallium/auxiliary/draw/draw_pt_fetch.c +++ b/src/gallium/auxiliary/draw/draw_pt_fetch.c @@ -71,12 +71,10 @@ draw_pt_fetch_prepare(struct pt_fetch *fetch, fetch->vertex_size = vertex_size; - /* Leave the clipmask/edgeflags/pad/vertex_id untouched + /* Leave the clipmask/edgeflags/pad/vertex_id, + * clip[] and whatever else in the header untouched. */ - dst_offset += 1 * sizeof(float); - /* Just leave the clip[] and pre_clip_pos[] array untouched. - */ - dst_offset += 8 * sizeof(float); + dst_offset = offsetof(struct vertex_header, data); if (instance_id_index != ~0) { num_extra_inputs++; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
