fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 11:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nv10: fixes.

Browse source
This commit is contained in:
Stephane Marchesin 2008-03-17 03:32:07 +01:00
parent b2f01b0777
commit 5c15b1276e
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/drivers/nv10/nv10_context.h
View file

@ -47,11 +47,12 @@ struct nv10_context {
uint32_t rt_enable;
struct pipe_buffer *rt[4];
struct pipe_buffer *zeta;
uint32_t lma_offset;
struct {
struct pipe_buffer *buffer;
uint32_t format;
} tex[16];
} tex[2];
unsigned vb_enable;
struct {

10
src/gallium/drivers/nv10/nv10_state_emit.c
View file

@ -49,21 +49,21 @@ nv10_emit_hw_state(struct nv10_context *nv10)
OUT_RELOCl(nv10->zeta, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
/* XXX for when we allocate LMA on nv17 */
/* BEGIN_RING(celsius, NV10TCL_LMA_DEPTH_OFFSET, 1);
OUT_RELOCl(nv10->zeta+...);*/
OUT_RELOCl(nv10->zeta+lma_offset);*/
}
/* Texture images */
for (i = 0; i < 2; i++) {
if (!(nv10->fp_samplers & (1 << i)))
continue;
BEGIN_RING(celsius, NV10TCL_TX_OFFSET(i), 2);
BEGIN_RING(celsius, NV10TCL_TX_OFFSET(i), 1);
OUT_RELOCl(nv10->tex[i].buffer, 0, NOUVEAU_BO_VRAM |
NOUVEAU_BO_GART | NOUVEAU_BO_RD);
// XXX
/* OUT_RELOCd(nv10->tex[i].buffer, nv10->tex[i].format,
BEGIN_RING(celsius, NV10TCL_TX_FORMAT(i), 1);
OUT_RELOCd(nv10->tex[i].buffer, nv10->tex[i].format,
NOUVEAU_BO_VRAM | NOUVEAU_BO_GART | NOUVEAU_BO_RD |
NOUVEAU_BO_OR, NV10TCL_TX_FORMAT_DMA0,
NV10TCL_TX_FORMAT_DMA1);*/
NV10TCL_TX_FORMAT_DMA1);
}
}