diff options
author | Christian König <[email protected]> | 2011-01-20 22:43:18 +0100 |
---|---|---|
committer | Christian König <[email protected]> | 2011-01-20 22:43:18 +0100 |
commit | 78faf8d0e9c276a0ff1465e501d58fb3d66de2f7 (patch) | |
tree | 4e124bd6b511e408c5e113c4166b8fa97fd75b24 /src/gallium/drivers/softpipe/sp_flush.c | |
parent | d2ff6b8715e817c1ef14d4bf12be58c19d894143 (diff) | |
parent | 37233f1ee0213a224611788bbab38840ba9f8308 (diff) |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_asm.c
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_flush.c')
-rw-r--r-- | src/gallium/drivers/softpipe/sp_flush.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/softpipe/sp_flush.c b/src/gallium/drivers/softpipe/sp_flush.c index 4258395063b..d422cb17a4b 100644 --- a/src/gallium/drivers/softpipe/sp_flush.c +++ b/src/gallium/drivers/softpipe/sp_flush.c @@ -52,7 +52,7 @@ softpipe_flush( struct pipe_context *pipe, if (flags & PIPE_FLUSH_TEXTURE_CACHE) { for (i = 0; i < softpipe->num_sampler_views; i++) { - sp_flush_tex_tile_cache(softpipe->tex_cache[i]); + sp_flush_tex_tile_cache(softpipe->fragment_tex_cache[i]); } for (i = 0; i < softpipe->num_vertex_sampler_views; i++) { sp_flush_tex_tile_cache(softpipe->vertex_tex_cache[i]); |