diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-06-07 16:51:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-06-07 16:51:32 +1000 |
| commit | 545e574cd9a2a659cd9a93879dff8884bd247558 (patch) | |
| tree | f56d65eaa851edfb1248a6fc8ac0bae4cc98eff5 /src/gallium/drivers/nv04/nv04_screen.h | |
| parent | e2aedfa62079ff1a333e1f4e56faea303cc36edb (diff) | |
| parent | f1edfa09ea50e8833ddbf241da4d36fd38685e9d (diff) | |
Merge remote branch 'origin/master' into radeon-rewrite
Diffstat (limited to 'src/gallium/drivers/nv04/nv04_screen.h')
| -rw-r--r-- | src/gallium/drivers/nv04/nv04_screen.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/nv04/nv04_screen.h b/src/gallium/drivers/nv04/nv04_screen.h index ee6fb6db44..11466b9442 100644 --- a/src/gallium/drivers/nv04/nv04_screen.h +++ b/src/gallium/drivers/nv04/nv04_screen.h @@ -1,11 +1,11 @@ #ifndef __NV04_SCREEN_H__ #define __NV04_SCREEN_H__ -#include "pipe/p_screen.h" +#include "nouveau/nouveau_screen.h" #include "nv04_surface_2d.h" struct nv04_screen { - struct pipe_screen pipe; + struct nouveau_screen base; struct nouveau_winsys *nvws; unsigned chipset; |