From 61359324c1ed511edc8b1d6b23ced1e43b08ec42 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 6 Mar 2017 18:04:12 -0800 Subject: Revert "vc4: Lazily emit our FS/VS input loads." This reverts commit 292c24ddac5acc35676424f05291c101fcd47b3e. It broke a lot of GLES2 deqp, and I see at least one problem that will require some serious rework to fix. --- src/gallium/drivers/vc4/vc4_draw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gallium/drivers/vc4/vc4_draw.c') diff --git a/src/gallium/drivers/vc4/vc4_draw.c b/src/gallium/drivers/vc4/vc4_draw.c index 9f3765db1af..ebd080298a4 100644 --- a/src/gallium/drivers/vc4/vc4_draw.c +++ b/src/gallium/drivers/vc4/vc4_draw.c @@ -170,14 +170,14 @@ vc4_emit_gl_shader_state(struct vc4_context *vc4, /* VC4_DIRTY_COMPILED_VS */ cl_u16(&shader_rec, 0); /* vs num uniforms */ cl_u8(&shader_rec, vc4->prog.vs->vattrs_live); - cl_u8(&shader_rec, vc4->prog.vs->vattr_total_size); + cl_u8(&shader_rec, vc4->prog.vs->vattr_offsets[8]); cl_reloc(job, &job->shader_rec, &shader_rec, vc4->prog.vs->bo, 0); cl_u32(&shader_rec, 0); /* UBO offset written by kernel */ /* VC4_DIRTY_COMPILED_CS */ cl_u16(&shader_rec, 0); /* cs num uniforms */ cl_u8(&shader_rec, vc4->prog.cs->vattrs_live); - cl_u8(&shader_rec, vc4->prog.cs->vattr_total_size); + cl_u8(&shader_rec, vc4->prog.cs->vattr_offsets[8]); cl_reloc(job, &job->shader_rec, &shader_rec, vc4->prog.cs->bo, 0); cl_u32(&shader_rec, 0); /* UBO offset written by kernel */ -- cgit v1.2.3