diff options
author | Ben Skeggs <[email protected]> | 2008-05-27 00:59:41 +1000 |
---|---|---|
committer | Ben Skeggs <[email protected]> | 2008-05-27 00:59:41 +1000 |
commit | 0f9635d9d522ea712724415599ceb44d53e67819 (patch) | |
tree | 91484d00053baeb265d04a54a116229562194217 /src/gallium/drivers/failover | |
parent | 8f67f98959261d193cb5f3db274b55fb24e2bb1e (diff) | |
parent | 253066d716e3039522eeb7b072811cccd89b4a82 (diff) |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/drivers/failover')
-rw-r--r-- | src/gallium/drivers/failover/fo_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/failover/fo_context.c b/src/gallium/drivers/failover/fo_context.c index cb95ba516f9..014a3e31d50 100644 --- a/src/gallium/drivers/failover/fo_context.c +++ b/src/gallium/drivers/failover/fo_context.c @@ -147,8 +147,8 @@ struct pipe_context *failover_create( struct pipe_context *hw, failover->pipe.texture_create = hw->texture_create; failover->pipe.texture_release = hw->texture_release; failover->pipe.get_tex_surface = hw->get_tex_surface; -#endif failover->pipe.texture_update = hw->texture_update; +#endif failover->pipe.flush = hw->flush; |