Mesa (master): vc4: Fix save/restore of the VS/FS in the blitter.

[Eric Anholt]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Fri Aug 22 16:49:02 2014 -0700

vc4: Fix save/restore of the VS/FS in the blitter.

When I made the shader cache take the .fs member and moved the binding
point to .bind_fs, I failed to update these.  Fixes crashes in
copyteximage-related tests.

---

 src/gallium/drivers/vc4/vc4_resource.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/vc4/vc4_resource.c b/src/gallium/drivers/vc4/vc4_resource.c
index 3048b23..98c8f89 100644
--- a/src/gallium/drivers/vc4/vc4_resource.c
+++ b/src/gallium/drivers/vc4/vc4_resource.c
@@ -407,11 +407,11 @@ render_blit(struct pipe_context *ctx, struct pipe_blit_info *info)
 
         util_blitter_save_vertex_buffer_slot(vc4->blitter, vc4->vertexbuf.vb);
         util_blitter_save_vertex_elements(vc4->blitter, vc4->vtx);
-        util_blitter_save_vertex_shader(vc4->blitter, vc4->prog.vs);
+        util_blitter_save_vertex_shader(vc4->blitter, vc4->prog.bind_vs);
         util_blitter_save_rasterizer(vc4->blitter, vc4->rasterizer);
         util_blitter_save_viewport(vc4->blitter, &vc4->viewport);
         util_blitter_save_scissor(vc4->blitter, &vc4->scissor);
-        util_blitter_save_fragment_shader(vc4->blitter, vc4->prog.fs);
+        util_blitter_save_fragment_shader(vc4->blitter, vc4->prog.bind_fs);
         util_blitter_save_blend(vc4->blitter, vc4->blend);
         util_blitter_save_depth_stencil_alpha(vc4->blitter, vc4->zsa);
         util_blitter_save_stencil_ref(vc4->blitter, &vc4->stencil_ref);