diff options
| author | Eric Anholt <[email protected]> | 2014-08-22 16:49:02 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2014-08-23 16:30:42 -0700 |
| commit | 8d8a5eb792c662a8def7c9ab65d2df67972cf659 (patch) | |
| tree | 6611044e08596e3da9bfa4e1cdec811560cfad8d | |
| parent | 9542e682078a1b2e65f6b62a8db58f25cff18078 (diff) | |
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.
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_resource.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/vc4/vc4_resource.c b/src/gallium/drivers/vc4/vc4_resource.c index 3048b23eec3..98c8f89fdec 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); |