diff options
| author | Stephane Marchesin <[email protected]> | 2008-02-15 04:23:46 +0100 |
|---|---|---|
| committer | Stephane Marchesin <[email protected]> | 2008-02-15 04:23:46 +0100 |
| commit | 0a653bef05fb3627fdd1857bfa8c3a1ebe08a4b7 (patch) | |
| tree | b8b662e9d33f7986391902f6674b9fb82416587c /src/mesa/pipe/nv30 | |
| parent | 01fccea190cf07b41a675e95d82af8ab5228b176 (diff) | |
nouveau: more nv30 fixes, still doesn't work as well as before.
Diffstat (limited to 'src/mesa/pipe/nv30')
| -rw-r--r-- | src/mesa/pipe/nv30/nv30_context.c | 2 | ||||
| -rw-r--r-- | src/mesa/pipe/nv30/nv30_state.c | 8 | ||||
| -rw-r--r-- | src/mesa/pipe/nv30/nv30_vbo.c | 8 |
3 files changed, 8 insertions, 10 deletions
diff --git a/src/mesa/pipe/nv30/nv30_context.c b/src/mesa/pipe/nv30/nv30_context.c index eef49fbcc2b..d12aab85d8c 100644 --- a/src/mesa/pipe/nv30/nv30_context.c +++ b/src/mesa/pipe/nv30/nv30_context.c @@ -71,6 +71,8 @@ nv30_get_paramf(struct pipe_context *pipe, int param) return 16.0; case PIPE_CAP_MAX_TEXTURE_LOD_BIAS: return 4.0; + case PIPE_CAP_BITMAP_TEXCOORD_BIAS: + return 0.0; default: NOUVEAU_ERR("Unknown PIPE_CAP %d\n", param); return 0.0; diff --git a/src/mesa/pipe/nv30/nv30_state.c b/src/mesa/pipe/nv30/nv30_state.c index abc22eacae9..992afe033e9 100644 --- a/src/mesa/pipe/nv30/nv30_state.c +++ b/src/mesa/pipe/nv30/nv30_state.c @@ -614,12 +614,8 @@ nv30_set_framebuffer_state(struct pipe_context *pipe, nv30->rt[1] = rt[1]->buffer; } - if (zeta_format) { - /* XXX allocate LMA */ -/* BEGIN_RING(rankine, NV34TCL_LMA_DEPTH_OFFSET, 1); - OUT_RING(0);*/ - BEGIN_RING(rankine, NV34TCL_ZETA_PITCH, 1); - OUT_RING (zeta->pitch * zeta->cpp); + if (zeta_format) + { nv30->zeta = zeta->buffer; } diff --git a/src/mesa/pipe/nv30/nv30_vbo.c b/src/mesa/pipe/nv30/nv30_vbo.c index e6c50d3820c..173a6e8fd7b 100644 --- a/src/mesa/pipe/nv30/nv30_vbo.c +++ b/src/mesa/pipe/nv30/nv30_vbo.c @@ -241,9 +241,9 @@ nv30_draw_elements_u08(struct nv30_context *nv30, void *ib, } while (count) { - push = MIN2(count, 2046); + push = MIN2(count, 2047 * 2); - BEGIN_RING_NI(rankine, NV40TCL_VB_ELEMENT_U16, push); + BEGIN_RING_NI(rankine, NV40TCL_VB_ELEMENT_U16, push >> 1); for (i = 0; i < push; i+=2) OUT_RING((elts[i+1] << 16) | elts[i]); @@ -266,9 +266,9 @@ nv30_draw_elements_u16(struct nv30_context *nv30, void *ib, } while (count) { - push = MIN2(count, 2046); + push = MIN2(count, 2047 * 2); - BEGIN_RING_NI(rankine, NV34TCL_VB_ELEMENT_U16, push); + BEGIN_RING_NI(rankine, NV34TCL_VB_ELEMENT_U16, push >> 1); for (i = 0; i < push; i+=2) OUT_RING((elts[i+1] << 16) | elts[i]); |