From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Fri, 13 Dec 2019 17:41:54 +0000 (-0500)
Subject: panfrost: Simplify sampler upload condition
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=73bd9fe20c4a4c34496d02ea888b3c1dcfdf1d4f;p=mesa.git

panfrost: Simplify sampler upload condition

Makes it more obvious what's going on.

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

diff --git a/src/gallium/drivers/panfrost/pan_context.c b/src/gallium/drivers/panfrost/pan_context.c
index 54ce6f81c71..b446a4afb01 100644
--- a/src/gallium/drivers/panfrost/pan_context.c
+++ b/src/gallium/drivers/panfrost/pan_context.c
@@ -500,7 +500,7 @@ panfrost_upload_sampler_descriptors(struct panfrost_context *ctx)
         for (int t = 0; t <= PIPE_SHADER_FRAGMENT; ++t) {
                 mali_ptr upload = 0;
 
-                if (ctx->sampler_count[t] && ctx->sampler_view_count[t]) {
+                if (ctx->sampler_count[t]) {
                         size_t transfer_size = desc_size * ctx->sampler_count[t];
 
                         struct panfrost_transfer transfer =