Mesa (master): v3d: Fill in the ignored segment size fields to appease new simulator.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 448fc3ea427ed0edebe2ab5f81c585a5273bafd3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=448fc3ea427ed0edebe2ab5f81c585a5273bafd3

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Apr 24 17:25:08 2019 -0700

v3d: Fill in the ignored segment size fields to appease new simulator.

We are assured that the input segment size field is ignored for
!separate_segs mode, and now the simulator wants an in-range value set
regardless of whether it's functionally ignored or not.

---

 src/gallium/drivers/v3d/v3dx_draw.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/v3d/v3dx_draw.c b/src/gallium/drivers/v3d/v3dx_draw.c
index 14e95c71204..486b6cc9b12 100644
--- a/src/gallium/drivers/v3d/v3dx_draw.c
+++ b/src/gallium/drivers/v3d/v3dx_draw.c
@@ -261,9 +261,11 @@ v3d_emit_gl_shader_state(struct v3d_context *v3d,
                         v3d->prog.vs->prog_data.vs->separate_segments;
 
                 shader.coordinate_shader_input_vpm_segment_size =
-                        v3d->prog.cs->prog_data.vs->vpm_input_size;
+                        v3d->prog.cs->prog_data.vs->separate_segments ?
+                        v3d->prog.cs->prog_data.vs->vpm_input_size : 1;
                 shader.vertex_shader_input_vpm_segment_size =
-                        v3d->prog.vs->prog_data.vs->vpm_input_size;
+                        v3d->prog.vs->prog_data.vs->separate_segments ?
+                        v3d->prog.vs->prog_data.vs->vpm_input_size : 1;
 
                 shader.coordinate_shader_output_vpm_segment_size =
                         v3d->prog.cs->prog_data.vs->vpm_output_size;