v3d: Add an assert that we don't provide an invalid texture return words.
authorEric Anholt <eric@anholt.net>
Mon, 16 Jul 2018 19:41:28 +0000 (12:41 -0700)
committerEric Anholt <eric@anholt.net>
Mon, 16 Jul 2018 21:39:59 +0000 (14:39 -0700)
The docs had an update noting this restriction, so reflect it in the code.

src/broadcom/compiler/v3d40_tex.c

index 2fd8c3b5a6e7a2c0f184d08c3b68838e751a5e3e..00e52998e95aa8244b3375aac77f344fdf1b6d98 100644 (file)
@@ -153,6 +153,14 @@ v3d40_vir_emit_tex(struct v3d_compile *c, nir_tex_instr *instr)
                 (1 << MIN2(instr_return_channels,
                            c->key->tex[unit].return_channels)) - 1;
 
+        /* Word enables can't ask for more channels than the output type could
+         * provide (2 for f16, 4 for 32-bit).
+         */
+        assert(!p1_unpacked.output_type_32_bit ||
+               p0_unpacked.return_words_of_texture_data < (1 << 4));
+        assert(p1_unpacked.output_type_32_bit ||
+               p0_unpacked.return_words_of_texture_data < (1 << 2));
+
         uint32_t p0_packed;
         V3D41_TMU_CONFIG_PARAMETER_0_pack(NULL,
                                           (uint8_t *)&p0_packed,