On Mon, Oct 3, 2016 at 5:35 AM, Edward O'Callaghan <[email protected]> wrote: > > > On 10/03/2016 08:09 AM, Marek Olšák wrote: >> From: Marek Olšák <[email protected]> >> >> not used anymore. It was used when the polygon stipple texture was constant. >> --- >> src/gallium/drivers/radeonsi/si_descriptors.c | 5 +++-- >> src/gallium/drivers/radeonsi/si_state.c | 11 +---------- >> 2 files changed, 4 insertions(+), 12 deletions(-) >> >> diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c >> b/src/gallium/drivers/radeonsi/si_descriptors.c >> index 21dad3c..693233d 100644 >> --- a/src/gallium/drivers/radeonsi/si_descriptors.c >> +++ b/src/gallium/drivers/radeonsi/si_descriptors.c >> @@ -403,38 +403,39 @@ static void si_set_sampler_view(struct si_context >> *sctx, >> struct si_sampler_view *rview = (struct si_sampler_view*)view; >> struct si_descriptors *descs = si_sampler_descriptors(sctx, shader); >> >> if (views->views[slot] == view && !disallow_early_out) >> return; >> >> if (view) { >> struct r600_texture *rtex = (struct r600_texture >> *)view->texture; >> uint32_t *desc = descs->list + slot * 16; >> >> + assert(rtex); /* NULL views aren't supported */ > > Can you possibly clarify the comment with perhaps "view textures" as I > thought you meant 'rview' for a second by just looking at the comment > alone. I had to double check what was really going on before it was obvious.
Changed to: /* views with texture==NULL aren't supported */ Marek _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
