panfrost: Derive texture/sampler_count from shader

[mesa.git] / src / gallium / drivers / panfrost / pan_cmdstream.c

diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c
index 8409ec253437d81b0650703b25d1f2140c55ead4..34a3e8055e1fcce75e1690d967fbf893c43daeb0 100644 (file)
--- a/src/gallium/drivers/panfrost/pan_cmdstream.c
+++ b/src/gallium/drivers/panfrost/pan_cmdstream.c
@@ -318,8 +318,8 @@ panfrost_emit_compute_shader(struct panfrost_context *ctx,
         meta->shader = ss->shader;
         meta->attribute_count = ss->attribute_count;
         meta->varying_count = ss->varying_count;
-        meta->texture_count = ctx->sampler_view_count[st];
-        meta->sampler_count = ctx->sampler_count[st];
+        meta->texture_count = ss->texture_count;
+        meta->sampler_count = ss->texture_count; /* Combined on mesa/st */
 
         if (dev->quirks & IS_BIFROST) {
                 struct mali_bifrost_properties_packed prop;
@@ -573,8 +573,8 @@ panfrost_emit_frag_shader(struct panfrost_context *ctx,
         fragmeta->shader = fs->shader;
         fragmeta->attribute_count = fs->attribute_count;
         fragmeta->varying_count = fs->varying_count;
-        fragmeta->texture_count = ctx->sampler_view_count[PIPE_SHADER_FRAGMENT];
-        fragmeta->sampler_count = ctx->sampler_count[PIPE_SHADER_FRAGMENT];
+        fragmeta->texture_count = fs->texture_count;
+        fragmeta->sampler_count = fs->texture_count; /* Combined on mesa/st */
 
         if (dev->quirks & IS_BIFROST) {
                 struct mali_bifrost_properties_packed prop;