projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nvfx: drop render temporaries code
[mesa.git]
/
src
/
gallium
/
drivers
/
nvfx
/
nvfx_tex.h
diff --git
a/src/gallium/drivers/nvfx/nvfx_tex.h
b/src/gallium/drivers/nvfx/nvfx_tex.h
index 34be936a891d93b3c76e32e10a7a3d48103a80a0..2f2d73780850ab8c14c03f3942e2e5d97995f747 100644
(file)
--- a/
src/gallium/drivers/nvfx/nvfx_tex.h
+++ b/
src/gallium/drivers/nvfx/nvfx_tex.h
@@
-4,7
+4,7
@@
#include "util/u_math.h"
#include "pipe/p_defines.h"
#include "pipe/p_state.h"
#include "util/u_math.h"
#include "pipe/p_defines.h"
#include "pipe/p_state.h"
-#include <nouveau/nouveau_class.h>
+
static inline unsigned
nvfx_tex_wrap_mode(unsigned wrap) {
static inline unsigned
nvfx_tex_wrap_mode(unsigned wrap) {
@@
-12,36
+12,36
@@
nvfx_tex_wrap_mode(unsigned wrap) {
switch (wrap) {
case PIPE_TEX_WRAP_REPEAT:
switch (wrap) {
case PIPE_TEX_WRAP_REPEAT:
- ret = NV3
4TCL_T
X_WRAP_S_REPEAT;
+ ret = NV3
0_3D_TE
X_WRAP_S_REPEAT;
break;
case PIPE_TEX_WRAP_MIRROR_REPEAT:
break;
case PIPE_TEX_WRAP_MIRROR_REPEAT:
- ret = NV3
4TCL_T
X_WRAP_S_MIRRORED_REPEAT;
+ ret = NV3
0_3D_TE
X_WRAP_S_MIRRORED_REPEAT;
break;
case PIPE_TEX_WRAP_CLAMP_TO_EDGE:
break;
case PIPE_TEX_WRAP_CLAMP_TO_EDGE:
- ret = NV3
4TCL_T
X_WRAP_S_CLAMP_TO_EDGE;
+ ret = NV3
0_3D_TE
X_WRAP_S_CLAMP_TO_EDGE;
break;
case PIPE_TEX_WRAP_CLAMP_TO_BORDER:
break;
case PIPE_TEX_WRAP_CLAMP_TO_BORDER:
- ret = NV3
4TCL_T
X_WRAP_S_CLAMP_TO_BORDER;
+ ret = NV3
0_3D_TE
X_WRAP_S_CLAMP_TO_BORDER;
break;
case PIPE_TEX_WRAP_CLAMP:
break;
case PIPE_TEX_WRAP_CLAMP:
- ret = NV3
4TCL_T
X_WRAP_S_CLAMP;
+ ret = NV3
0_3D_TE
X_WRAP_S_CLAMP;
break;
case PIPE_TEX_WRAP_MIRROR_CLAMP_TO_EDGE:
break;
case PIPE_TEX_WRAP_MIRROR_CLAMP_TO_EDGE:
- ret = NV40
TCL
_TEX_WRAP_S_MIRROR_CLAMP_TO_EDGE;
+ ret = NV40
_3D
_TEX_WRAP_S_MIRROR_CLAMP_TO_EDGE;
break;
case PIPE_TEX_WRAP_MIRROR_CLAMP_TO_BORDER:
break;
case PIPE_TEX_WRAP_MIRROR_CLAMP_TO_BORDER:
- ret = NV40
TCL
_TEX_WRAP_S_MIRROR_CLAMP_TO_BORDER;
+ ret = NV40
_3D
_TEX_WRAP_S_MIRROR_CLAMP_TO_BORDER;
break;
case PIPE_TEX_WRAP_MIRROR_CLAMP:
break;
case PIPE_TEX_WRAP_MIRROR_CLAMP:
- ret = NV40
TCL
_TEX_WRAP_S_MIRROR_CLAMP;
+ ret = NV40
_3D
_TEX_WRAP_S_MIRROR_CLAMP;
break;
default:
assert(0);
break;
default:
assert(0);
- ret = NV3
4TCL_T
X_WRAP_S_REPEAT;
+ ret = NV3
0_3D_TE
X_WRAP_S_REPEAT;
break;
}
break;
}
- return ret >> NV3
4TCL_TX_WRAP_S
_SHIFT;
+ return ret >> NV3
0_3D_TEX_WRAP_S_
_SHIFT;
}
static inline unsigned
}
static inline unsigned
@@
-49,21
+49,21
@@
nvfx_tex_wrap_compare_mode(unsigned func)
{
switch (func) {
case PIPE_FUNC_NEVER:
{
switch (func) {
case PIPE_FUNC_NEVER:
- return NV3
4TCL_T
X_WRAP_RCOMP_NEVER;
+ return NV3
0_3D_TE
X_WRAP_RCOMP_NEVER;
case PIPE_FUNC_GREATER:
case PIPE_FUNC_GREATER:
- return NV3
4TCL_T
X_WRAP_RCOMP_GREATER;
+ return NV3
0_3D_TE
X_WRAP_RCOMP_GREATER;
case PIPE_FUNC_EQUAL:
case PIPE_FUNC_EQUAL:
- return NV3
4TCL_T
X_WRAP_RCOMP_EQUAL;
+ return NV3
0_3D_TE
X_WRAP_RCOMP_EQUAL;
case PIPE_FUNC_GEQUAL:
case PIPE_FUNC_GEQUAL:
- return NV3
4TCL_T
X_WRAP_RCOMP_GEQUAL;
+ return NV3
0_3D_TE
X_WRAP_RCOMP_GEQUAL;
case PIPE_FUNC_LESS:
case PIPE_FUNC_LESS:
- return NV3
4TCL_T
X_WRAP_RCOMP_LESS;
+ return NV3
0_3D_TE
X_WRAP_RCOMP_LESS;
case PIPE_FUNC_NOTEQUAL:
case PIPE_FUNC_NOTEQUAL:
- return NV3
4TCL_T
X_WRAP_RCOMP_NOTEQUAL;
+ return NV3
0_3D_TE
X_WRAP_RCOMP_NOTEQUAL;
case PIPE_FUNC_LEQUAL:
case PIPE_FUNC_LEQUAL:
- return NV3
4TCL_T
X_WRAP_RCOMP_LEQUAL;
+ return NV3
0_3D_TE
X_WRAP_RCOMP_LEQUAL;
case PIPE_FUNC_ALWAYS:
case PIPE_FUNC_ALWAYS:
- return NV3
4TCL_T
X_WRAP_RCOMP_ALWAYS;
+ return NV3
0_3D_TE
X_WRAP_RCOMP_ALWAYS;
default:
assert(0);
return 0;
default:
assert(0);
return 0;
@@
-75,11
+75,11
@@
static inline unsigned nvfx_tex_filter(const struct pipe_sampler_state* cso)
unsigned filter = 0;
switch (cso->mag_img_filter) {
case PIPE_TEX_FILTER_LINEAR:
unsigned filter = 0;
switch (cso->mag_img_filter) {
case PIPE_TEX_FILTER_LINEAR:
- filter |= NV3
4TCL_TX_FILTER_MAGNIFY
_LINEAR;
+ filter |= NV3
0_3D_TEX_FILTER_MAG
_LINEAR;
break;
case PIPE_TEX_FILTER_NEAREST:
default:
break;
case PIPE_TEX_FILTER_NEAREST:
default:
- filter |= NV3
4TCL_TX_FILTER_MAGNIFY
_NEAREST;
+ filter |= NV3
0_3D_TEX_FILTER_MAG
_NEAREST;
break;
}
break;
}
@@
-87,14
+87,14
@@
static inline unsigned nvfx_tex_filter(const struct pipe_sampler_state* cso)
case PIPE_TEX_FILTER_LINEAR:
switch (cso->min_mip_filter) {
case PIPE_TEX_MIPFILTER_NEAREST:
case PIPE_TEX_FILTER_LINEAR:
switch (cso->min_mip_filter) {
case PIPE_TEX_MIPFILTER_NEAREST:
- filter |= NV3
4TCL_TX_FILTER_MINIFY
_LINEAR_MIPMAP_NEAREST;
+ filter |= NV3
0_3D_TEX_FILTER_MIN
_LINEAR_MIPMAP_NEAREST;
break;
case PIPE_TEX_MIPFILTER_LINEAR:
break;
case PIPE_TEX_MIPFILTER_LINEAR:
- filter |= NV3
4TCL_TX_FILTER_MINIFY
_LINEAR_MIPMAP_LINEAR;
+ filter |= NV3
0_3D_TEX_FILTER_MIN
_LINEAR_MIPMAP_LINEAR;
break;
case PIPE_TEX_MIPFILTER_NONE:
default:
break;
case PIPE_TEX_MIPFILTER_NONE:
default:
- filter |= NV3
4TCL_TX_FILTER_MINIFY
_LINEAR;
+ filter |= NV3
0_3D_TEX_FILTER_MIN
_LINEAR;
break;
}
break;
break;
}
break;
@@
-102,14
+102,14
@@
static inline unsigned nvfx_tex_filter(const struct pipe_sampler_state* cso)
default:
switch (cso->min_mip_filter) {
case PIPE_TEX_MIPFILTER_NEAREST:
default:
switch (cso->min_mip_filter) {
case PIPE_TEX_MIPFILTER_NEAREST:
- filter |= NV3
4TCL_TX_FILTER_MINIFY
_NEAREST_MIPMAP_NEAREST;
+ filter |= NV3
0_3D_TEX_FILTER_MIN
_NEAREST_MIPMAP_NEAREST;
break;
case PIPE_TEX_MIPFILTER_LINEAR:
break;
case PIPE_TEX_MIPFILTER_LINEAR:
- filter |= NV3
4TCL_TX_FILTER_MINIFY
_NEAREST_MIPMAP_LINEAR;
+ filter |= NV3
0_3D_TEX_FILTER_MIN
_NEAREST_MIPMAP_LINEAR;
break;
case PIPE_TEX_MIPFILTER_NONE:
default:
break;
case PIPE_TEX_MIPFILTER_NONE:
default:
- filter |= NV3
4TCL_TX_FILTER_MINIFY
_NEAREST;
+ filter |= NV3
0_3D_TEX_FILTER_MIN
_NEAREST;
break;
}
break;
break;
}
break;