diff options
| author | Keith Whitwell <[email protected]> | 2010-03-15 09:44:52 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2010-03-15 09:44:52 +0000 |
| commit | 42910ebe7b9748c0ecb6a597bae3e7d43c7e170f (patch) | |
| tree | b2b9c72dc47a0473304dc2db1b078d13b658df34 /src/gallium/drivers/r300/r300_reg.h | |
| parent | 47bfbd452c93e6a8db013fb90d9f42210cf24889 (diff) | |
| parent | 68e58a96e80865878e6881dc4d34fcc3ec24eb19 (diff) | |
Merge commit 'origin/master' into gallium-sampler-view
Conflicts:
src/gallium/drivers/nv30/nv30_context.h
src/gallium/drivers/nv30/nv30_state.c
src/gallium/drivers/nv40/nv40_context.h
src/gallium/drivers/nv40/nv40_state.c
src/gallium/drivers/r300/r300_emit.c
Diffstat (limited to 'src/gallium/drivers/r300/r300_reg.h')
| -rw-r--r-- | src/gallium/drivers/r300/r300_reg.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/drivers/r300/r300_reg.h b/src/gallium/drivers/r300/r300_reg.h index c67cc868713..1c2b2528877 100644 --- a/src/gallium/drivers/r300/r300_reg.h +++ b/src/gallium/drivers/r300/r300_reg.h @@ -1500,6 +1500,10 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. # define R300_ANISO_THRESHOLD_MASK (7<<17) # define R500_MACRO_SWITCH (1<<22) +# define R500_TX_MAX_ANISO(x) ((x) << 23) +# define R500_TX_MAX_ANISO_MASK (63 << 23) +# define R500_TX_ANISO_HIGH_QUALITY (1 << 30) + # define R500_BORDER_FIX (1<<31) #define R300_TX_FORMAT0_0 0x4480 |