diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2009-02-05 18:19:32 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2009-02-05 18:22:41 +1000 |
| commit | ff8dff017e537c6db4c86aad43e92b768cb187e4 (patch) | |
| tree | 984360ac7447dd5d889628ffef995d821ed8f442 /src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.h | |
| parent | 13393736dbab1087589f8dd788bc412d16b431d1 (diff) | |
nv04-nv40: move 2d blit/fill code into pipe driver
Diffstat (limited to 'src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.h')
| -rw-r--r-- | src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.h b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.h index b041a77e38..1eb8043478 100644 --- a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.h +++ b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.h @@ -10,15 +10,10 @@ struct nouveau_pipe_buffer { struct nouveau_bo *bo; }; -/* This is so horrible I should be shot - I promise I'll fix it properly - * tomorrow. Just to make the winsys build again however... The TG guys - * don't like to make life easy :) - */ -static inline struct nouveau_pipe_buffer * -nouveau_buffer(struct pipe_surface *ps) +static INLINE struct nouveau_pipe_buffer * +nouveau_pipe_buffer(struct pipe_buffer *buf) { - return *(struct nouveau_pipe_buffer **) - ((void *)ps->texture + sizeof(struct pipe_texture)); + return (struct nouveau_pipe_buffer *)buf; } struct nouveau_pipe_winsys { |