diff options
| author | Luca Barbieri <[email protected]> | 2010-02-21 14:38:04 +0100 |
|---|---|---|
| committer | Younes Manton <[email protected]> | 2010-03-15 00:03:03 -0400 |
| commit | 6992be543383ba0850bd813153def24ab4e28911 (patch) | |
| tree | dd564d2c61926bf9ba3d499cb4b305642f736ab3 /src/gallium/drivers/nv40 | |
| parent | 10f464fc1073e8f3b53dbcf2209a2204f4924094 (diff) | |
nv30, nv40: fully unify nv[34]0_context.h
Move the remaining content to the common header.
Diffstat (limited to 'src/gallium/drivers/nv40')
| -rw-r--r-- | src/gallium/drivers/nv40/nv40_context.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/nv40/nv40_context.h | 14 | ||||
| -rw-r--r-- | src/gallium/drivers/nv40/nv40_fragtex.c | 3 |
3 files changed, 2 insertions, 17 deletions
diff --git a/src/gallium/drivers/nv40/nv40_context.c b/src/gallium/drivers/nv40/nv40_context.c index 13bd50dd1dc..5a526423ac4 100644 --- a/src/gallium/drivers/nv40/nv40_context.c +++ b/src/gallium/drivers/nv40/nv40_context.c @@ -1,7 +1,7 @@ #include "draw/draw_context.h" #include "pipe/p_defines.h" -#include "nv40_context.h" +#include "nvfx_context.h" #include "nvfx_screen.h" static void diff --git a/src/gallium/drivers/nv40/nv40_context.h b/src/gallium/drivers/nv40/nv40_context.h deleted file mode 100644 index 8dc87e426f9..00000000000 --- a/src/gallium/drivers/nv40/nv40_context.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __NV40_CONTEXT_H__ -#define __NV40_CONTEXT_H__ - -#include "nvfx_context.h" - -/* nv40_fragtex.c */ -extern void nv40_fragtex_bind(struct nvfx_context *); -extern struct nvfx_state_entry nv40_state_fragtex; - -/* nvfx_context.c */ -struct pipe_context * -nv40_create(struct pipe_screen *pscreen, void *priv); - -#endif diff --git a/src/gallium/drivers/nv40/nv40_fragtex.c b/src/gallium/drivers/nv40/nv40_fragtex.c index 0b46a5313bd..29257173b82 100644 --- a/src/gallium/drivers/nv40/nv40_fragtex.c +++ b/src/gallium/drivers/nv40/nv40_fragtex.c @@ -1,6 +1,5 @@ #include "util/u_format.h" - -#include "nv40_context.h" +#include "nvfx_context.h" #define _(m,tf,ts0x,ts0y,ts0z,ts0w,ts1x,ts1y,ts1z,ts1w,sx,sy,sz,sw) \ { \ |