diff options
| author | Stephane Marchesin <[email protected]> | 2009-02-02 02:13:07 +0100 |
|---|---|---|
| committer | Stephane Marchesin <[email protected]> | 2009-02-02 02:13:07 +0100 |
| commit | 59edbc70cd1042a884e7d153ba547c2f7f87318d (patch) | |
| tree | c5764fc515f31ab8017d63b476c8ec1178d41d96 /src/gallium/winsys/drm/nouveau/common | |
| parent | 4035e0f8989754ee7d31212e69d6461f1bbff008 (diff) | |
| parent | 1c90cdd878e9d10e1f6ac619d5d0c3f5151fcb2b (diff) | |
Merge branch 'gallium-0.2' of git+ssh://[email protected]/git/mesa/mesa into gallium-0.2
Diffstat (limited to 'src/gallium/winsys/drm/nouveau/common')
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.c b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.c index 5b3101fbba9..8e889b9f369 100644 --- a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.c +++ b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.c @@ -1,4 +1,4 @@ -#include <pipe/p_winsys.h> +#include "pipe/internal/p_winsys_screen.h" #include <pipe/p_defines.h> #include <pipe/p_inlines.h> #include <util/u_memory.h> 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 14c728690d4..d97ffdf3373 100644 --- a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.h +++ b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys_pipe.h @@ -2,7 +2,7 @@ #define NOUVEAU_PIPE_WINSYS_H #include "pipe/p_context.h" -#include "pipe/p_winsys.h" +#include "pipe/internal/p_winsys_screen.h" #include "nouveau_context.h" struct nouveau_pipe_buffer { diff --git a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys_softpipe.c b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys_softpipe.c index 04def600f45..396e4f2a2e6 100644 --- a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys_softpipe.c +++ b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys_softpipe.c @@ -29,7 +29,7 @@ * Authors: Keith Whitwell <keithw-at-tungstengraphics-dot-com> */ -#include <pipe/p_winsys.h> +#include "pipe/internal/p_winsys_screen.h" #include <pipe/p_screen.h> #include <pipe/p_defines.h> #include <pipe/p_format.h> |