Re: [Mesa-dev] [PATCH] radeonsi: avoid crash when a sampler state is bound for a buffer texture
On 12.03.2016 19:09, Ilia Mirkin wrote: On Fri, Mar 11, 2016 at 11:17 AM, Nicolai Hähnle wrote: From: Nicolai Hähnle Sampler states don't really make sense with buffer textures, but the PBO upload code sets one because apparently nouveau needs it. It would be nice to work that out at some point, but in any case being defensive here is a good idea. Sampler states are set in regular GL as well if you have a regular buffer texture too, no? I suppose you're right - we just haven't had many users of buffer textures before PBO upload, so nobody noticed this. I'll change the comment before pushing. Cheers, Nicolai Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94284 Cc: mesa-sta...@lists.freedesktop.org --- src/gallium/drivers/radeonsi/si_descriptors.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index 9aa4877..f5ad113 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -324,6 +324,7 @@ static void si_bind_sampler_states(struct pipe_context *ctx, unsigned shader, */ if (samplers->views.views[i] && samplers->views.views[i]->texture && + samplers->views.views[i]->texture->target != PIPE_BUFFER && ((struct r600_texture*)samplers->views.views[i]->texture)->fmask.size) continue; -- 2.5.0 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] radeonsi: avoid crash when a sampler state is bound for a buffer texture
On Fri, Mar 11, 2016 at 11:17 AM, Nicolai Hähnle wrote: > From: Nicolai Hähnle > > Sampler states don't really make sense with buffer textures, but the PBO > upload code sets one because apparently nouveau needs it. It would be > nice to work that out at some point, but in any case being defensive > here is a good idea. Sampler states are set in regular GL as well if you have a regular buffer texture too, no? > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94284 > Cc: mesa-sta...@lists.freedesktop.org > --- > src/gallium/drivers/radeonsi/si_descriptors.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c > b/src/gallium/drivers/radeonsi/si_descriptors.c > index 9aa4877..f5ad113 100644 > --- a/src/gallium/drivers/radeonsi/si_descriptors.c > +++ b/src/gallium/drivers/radeonsi/si_descriptors.c > @@ -324,6 +324,7 @@ static void si_bind_sampler_states(struct pipe_context > *ctx, unsigned shader, > */ > if (samplers->views.views[i] && > samplers->views.views[i]->texture && > + samplers->views.views[i]->texture->target != PIPE_BUFFER > && > ((struct > r600_texture*)samplers->views.views[i]->texture)->fmask.size) > continue; > > -- > 2.5.0 > > ___ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] radeonsi: avoid crash when a sampler state is bound for a buffer texture
Le vendredi 11 mars 2016, 11:17:21 CET Nicolai Hähnle a écrit : > From: Nicolai Hähnle > > Sampler states don't really make sense with buffer textures, but the PBO > upload code sets one because apparently nouveau needs it. It would be > nice to work that out at some point, but in any case being defensive > here is a good idea. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94284 > Cc: mesa-sta...@lists.freedesktop.org > --- > src/gallium/drivers/radeonsi/si_descriptors.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c > b/src/gallium/drivers/radeonsi/si_descriptors.c index 9aa4877..f5ad113 > 100644 > --- a/src/gallium/drivers/radeonsi/si_descriptors.c > +++ b/src/gallium/drivers/radeonsi/si_descriptors.c > @@ -324,6 +324,7 @@ static void si_bind_sampler_states(struct pipe_context > *ctx, unsigned shader, */ > if (samplers->views.views[i] && > samplers->views.views[i]->texture && > + samplers->views.views[i]->texture->target != PIPE_BUFFER && > ((struct > r600_texture*)samplers->views.views[i]->texture)->fmask.size) continue; That fixed bug 94284, thanks -- Laurent Carlier http://www.archlinux.org 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
Re: [Mesa-dev] [PATCH] radeonsi: avoid crash when a sampler state is bound for a buffer texture
Reviewed-by: Marek Olšák Marek On Fri, Mar 11, 2016 at 5:17 PM, Nicolai Hähnle wrote: > From: Nicolai Hähnle > > Sampler states don't really make sense with buffer textures, but the PBO > upload code sets one because apparently nouveau needs it. It would be > nice to work that out at some point, but in any case being defensive > here is a good idea. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94284 > Cc: mesa-sta...@lists.freedesktop.org > --- > src/gallium/drivers/radeonsi/si_descriptors.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c > b/src/gallium/drivers/radeonsi/si_descriptors.c > index 9aa4877..f5ad113 100644 > --- a/src/gallium/drivers/radeonsi/si_descriptors.c > +++ b/src/gallium/drivers/radeonsi/si_descriptors.c > @@ -324,6 +324,7 @@ static void si_bind_sampler_states(struct pipe_context > *ctx, unsigned shader, > */ > if (samplers->views.views[i] && > samplers->views.views[i]->texture && > + samplers->views.views[i]->texture->target != PIPE_BUFFER > && > ((struct > r600_texture*)samplers->views.views[i]->texture)->fmask.size) > continue; > > -- > 2.5.0 > > ___ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH] radeonsi: avoid crash when a sampler state is bound for a buffer texture
From: Nicolai Hähnle Sampler states don't really make sense with buffer textures, but the PBO upload code sets one because apparently nouveau needs it. It would be nice to work that out at some point, but in any case being defensive here is a good idea. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94284 Cc: mesa-sta...@lists.freedesktop.org --- src/gallium/drivers/radeonsi/si_descriptors.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index 9aa4877..f5ad113 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -324,6 +324,7 @@ static void si_bind_sampler_states(struct pipe_context *ctx, unsigned shader, */ if (samplers->views.views[i] && samplers->views.views[i]->texture && + samplers->views.views[i]->texture->target != PIPE_BUFFER && ((struct r600_texture*)samplers->views.views[i]->texture)->fmask.size) continue; -- 2.5.0 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev