diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2009-02-18 16:43:02 +0100 |
|---|---|---|
| committer | Michel Dänzer <daenzer@vmware.com> | 2009-02-18 16:43:02 +0100 |
| commit | 3bd7c5ceffc88a052c5e8e114df2f2c7549ddb4a (patch) | |
| tree | bdb352609c3ef21875a2699428e26b8c8c930f73 /src/gallium/drivers/softpipe/sp_state.h | |
| parent | 76d8951fd3adbb91b2f71d461eec0f304619ca0b (diff) | |
| parent | b89aa1d87ad6cebdbb3f2067863c600f50bf0ff1 (diff) | |
Merge branch 'gallium-texture-transfer'
Conflicts:
src/gallium/drivers/softpipe/sp_tile_cache.c
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_state.h')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_state.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/softpipe/sp_state.h b/src/gallium/drivers/softpipe/sp_state.h index 3eff41ffa5..6f558e6da5 100644 --- a/src/gallium/drivers/softpipe/sp_state.h +++ b/src/gallium/drivers/softpipe/sp_state.h @@ -184,10 +184,10 @@ softpipe_set_edgeflags(struct pipe_context *pipe, const unsigned *edgeflags); void -softpipe_map_surfaces(struct softpipe_context *sp); +softpipe_map_transfers(struct softpipe_context *sp); void -softpipe_unmap_surfaces(struct softpipe_context *sp); +softpipe_unmap_transfers(struct softpipe_context *sp); void softpipe_map_texture_surfaces(struct softpipe_context *sp); |