Squashed commit of the following:

[mesa.git] / src / gallium / state_trackers / dri / common / dri1_helper.c

diff --git a/src/gallium/state_trackers/dri/common/dri1_helper.c b/src/gallium/state_trackers/dri/common/dri1_helper.c
index 7eeb868d422f2e84d14e47754933dce6c84d08c1..b0dd974a9649483899e3a8c5cc4d3dd506923513 100644 (file)
--- a/src/gallium/state_trackers/dri/common/dri1_helper.c
+++ b/src/gallium/state_trackers/dri/common/dri1_helper.c
@@ -84,7 +84,7 @@ dri1_swap_fences_clear(struct dri_drawable *drawable)
 }
 
 struct pipe_surface *
-dri1_get_pipe_surface(struct dri_drawable *drawable, struct pipe_texture *ptex)
+dri1_get_pipe_surface(struct dri_drawable *drawable, struct pipe_resource *ptex)
 {
    struct pipe_screen *pipe_screen = dri_screen(drawable->sPriv)->pipe_screen;
    struct pipe_surface *psurf = drawable->dri1_surface;
@@ -93,7 +93,7 @@ dri1_get_pipe_surface(struct dri_drawable *drawable, struct pipe_texture *ptex)
       pipe_surface_reference(&drawable->dri1_surface, NULL);
 
       drawable->dri1_surface = pipe_screen->get_tex_surface(pipe_screen,
-            ptex, 0, 0, 0, PIPE_BUFFER_USAGE_GPU_READ);
+            ptex, 0, 0, 0, PIPE_BIND_BLIT_SOURCE);
 
       psurf = drawable->dri1_surface;
    }