Squashed commit of the following:

[mesa.git] / src / gallium / drivers / nvfx / nv04_surface_2d.h

diff --git a/src/gallium/drivers/nvfx/nv04_surface_2d.h b/src/gallium/drivers/nvfx/nv04_surface_2d.h
index ce696a11a39e44a9fda8425a082f2a0ecdab559d..b2b237b9dfa76fe686ffc028c1c42dace8a287cb 100644 (file)
--- a/src/gallium/drivers/nvfx/nv04_surface_2d.h
+++ b/src/gallium/drivers/nvfx/nv04_surface_2d.h
@@ -16,7 +16,7 @@ struct nv04_surface_2d {
        struct nouveau_grobj *blit;
        struct nouveau_grobj *sifm;
 
-       struct pipe_buffer *(*buf)(struct pipe_surface *);
+       struct nouveau_bo *(*buf)(struct pipe_surface *);
 
        void (*copy)(struct nv04_surface_2d *, struct pipe_surface *dst,
                     int dx, int dy, struct pipe_surface *src, int sx, int sy,
@@ -34,4 +34,6 @@ nv04_surface_2d_takedown(struct nv04_surface_2d **);
 struct nv04_surface*
 nv04_surface_wrap_for_render(struct pipe_screen *pscreen, struct nv04_surface_2d* eng2d, struct nv04_surface* ns);
 
+#define NVFX_RESOURCE_FLAG_LINEAR (PIPE_RESOURCE_FLAG_DRV_PRIV << 0)
+
 #endif