Merge branch 'gallium-newclear'

Conflicts:
	src/gallium/state_trackers/python/p_context.i

1 files changed, 2 insertions, 1 deletions

diff --git a/src/gallium/drivers/failover/fo_context.c b/src/gallium/drivers/failover/fo_context.c
index 2246c1468c..9c9c1bdc45 100644
--- a/src/gallium/drivers/failover/fo_context.c
+++ b/src/gallium/drivers/failover/fo_context.c
@@ -146,6 +146,8 @@ struct pipe_context *failover_create( struct pipe_context *hw,
    failover->pipe.draw_arrays = failover_draw_arrays;
    failover->pipe.draw_elements = failover_draw_elements;
    failover->pipe.clear = hw->clear;
+   failover->pipe.clear_render_target = hw->clear_render_target;
+   failover->pipe.clear_depth_stencil = hw->clear_depth_stencil;
 
    /* No software occlusion fallback (or other optional functionality)
     * at this point - if the hardware doesn't support it, don't
@@ -157,7 +159,6 @@ struct pipe_context *failover_create( struct pipe_context *hw,
    failover_init_state_functions( failover );
 
    failover->pipe.resource_copy_region = hw->resource_copy_region;
-   failover->pipe.resource_fill_region = hw->resource_fill_region;
 
 #if 0
    failover->pipe.texture_create = hw->texture_create;