On 11.02.2016 10:00, Marek Olšák wrote:
From: Marek Olšák <marek.ol...@amd.com>

Buffers don't contain r600_texture.

Broken by 7aedbbacae6d3ec3d06735fff2eb66:
"radeonsi: put image, fmask, and sampler descriptors into one array"

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94091

Reviewed-by: Nicolai Hähnle <nicolai.haeh...@amd.com>

---
  src/gallium/drivers/radeonsi/si_descriptors.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c 
b/src/gallium/drivers/radeonsi/si_descriptors.c
index 34cc06f..345f2bb 100644
--- a/src/gallium/drivers/radeonsi/si_descriptors.c
+++ b/src/gallium/drivers/radeonsi/si_descriptors.c
@@ -203,7 +203,8 @@ static void si_set_sampler_view(struct si_context *sctx,
                pipe_sampler_view_reference(&views->views[slot], view);
                memcpy(views->desc.list + slot * 16, rview->state, 8*4);

-               if (rtex && rtex->fmask.size) {
+               if (view->texture && view->texture->target != PIPE_BUFFER &&
+                   rtex->fmask.size) {
                        memcpy(views->desc.list + slot*16 + 8,
                               rview->fmask_state, 8*4);
                } else {

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to