diff options
| author | Stéphane Marchesin <[email protected]> | 2012-10-04 17:37:37 -0700 |
|---|---|---|
| committer | Stéphane Marchesin <[email protected]> | 2012-10-05 12:45:01 -0700 |
| commit | dca9e3c4779936970dac796872a2399cd0437f63 (patch) | |
| tree | 300d52977a379f9320cf852268433e776ff396b3 /src/gallium/drivers/i915/i915_surface.c | |
| parent | 98600c5ff674431fd325acec30ec42909c3ad8ed (diff) | |
i915g: Remove the i915_context->saved_* stuff.
When using u_blitter, the state was being saved from saved_*, but we
don't use that. So after u_blitter resumed we got some corrupted
state in.
So let's just remove the saved_* stuff. I thought it was weird but
harmless, it's actually broken.
Diffstat (limited to 'src/gallium/drivers/i915/i915_surface.c')
| -rw-r--r-- | src/gallium/drivers/i915/i915_surface.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gallium/drivers/i915/i915_surface.c b/src/gallium/drivers/i915/i915_surface.c index 4bb5f4800cf..6f5a654069f 100644 --- a/src/gallium/drivers/i915/i915_surface.c +++ b/src/gallium/drivers/i915/i915_surface.c @@ -50,22 +50,22 @@ i915_util_blitter_save_states(struct i915_context *i915) util_blitter_save_depth_stencil_alpha(i915->blitter, (void *)i915->depth_stencil); util_blitter_save_stencil_ref(i915->blitter, &i915->stencil_ref); util_blitter_save_rasterizer(i915->blitter, (void *)i915->rasterizer); - util_blitter_save_fragment_shader(i915->blitter, i915->saved_fs); - util_blitter_save_vertex_shader(i915->blitter, i915->saved_vs); + util_blitter_save_fragment_shader(i915->blitter, i915->fs); + util_blitter_save_vertex_shader(i915->blitter, i915->vs); util_blitter_save_viewport(i915->blitter, &i915->viewport); util_blitter_save_scissor(i915->blitter, &i915->scissor); - util_blitter_save_vertex_elements(i915->blitter, i915->saved_velems); - util_blitter_save_vertex_buffers(i915->blitter, i915->saved_nr_vertex_buffers, - i915->saved_vertex_buffers); + util_blitter_save_vertex_elements(i915->blitter, i915->velems); + util_blitter_save_vertex_buffers(i915->blitter, i915->nr_vertex_buffers, + i915->vertex_buffers); util_blitter_save_framebuffer(i915->blitter, &i915->framebuffer); util_blitter_save_fragment_sampler_states(i915->blitter, - i915->saved_nr_samplers, - i915->saved_samplers); + i915->num_samplers, + i915->sampler); util_blitter_save_fragment_sampler_views(i915->blitter, - i915->saved_nr_sampler_views, - i915->saved_sampler_views); + i915->num_fragment_sampler_views, + i915->fragment_sampler_views); } static void |