On Friday, December 30, 2016 3:39:36 PM PST Kenneth Graunke wrote: > upload_3dstate_streamout can be called when there's no currently bound > transform feedback object. In this case, we get the default object, > which has a NULL shader (previously gl_shader_program, now gl_program). > > The old code did something sketchy, but which worked: > > const struct gl_transform_feedback_info *linked_xfb_info = > &xfb_obj->shader_program->LinkedTransformFeedback; > > Here, if shader_program is NULL, this would be a bogus pointer of 0x60. > But we never actually dereferenced it, so it worked out. > > With Timothy's recent reworks, we actually end up dereferencing > xfb_obj->program along the way, which crashes since it's NULL. > > The solution is to move this pointer initialization into the "active" > block, where we know it actually exists and won't be bogus. > > Signed-off-by: Kenneth Graunke <kenn...@whitecape.org> > --- > src/mesa/drivers/dri/i965/gen7_sol_state.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-)
Pushed with Jason and Tim's R-b from IRC. --Ken
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
