diff options
author | Luca Barbieri <luca@luca-barbieri.com> | 2010-02-21 14:38:04 +0100 |
---|---|---|
committer | Younes Manton <younes.m@gmail.com> | 2010-03-15 00:03:03 -0400 |
commit | 6992be543383ba0850bd813153def24ab4e28911 (patch) | |
tree | dd564d2c61926bf9ba3d499cb4b305642f736ab3 /src | |
parent | 10f464fc1073e8f3b53dbcf2209a2204f4924094 (diff) |
nv30, nv40: fully unify nv[34]0_context.h
Move the remaining content to the common header.
Diffstat (limited to 'src')
-rw-r--r-- | src/gallium/drivers/nv30/nv30_context.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nv30/nv30_context.h | 14 | ||||
-rw-r--r-- | src/gallium/drivers/nv30/nv30_fragtex.c | 2 | ||||
-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 | ||||
-rw-r--r-- | src/gallium/drivers/nvfx/nvfx_context.h | 18 | ||||
-rw-r--r-- | src/gallium/drivers/nvfx/nvfx_screen.c | 3 | ||||
-rw-r--r-- | src/gallium/drivers/nvfx/nvfx_state_emit.c | 3 |
9 files changed, 24 insertions, 37 deletions
diff --git a/src/gallium/drivers/nv30/nv30_context.c b/src/gallium/drivers/nv30/nv30_context.c index 9ddb331e749..7e3fd83ee0a 100644 --- a/src/gallium/drivers/nv30/nv30_context.c +++ b/src/gallium/drivers/nv30/nv30_context.c @@ -1,7 +1,7 @@ #include "draw/draw_context.h" #include "pipe/p_defines.h" -#include "nv30_context.h" +#include "nvfx_context.h" #include "nvfx_screen.h" static void diff --git a/src/gallium/drivers/nv30/nv30_context.h b/src/gallium/drivers/nv30/nv30_context.h deleted file mode 100644 index eacbb1753d5..00000000000 --- a/src/gallium/drivers/nv30/nv30_context.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef __NV30_CONTEXT_H__ -#define __NV30_CONTEXT_H__ - -#include "nvfx_context.h" - -/* nv30_fragtex.c */ -extern void nv30_fragtex_bind(struct nvfx_context *); -extern struct nvfx_state_entry nv30_state_fragtex; - -/* nvfx_context.c */ -struct pipe_context * -nv30_create(struct pipe_screen *pscreen, void *priv); - -#endif diff --git a/src/gallium/drivers/nv30/nv30_fragtex.c b/src/gallium/drivers/nv30/nv30_fragtex.c index 34e7dd54445..ab39dedae6b 100644 --- a/src/gallium/drivers/nv30/nv30_fragtex.c +++ b/src/gallium/drivers/nv30/nv30_fragtex.c @@ -1,6 +1,6 @@ #include "util/u_format.h" -#include "nv30_context.h" +#include "nvfx_context.h" #include "nouveau/nouveau_util.h" #define _(m,tf,ts0x,ts0y,ts0z,ts0w,ts1x,ts1y,ts1z,ts1w) \ 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) \ { \ diff --git a/src/gallium/drivers/nvfx/nvfx_context.h b/src/gallium/drivers/nvfx/nvfx_context.h index 9a4b4631b54..46cc7362eab 100644 --- a/src/gallium/drivers/nvfx/nvfx_context.h +++ b/src/gallium/drivers/nvfx/nvfx_context.h @@ -198,6 +198,14 @@ extern struct nvfx_state_entry nvfx_state_zsa; extern void nvfx_init_query_functions(struct nvfx_context *nvfx); extern void nvfx_init_surface_functions(struct nvfx_context *nvfx); +/* nv30_context.c */ +struct pipe_context * +nv30_create(struct pipe_screen *pscreen, void *priv); + +/* nv40_context.c */ +struct pipe_context * +nv40_create(struct pipe_screen *pscreen, void *priv); + /* nvfx_clear.c */ extern void nvfx_clear(struct pipe_context *pipe, unsigned buffers, const float *rgba, double depth, unsigned stencil); @@ -213,6 +221,16 @@ extern void nvfx_draw_elements_swtnl(struct pipe_context *pipe, extern void nvfx_fragprog_destroy(struct nvfx_context *, struct nvfx_fragment_program *); +/* nv30_fragtex.c */ +extern void nv30_init_sampler_functions(struct nvfx_context *nvfx); +extern void nv30_fragtex_bind(struct nvfx_context *); +extern struct nvfx_state_entry nv30_state_fragtex; + +/* nv40_fragtex.c */ +extern void nv40_init_sampler_functions(struct nvfx_context *nvfx); +extern void nv40_fragtex_bind(struct nvfx_context *); +extern struct nvfx_state_entry nv40_state_fragtex; + /* nvfx_state.c */ extern void nvfx_init_state_functions(struct nvfx_context *nvfx); diff --git a/src/gallium/drivers/nvfx/nvfx_screen.c b/src/gallium/drivers/nvfx/nvfx_screen.c index 6132cf94e2c..0c906ecb1d1 100644 --- a/src/gallium/drivers/nvfx/nvfx_screen.c +++ b/src/gallium/drivers/nvfx/nvfx_screen.c @@ -3,8 +3,7 @@ #include "nouveau/nouveau_screen.h" -#include "nv30/nv30_context.h" -#include "nv40/nv40_context.h" +#include "nvfx_context.h" #include "nvfx_screen.h" #define NV30TCL_CHIPSET_3X_MASK 0x00000003 diff --git a/src/gallium/drivers/nvfx/nvfx_state_emit.c b/src/gallium/drivers/nvfx/nvfx_state_emit.c index fcbf8310501..9d28b590746 100644 --- a/src/gallium/drivers/nvfx/nvfx_state_emit.c +++ b/src/gallium/drivers/nvfx/nvfx_state_emit.c @@ -1,5 +1,4 @@ -#include "nv30/nv30_context.h" -#include "nv40/nv40_context.h" +#include "nvfx_context.h" #include "nvfx_state.h" #include "draw/draw_context.h" |