diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-01-08 02:28:43 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-01-08 02:28:43 +1100 |
| commit | 9de335f5807553bc9251931ba3e80c4b454b5818 (patch) | |
| tree | a50114f612f18e8aebd6e9f127a8a6eef0e5b339 /src/mesa/pipe | |
| parent | a50f224f41faaf4ba75902d2dd46f1fe595f098f (diff) | |
nouveau: object header update
Diffstat (limited to 'src/mesa/pipe')
| -rw-r--r-- | src/mesa/pipe/nouveau/nouveau_class.h | 29 | ||||
| -rw-r--r-- | src/mesa/pipe/nv40/nv40_state_tex.c | 6 |
2 files changed, 28 insertions, 7 deletions
diff --git a/src/mesa/pipe/nouveau/nouveau_class.h b/src/mesa/pipe/nouveau/nouveau_class.h index 1f2c52891d..e3c284095d 100644 --- a/src/mesa/pipe/nouveau/nouveau_class.h +++ b/src/mesa/pipe/nouveau/nouveau_class.h @@ -3672,7 +3672,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -#define NV36TCL 0x00000497 +#define NV35TCL 0x00000497 @@ -5070,7 +5070,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define NV40TCL_TEX_FORMAT_FORMAT_DXT1 0x00000600 #define NV40TCL_TEX_FORMAT_FORMAT_DXT3 0x00000700 #define NV40TCL_TEX_FORMAT_FORMAT_DXT5 0x00000800 -#define NV40TCL_TEX_FORMAT_FORMAT_A8L8 0x00001800 +#define NV40TCL_TEX_FORMAT_FORMAT_A8L8 0x00000b00 +#define NV40TCL_TEX_FORMAT_FORMAT_Z24 0x00001000 +#define NV40TCL_TEX_FORMAT_FORMAT_Z16 0x00001200 +#define NV40TCL_TEX_FORMAT_FORMAT_HILO8 0x00001800 #define NV40TCL_TEX_FORMAT_DIMS_SHIFT 4 #define NV40TCL_TEX_FORMAT_DIMS_MASK 0x000000f0 #define NV40TCL_TEX_FORMAT_DIMS_1D 0x00000010 @@ -5183,6 +5186,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define NV40TCL_TEX_SWIZZLE_S1_W_X 0x00000003 #define NV40TCL_TEX_FILTER(x) (0x00001a14+((x)*32)) #define NV40TCL_TEX_FILTER__SIZE 0x00000010 +#define NV40TCL_TEX_FILTER_SIGNED_ALPHA (1 << 31) +#define NV40TCL_TEX_FILTER_SIGNED_RED (1 << 30) +#define NV40TCL_TEX_FILTER_SIGNED_GREEN (1 << 29) +#define NV40TCL_TEX_FILTER_SIGNED_BLUE (1 << 28) #define NV40TCL_TEX_FILTER_MIN_SHIFT 16 #define NV40TCL_TEX_FILTER_MIN_MASK 0x000f0000 #define NV40TCL_TEX_FILTER_MIN_NEAREST 0x00010000 @@ -5333,6 +5340,24 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define NV50_2D_BLIT_DST_H 0x000008bc #define NV50_2D_BLIT_SRC_X 0x000008d4 #define NV50_2D_BLIT_SRC_Y 0x000008dc +#define NV50_2D_SIFC_UNK0800 0x00000800 +#define NV50_2D_SIFC_FORMAT 0x00000804 +#define NV50_2D_SIFC_FORMAT_32BPP 0x000000cf +#define NV50_2D_SIFC_FORMAT_24BPP 0x000000e6 +#define NV50_2D_SIFC_FORMAT_16BPP 0x000000e8 +#define NV50_2D_SIFC_FORMAT_8BPP 0x000000f3 +#define NV50_2D_SIFC_FORMAT_15BPP 0x000000f8 +#define NV50_2D_SIFC_WIDTH 0x00000838 +#define NV50_2D_SIFC_HEIGHT 0x0000083c +#define NV50_2D_SIFC_SCALE_UNK0840 0x00000840 +#define NV50_2D_SIFC_SCALE_UNK0844 0x00000844 +#define NV50_2D_SIFC_SCALE_UNK0848 0x00000848 +#define NV50_2D_SIFC_SCALE_UNK084C 0x0000084c +#define NV50_2D_SIFC_UNK0850 0x00000850 +#define NV50_2D_SIFC_DST_X 0x00000854 +#define NV50_2D_SIFC_UNK0858 0x00000858 +#define NV50_2D_SIFC_DST_Y 0x0000085c +#define NV50_2D_SIFC_DATA 0x00000860 #define NV50_MEMORY_TO_MEMORY_FORMAT 0x00005039 diff --git a/src/mesa/pipe/nv40/nv40_state_tex.c b/src/mesa/pipe/nv40/nv40_state_tex.c index f54a65c780..f2303e34db 100644 --- a/src/mesa/pipe/nv40/nv40_state_tex.c +++ b/src/mesa/pipe/nv40/nv40_state_tex.c @@ -11,10 +11,6 @@ NV40TCL_TEX_SWIZZLE_S1_Z_##ts1z | NV40TCL_TEX_SWIZZLE_S1_W_##ts1w), \ } -#define NV40TCL_TEX_FORMAT_FORMAT_Z16 0x1200 -#define NV40TCL_TEX_FORMAT_FORMAT_Z24 0x1000 -#define NV40TCL_TEX_FORMAT_FORMAT_A8L8_2 0x0b00 - struct nv40_texture_format { boolean defined; uint pipe; @@ -31,7 +27,7 @@ nv40_texture_formats[] = { _(U_L8 , L8 , S1, S1, S1, ONE, X, X, X, X), _(U_A8 , L8 , ZERO, ZERO, ZERO, S1, X, X, X, X), _(U_I8 , L8 , S1, S1, S1, S1, X, X, X, X), - _(U_A8_L8 , A8L8_2 , S1, S1, S1, S1, X, X, X, Y), + _(U_A8_L8 , A8L8 , S1, S1, S1, S1, X, X, X, Y), _(Z16_UNORM , Z16 , S1, S1, S1, ONE, X, X, X, X), _(Z24S8_UNORM , Z24 , S1, S1, S1, ONE, X, X, X, X), // _(RGB_DXT1 , 0x86, S1, S1, S1, ONE, X, Y, Z, W, 0x00, 0x00), |