diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-01-28 18:32:46 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-01-28 18:32:46 +1100 |
| commit | 3e39bc3d87a82d81ffaf383303ada32e530b879e (patch) | |
| tree | 530249743415875917c0ebbf53eaf92d7901bd2d /src/mesa/pipe/nouveau | |
| parent | a556034514582dc8e1b8b65f56020031d513331b (diff) | |
nouveau: quicky-port to gallium changes
Diffstat (limited to 'src/mesa/pipe/nouveau')
| -rw-r--r-- | src/mesa/pipe/nouveau/nouveau_push.h | 3 | ||||
| -rw-r--r-- | src/mesa/pipe/nouveau/nouveau_winsys.h | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/mesa/pipe/nouveau/nouveau_push.h b/src/mesa/pipe/nouveau/nouveau_push.h index 0fc972d2a2..117e3535cf 100644 --- a/src/mesa/pipe/nouveau/nouveau_push.h +++ b/src/mesa/pipe/nouveau/nouveau_push.h @@ -45,8 +45,7 @@ NOUVEAU_PUSH_CONTEXT(pc); \ pc->nvws->push_reloc(pc->nvws->channel, \ pc->nvws->channel->pushbuf->cur, \ - (struct nouveau_bo *)(bo), \ - (data), (flags), (vor), (tor)); \ + (bo), (data), (flags), (vor), (tor)); \ OUT_RING(0); \ } while(0) diff --git a/src/mesa/pipe/nouveau/nouveau_winsys.h b/src/mesa/pipe/nouveau/nouveau_winsys.h index 27c991077e..0b394cfce6 100644 --- a/src/mesa/pipe/nouveau/nouveau_winsys.h +++ b/src/mesa/pipe/nouveau/nouveau_winsys.h @@ -25,7 +25,7 @@ struct nouveau_winsys { void (*res_free)(struct nouveau_resource **); int (*push_reloc)(struct nouveau_channel *, void *ptr, - struct nouveau_bo *, uint32_t data, + struct pipe_buffer *, uint32_t data, uint32_t flags, uint32_t vor, uint32_t tor); int (*push_flush)(struct nouveau_channel *, unsigned size); @@ -47,9 +47,6 @@ struct nouveau_winsys { unsigned, unsigned, unsigned, unsigned); int (*surface_fill)(struct nouveau_winsys *, struct pipe_surface *, unsigned, unsigned, unsigned, unsigned, unsigned); - int (*surface_data)(struct nouveau_winsys *, struct pipe_surface *, - unsigned, unsigned, const void *, unsigned, - unsigned, unsigned, unsigned, unsigned); }; extern struct pipe_context * |