summaryrefslogtreecommitdiff
path: root/src/mesa/pipe/nv40/nv40_state.h
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2007-11-20 13:22:11 +1100
committerBen Skeggs <skeggsb@gmail.com>2007-11-20 13:22:11 +1100
commit060127af38bd3a732e64cf23f06cd4cef26ac67e (patch)
treec298489fe2e14258182200a651d32b624a6d5d48 /src/mesa/pipe/nv40/nv40_state.h
parentc7c6253169798658547ec6fc6eb9cdefc68b58d3 (diff)
nouveau: update to latest header
Diffstat (limited to 'src/mesa/pipe/nv40/nv40_state.h')
-rw-r--r--src/mesa/pipe/nv40/nv40_state.h51
1 files changed, 0 insertions, 51 deletions
diff --git a/src/mesa/pipe/nv40/nv40_state.h b/src/mesa/pipe/nv40/nv40_state.h
index 1535037f63..ae162b95ce 100644
--- a/src/mesa/pipe/nv40/nv40_state.h
+++ b/src/mesa/pipe/nv40/nv40_state.h
@@ -119,55 +119,4 @@ struct nv40_depth_stencil_state {
} stencil;
};
-static INLINE unsigned
-nv40_tex_wrap_mode(unsigned wrap) {
- switch (wrap) {
- case PIPE_TEX_WRAP_REPEAT:
- return NV40TCL_TEX_WRAP_S_REPEAT;
- case PIPE_TEX_WRAP_MIRROR_REPEAT:
- return NV40TCL_TEX_WRAP_S_MIRRORED_REPEAT;
- case PIPE_TEX_WRAP_CLAMP_TO_EDGE:
- return NV40TCL_TEX_WRAP_S_CLAMP_TO_EDGE;
- case PIPE_TEX_WRAP_CLAMP_TO_BORDER:
- return NV40TCL_TEX_WRAP_S_CLAMP_TO_BORDER;
- case PIPE_TEX_WRAP_CLAMP:
- return NV40TCL_TEX_WRAP_S_CLAMP;
- case PIPE_TEX_WRAP_MIRROR_CLAMP_TO_EDGE:
- return NV40TCL_TEX_WRAP_S_MIRROR_CLAMP_TO_EDGE;
- case PIPE_TEX_WRAP_MIRROR_CLAMP_TO_BORDER:
- return NV40TCL_TEX_WRAP_S_MIRROR_CLAMP_TO_BORDER;
- case PIPE_TEX_WRAP_MIRROR_CLAMP:
- return NV40TCL_TEX_WRAP_S_MIRROR_CLAMP;
- default:
- return NV40TCL_TEX_WRAP_S_REPEAT;
- }
-}
-
-static INLINE unsigned
-nv40_tex_filter(unsigned f0, unsigned f1) {
- switch (f0) {
- case PIPE_TEX_FILTER_NEAREST:
- switch (f1) {
- case PIPE_TEX_MIPFILTER_NEAREST:
- return NV40TCL_TEX_FILTER_MIN_NEAREST_MIPMAP_NEAREST;
- case PIPE_TEX_MIPFILTER_LINEAR:
- return NV40TCL_TEX_FILTER_MIN_NEAREST_MIPMAP_LINEAR;
- case PIPE_TEX_MIPFILTER_NONE:
- default:
- return NV40TCL_TEX_FILTER_MIN_NEAREST;
- }
- case PIPE_TEX_FILTER_LINEAR:
- default:
- switch (f1) {
- case PIPE_TEX_MIPFILTER_NEAREST:
- return NV40TCL_TEX_FILTER_MIN_LINEAR_MIPMAP_NEAREST;
- case PIPE_TEX_MIPFILTER_LINEAR:
- return NV40TCL_TEX_FILTER_MIN_LINEAR_MIPMAP_LINEAR;
- case PIPE_TEX_MIPFILTER_NONE:
- default:
- return NV40TCL_TEX_FILTER_MIN_LINEAR;
- }
- }
-}
-
#endif