Squashed commit of the following:

[mesa.git] / src / gallium / state_trackers / xorg / xorg_renderer.h

diff --git a/src/gallium/state_trackers/xorg/xorg_renderer.h b/src/gallium/state_trackers/xorg/xorg_renderer.h
index cc5802e79b2400ed51f10982bd138a24a8df23e6..0454a6513d4b1440e2aa6558b21df2e206342bfb 100644 (file)
--- a/src/gallium/state_trackers/xorg/xorg_renderer.h
+++ b/src/gallium/state_trackers/xorg/xorg_renderer.h
@@ -23,8 +23,8 @@ struct xorg_renderer {
 
    int fb_width;
    int fb_height;
-   struct pipe_buffer *vs_const_buffer;
-   struct pipe_buffer *fs_const_buffer;
+   struct pipe_resource *vs_const_buffer;
+   struct pipe_resource *fs_const_buffer;
 
    float buffer[BUF_SIZE];
    int buffer_size;
@@ -56,7 +56,7 @@ void renderer_set_constants(struct xorg_renderer *r,
 void renderer_draw_yuv(struct xorg_renderer *r,
                        int src_x, int src_y, int src_w, int src_h,
                        int dst_x, int dst_y, int dst_w, int dst_h,
-                       struct pipe_texture **textures);
+                       struct pipe_resource **textures);
 
 void renderer_begin_solid(struct xorg_renderer *r);
 void renderer_solid(struct xorg_renderer *r,
@@ -77,13 +77,13 @@ void renderer_texture(struct xorg_renderer *r,
 
 void renderer_draw_flush(struct xorg_renderer *r);
 
-struct pipe_texture *
+struct pipe_resource *
 renderer_clone_texture(struct xorg_renderer *r,
-                       struct pipe_texture *src);
+                       struct pipe_resource *src);
 
 void renderer_copy_prepare(struct xorg_renderer *r,
                            struct pipe_surface *dst_surface,
-                           struct pipe_texture *src_texture);
+                           struct pipe_resource *src_texture);
 
 void renderer_copy_pixmap(struct xorg_renderer *r,
                           int dx, int dy,