diff options
| author | Zack Rusin <zack@tungstengraphics.com> | 2007-09-18 06:24:54 -0400 |
|---|---|---|
| committer | Zack Rusin <zack@tungstengraphics.com> | 2007-09-18 07:20:14 -0400 |
| commit | fbb2f840aef9a540401575b032edb4dfdabd10bb (patch) | |
| tree | c71bdb51f8d7478d39c2b68ebc9626fe244e7682 /src/mesa | |
| parent | 29789ca026c03dff64b6286e202561faf111fde9 (diff) | |
move cso cache to the pipe directory
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/pipe/cso_cache/cso_cache.c (renamed from src/mesa/cso_cache/cso_cache.c) | 0 | ||||
| -rw-r--r-- | src/mesa/pipe/cso_cache/cso_cache.h (renamed from src/mesa/cso_cache/cso_cache.h) | 0 | ||||
| -rw-r--r-- | src/mesa/pipe/cso_cache/cso_hash.c (renamed from src/mesa/cso_cache/cso_hash.c) | 0 | ||||
| -rw-r--r-- | src/mesa/pipe/cso_cache/cso_hash.h (renamed from src/mesa/cso_cache/cso_hash.h) | 0 | ||||
| -rw-r--r-- | src/mesa/sources | 4 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_cache.c | 4 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_context.c | 2 |
7 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/cso_cache/cso_cache.c b/src/mesa/pipe/cso_cache/cso_cache.c index 4aaadf00e6..4aaadf00e6 100644 --- a/src/mesa/cso_cache/cso_cache.c +++ b/src/mesa/pipe/cso_cache/cso_cache.c diff --git a/src/mesa/cso_cache/cso_cache.h b/src/mesa/pipe/cso_cache/cso_cache.h index 23be9cd713..23be9cd713 100644 --- a/src/mesa/cso_cache/cso_cache.h +++ b/src/mesa/pipe/cso_cache/cso_cache.h diff --git a/src/mesa/cso_cache/cso_hash.c b/src/mesa/pipe/cso_cache/cso_hash.c index fe033c9e91..fe033c9e91 100644 --- a/src/mesa/cso_cache/cso_hash.c +++ b/src/mesa/pipe/cso_cache/cso_hash.c diff --git a/src/mesa/cso_cache/cso_hash.h b/src/mesa/pipe/cso_cache/cso_hash.h index b4aa111860..b4aa111860 100644 --- a/src/mesa/cso_cache/cso_hash.h +++ b/src/mesa/pipe/cso_cache/cso_hash.h diff --git a/src/mesa/sources b/src/mesa/sources index 22b592df09..017a0167bd 100644 --- a/src/mesa/sources +++ b/src/mesa/sources @@ -187,8 +187,8 @@ TGSIMESA_SOURCES = \ pipe/tgsi/mesa/mesa_to_tgsi.c STATECACHE_SOURCES = \ - cso_cache/cso_hash.c \ - cso_cache/cso_cache.c + pipe/cso_cache/cso_hash.c \ + pipe/cso_cache/cso_cache.c STATETRACKER_SOURCES = \ state_tracker/st_atom.c \ diff --git a/src/mesa/state_tracker/st_cache.c b/src/mesa/state_tracker/st_cache.c index a687c15587..e9c79634bd 100644 --- a/src/mesa/state_tracker/st_cache.c +++ b/src/mesa/state_tracker/st_cache.c @@ -36,8 +36,8 @@ #include "pipe/p_state.h" -#include "cso_cache/cso_cache.h" -#include "cso_cache/cso_hash.h" +#include "pipe/cso_cache/cso_cache.h" +#include "pipe/cso_cache/cso_hash.h" /* This function will either find the state of the given template * in the cache or it will create a new state state from the given diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index f9717465f4..e0304dd22d 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -45,7 +45,7 @@ #include "st_program.h" #include "pipe/p_context.h" #include "pipe/draw/draw_context.h" -#include "cso_cache/cso_cache.h" +#include "pipe/cso_cache/cso_cache.h" void st_invalidate_state(GLcontext * ctx, GLuint new_state) |