diff options
| author | José Fonseca <[email protected]> | 2010-02-03 18:54:13 +0000 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2010-02-03 18:54:13 +0000 |
| commit | 45dac0d82a5a69166e86dce77c2550f7512c541e (patch) | |
| tree | 41a10f422174ef9543db2396057f052c056eb396 /src/gallium/state_trackers/python | |
| parent | f8d824e09a54871df899f368ebaadc9a4e5b62ff (diff) | |
| parent | 976afaf98f4b1ce32003dd014cbb3c09063bcb68 (diff) | |
Merge branch 'gallium-embedded'
Diffstat (limited to 'src/gallium/state_trackers/python')
| -rw-r--r-- | src/gallium/state_trackers/python/gallium.i | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/python/st_device.c | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/python/st_llvmpipe_winsys.c | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/python/st_sample.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/state_trackers/python/gallium.i b/src/gallium/state_trackers/python/gallium.i index 68797228459..99e177b0be4 100644 --- a/src/gallium/state_trackers/python/gallium.i +++ b/src/gallium/state_trackers/python/gallium.i @@ -40,9 +40,9 @@ #include "pipe/p_screen.h" #include "pipe/p_context.h" -#include "pipe/p_inlines.h" #include "pipe/p_shader_tokens.h" #include "cso_cache/cso_context.h" +#include "util/u_inlines.h" #include "util/u_draw_quad.h" #include "util/u_tile.h" #include "util/u_math.h" diff --git a/src/gallium/state_trackers/python/st_device.c b/src/gallium/state_trackers/python/st_device.c index e41125f6f99..467e20207a3 100644 --- a/src/gallium/state_trackers/python/st_device.c +++ b/src/gallium/state_trackers/python/st_device.c @@ -29,7 +29,7 @@ #include "pipe/p_screen.h" #include "pipe/p_context.h" #include "pipe/p_shader_tokens.h" -#include "pipe/p_inlines.h" +#include "util/u_inlines.h" #include "cso_cache/cso_context.h" #include "util/u_math.h" #include "util/u_memory.h" diff --git a/src/gallium/state_trackers/python/st_llvmpipe_winsys.c b/src/gallium/state_trackers/python/st_llvmpipe_winsys.c index 0096b18c994..c5ee1679f04 100644 --- a/src/gallium/state_trackers/python/st_llvmpipe_winsys.c +++ b/src/gallium/state_trackers/python/st_llvmpipe_winsys.c @@ -36,7 +36,7 @@ #include "pipe/p_format.h" #include "pipe/p_context.h" -#include "pipe/p_inlines.h" +#include "util/u_inlines.h" #include "util/u_math.h" #include "util/u_memory.h" #include "llvmpipe/lp_winsys.h" diff --git a/src/gallium/state_trackers/python/st_sample.c b/src/gallium/state_trackers/python/st_sample.c index 96377414211..32a6551a87a 100644 --- a/src/gallium/state_trackers/python/st_sample.c +++ b/src/gallium/state_trackers/python/st_sample.c @@ -29,7 +29,7 @@ #include "pipe/p_compiler.h" #include "pipe/p_format.h" #include "pipe/p_state.h" -#include "pipe/p_inlines.h" +#include "util/u_inlines.h" #include "util/u_format.h" #include "util/u_tile.h" #include "util/u_math.h" |