From 28105560f778c4b7718349d3719cc96e15092f2b Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Mon, 2 Oct 2017 12:05:30 -0700
Subject: [PATCH] broadcom/vc5: Fix setup of TF dword output count.

I missed the "- 1" when reading the spec.
---
 src/broadcom/cle/v3d_packet_v33.xml   | 2 +-
 src/gallium/drivers/vc5/vc5_program.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/broadcom/cle/v3d_packet_v33.xml b/src/broadcom/cle/v3d_packet_v33.xml
index bbfe0a991db..06ca0365ef3 100644
--- a/src/broadcom/cle/v3d_packet_v33.xml
+++ b/src/broadcom/cle/v3d_packet_v33.xml
@@ -255,7 +255,7 @@
 
   <struct name="Transform Feedback Output Data Spec">
     <field name="First Shaded Vertex Value to output" size="8" start="0" type="uint"/>
-    <field name="Number of consecutive Vertex Values to output as 32-bit values" size="4" start="8" type="uint"/>
+    <field name="Number of consecutive Vertex Values to output as 32-bit values minus 1" size="4" start="8" type="uint"/>
     <field name="Output Buffer to write to" size="2" start="12" type="uint"/>
   </struct>
 
diff --git a/src/gallium/drivers/vc5/vc5_program.c b/src/gallium/drivers/vc5/vc5_program.c
index 107c9c05335..d3b3d1bee70 100644
--- a/src/gallium/drivers/vc5/vc5_program.c
+++ b/src/gallium/drivers/vc5/vc5_program.c
@@ -87,7 +87,7 @@ vc5_set_transform_feedback_outputs(struct vc5_uncompiled_shader *so,
 
                 struct V3D33_TRANSFORM_FEEDBACK_OUTPUT_DATA_SPEC unpacked = {
                         .first_shaded_vertex_value_to_output = vpm_start,
-                        .number_of_consecutive_vertex_values_to_output_as_32_bit_values = vpm_size,
+                        .number_of_consecutive_vertex_values_to_output_as_32_bit_values_minus_1 = vpm_size - 1,
                         .output_buffer_to_write_to = buffer,
                 };
                 V3D33_TRANSFORM_FEEDBACK_OUTPUT_DATA_SPEC_pack(NULL,
-- 
2.30.2