diff options
author | Eric Anholt <[email protected]> | 2019-02-14 21:01:05 -0800 |
---|---|---|
committer | Eric Anholt <[email protected]> | 2019-02-18 18:09:07 -0800 |
commit | 5a84d46896dc16309325c0e60674347c12665eef (patch) | |
tree | b4f2a8190b158c2b3923e1d9c0e7fd5049b489c7 /src/gallium/drivers/v3d | |
parent | 581eba072db4be53cd8d3e2878a162d8fca7c73b (diff) |
v3d: Stop tracking num_inputs for VPM loads.
It's unused in the VS (since we need vattr_sizes[] anyway), so move it to
FS prog data.
Diffstat (limited to 'src/gallium/drivers/v3d')
-rw-r--r-- | src/gallium/drivers/v3d/v3d_program.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/v3d/v3dx_draw.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/v3d/v3d_program.c b/src/gallium/drivers/v3d/v3d_program.c index 30769047a96..0224df08d0b 100644 --- a/src/gallium/drivers/v3d/v3d_program.c +++ b/src/gallium/drivers/v3d/v3d_program.c @@ -614,7 +614,7 @@ v3d_update_compiled_vs(struct v3d_context *v3d, uint8_t prim_mode) memset(key, 0, sizeof(*key)); v3d_setup_shared_key(v3d, &key->base, &v3d->tex[PIPE_SHADER_VERTEX]); key->base.shader_state = v3d->prog.bind_vs; - key->num_fs_inputs = v3d->prog.fs->prog_data.fs->base.num_inputs; + key->num_fs_inputs = v3d->prog.fs->prog_data.fs->num_inputs; STATIC_ASSERT(sizeof(key->fs_inputs) == sizeof(v3d->prog.fs->prog_data.fs->input_slots)); memcpy(key->fs_inputs, v3d->prog.fs->prog_data.fs->input_slots, diff --git a/src/gallium/drivers/v3d/v3dx_draw.c b/src/gallium/drivers/v3d/v3dx_draw.c index 60fe745fbd3..ebdc436318d 100644 --- a/src/gallium/drivers/v3d/v3dx_draw.c +++ b/src/gallium/drivers/v3d/v3dx_draw.c @@ -215,7 +215,7 @@ v3d_emit_gl_shader_state(struct v3d_context *v3d, v3d->prog.fs->prog_data.fs->uses_center_w; shader.number_of_varyings_in_fragment_shader = - v3d->prog.fs->prog_data.base->num_inputs; + v3d->prog.fs->prog_data.fs->num_inputs; shader.coordinate_shader_propagate_nans = true; shader.vertex_shader_propagate_nans = true; |