From: Eric Anholt <eric@anholt.net>
Date: Wed, 13 Jun 2018 20:38:33 +0000 (-0700)
Subject: v3d: Fix configuration setup of mixed f32 and f16 render targets.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d91e06a06572a4c4772b02dfc39dcbd283b490f9;p=mesa.git

v3d: Fix configuration setup of mixed f32 and f16 render targets.

Fixes dEQP-GLES3.functional.fragment_out.random.26 and 6 others.
---

diff --git a/src/broadcom/compiler/nir_to_vir.c b/src/broadcom/compiler/nir_to_vir.c
index 23b5975a334..51b4fd6848d 100644
--- a/src/broadcom/compiler/nir_to_vir.c
+++ b/src/broadcom/compiler/nir_to_vir.c
@@ -1000,7 +1000,7 @@ emit_frag_end(struct v3d_compile *c)
                         struct qreg b = color[2];
                         struct qreg a = color[3];
 
-                        if (c->fs_key->f32_color_rb) {
+                        if (c->fs_key->f32_color_rb & (1 << rt)) {
                                 conf |= TLB_TYPE_F32_COLOR;
                                 conf |= ((num_components - 1) <<
                                          TLB_VEC_SIZE_MINUS_1_SHIFT);