From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Thu, 27 Aug 2020 22:59:14 +0000 (-0400)
Subject: panfrost: Emit texture/sampler points for compute
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fd41dece39c7d6110951e0fd6fc1693663e7c10d;p=mesa.git

panfrost: Emit texture/sampler points for compute

Fixes page faults on dEQP-GLES31.functional.shaders.opaque_type_indexing.sampler.const_literal.compute.sampler2d

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6516>
---

diff --git a/src/gallium/drivers/panfrost/pan_compute.c b/src/gallium/drivers/panfrost/pan_compute.c
index cef9ec46aaa..3628a38dbf3 100644
--- a/src/gallium/drivers/panfrost/pan_compute.c
+++ b/src/gallium/drivers/panfrost/pan_compute.c
@@ -127,6 +127,10 @@ panfrost_launch_grid(struct pipe_context *pipe,
                 cfg.shared = panfrost_emit_shared_memory(batch, info);
                 cfg.uniform_buffers = panfrost_emit_const_buf(batch,
                                 PIPE_SHADER_COMPUTE, &cfg.push_uniforms);
+                cfg.textures = panfrost_emit_texture_descriptors(batch,
+                                PIPE_SHADER_COMPUTE);
+                cfg.samplers = panfrost_emit_sampler_descriptors(batch,
+                                PIPE_SHADER_COMPUTE);
         }
 
         unsigned magic =