diff options
| author | Ben Skeggs <[email protected]> | 2008-06-11 14:59:19 +1000 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2008-06-29 15:46:17 +1000 |
| commit | 19a1e9015e4ae429ab26e56848104fa209590338 (patch) | |
| tree | 95eb9540302f5a0c887ddad62424e4000e2e55bd | |
| parent | 585ae74d87f3d04a4b5b7c068b865292afd1a16b (diff) | |
nv50: rename nv50_state.h to nv50_program.h
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_context.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_program.c | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_program.h (renamed from src/gallium/drivers/nv50/nv50_state.h) | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_state.c | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_vbo.c | 1 |
5 files changed, 3 insertions, 6 deletions
diff --git a/src/gallium/drivers/nv50/nv50_context.h b/src/gallium/drivers/nv50/nv50_context.h index 69c9dba675b..72d859c4685 100644 --- a/src/gallium/drivers/nv50/nv50_context.h +++ b/src/gallium/drivers/nv50/nv50_context.h @@ -15,8 +15,8 @@ struct nv50_screen *ctx = nv50->screen #include "nouveau/nouveau_push.h" -#include "nv50_state.h" #include "nv50_screen.h" +#include "nv50_program.h" #define NOUVEAU_ERR(fmt, args...) \ fprintf(stderr, "%s:%d - "fmt, __func__, __LINE__, ##args); diff --git a/src/gallium/drivers/nv50/nv50_program.c b/src/gallium/drivers/nv50/nv50_program.c index b73003123d8..2118d8ef85f 100644 --- a/src/gallium/drivers/nv50/nv50_program.c +++ b/src/gallium/drivers/nv50/nv50_program.c @@ -8,7 +8,6 @@ #include "tgsi/util/tgsi_util.h" #include "nv50_context.h" -#include "nv50_state.h" #define NV50_SU_MAX_TEMP 64 diff --git a/src/gallium/drivers/nv50/nv50_state.h b/src/gallium/drivers/nv50/nv50_program.h index d568bf610d5..dd5aed799aa 100644 --- a/src/gallium/drivers/nv50/nv50_state.h +++ b/src/gallium/drivers/nv50/nv50_program.h @@ -1,5 +1,5 @@ -#ifndef __NV50_STATE_H__ -#define __NV50_STATE_H__ +#ifndef __NV50_PROGRAM_H__ +#define __NV50_PROGRAM_H__ #include "pipe/p_state.h" #include "tgsi/util/tgsi_scan.h" diff --git a/src/gallium/drivers/nv50/nv50_state.c b/src/gallium/drivers/nv50/nv50_state.c index 774117326ad..ed6cca9a0dd 100644 --- a/src/gallium/drivers/nv50/nv50_state.c +++ b/src/gallium/drivers/nv50/nv50_state.c @@ -3,7 +3,6 @@ #include "pipe/p_util.h" #include "nv50_context.h" -#include "nv50_state.h" #include "nouveau/nouveau_stateobj.h" diff --git a/src/gallium/drivers/nv50/nv50_vbo.c b/src/gallium/drivers/nv50/nv50_vbo.c index badbef53df5..140d60cc9a6 100644 --- a/src/gallium/drivers/nv50/nv50_vbo.c +++ b/src/gallium/drivers/nv50/nv50_vbo.c @@ -3,7 +3,6 @@ #include "pipe/p_util.h" #include "nv50_context.h" -#include "nv50_state.h" static INLINE unsigned nv50_prim(unsigned mode) |