diff options
| author | Christian König <[email protected]> | 2010-12-11 13:43:44 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2010-12-11 13:43:44 +0100 |
| commit | 772b25e1f366edc857e77b8c1ccdc5297d82cc41 (patch) | |
| tree | 88d38b52e80319dbd4a0c5b5e038d92f1105110a /src/gallium/drivers/softpipe/sp_screen.c | |
| parent | ab130400cf91ab471e265e58193c95f04c7aeeda (diff) | |
| parent | b3d2ec9942303d1d03e28a25b030eb060415abfb (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/r600/r600_texture.c
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_screen.c')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_screen.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c index 5e13d632387..cd3b6240fe9 100644 --- a/src/gallium/drivers/softpipe/sp_screen.c +++ b/src/gallium/drivers/softpipe/sp_screen.c @@ -267,12 +267,13 @@ softpipe_destroy_screen( struct pipe_screen *screen ) */ static void softpipe_flush_frontbuffer(struct pipe_screen *_screen, - struct pipe_surface *surface, + struct pipe_resource *resource, + unsigned level, unsigned layer, void *context_private) { struct softpipe_screen *screen = softpipe_screen(_screen); struct sw_winsys *winsys = screen->winsys; - struct softpipe_resource *texture = softpipe_resource(surface->texture); + struct softpipe_resource *texture = softpipe_resource(resource); assert(texture->dt); if (texture->dt) |