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/gallium/drivers/nvfx | |
| 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/nvfx')
| -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 |
3 files changed, 20 insertions, 4 deletions
diff --git a/src/gallium/drivers/nvfx/nvfx_context.h b/src/gallium/drivers/nvfx/nvfx_context.h index 9a4b4631b5..46cc7362ea 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 6132cf94e2..0c906ecb1d 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 fcbf831050..9d28b59074 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" |