Merge branch 'mesa_7_6_branch'

[mesa.git] / src / gallium / drivers / nv50 / nv50_screen.c

diff --git a/src/gallium/drivers/nv50/nv50_screen.c b/src/gallium/drivers/nv50/nv50_screen.c
index bdd449db65505b2c4fa3d6569a44aee430f9bd1d..3b08e1b89fbb1ed0f43f3b0b97296fb5f1787aa7 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_screen.c
+++ b/src/gallium/drivers/nv50/nv50_screen.c
@@ -44,9 +44,10 @@ nv50_screen_is_format_supported(struct pipe_screen *pscreen,
        } else
        if (tex_usage & PIPE_TEXTURE_USAGE_DEPTH_STENCIL) {
                switch (format) {
+               case PIPE_FORMAT_Z32_FLOAT:
                case PIPE_FORMAT_Z24S8_UNORM:
-               case PIPE_FORMAT_Z24X8_UNORM:
-               case PIPE_FORMAT_Z16_UNORM:
+               case PIPE_FORMAT_X8Z24_UNORM:
+               case PIPE_FORMAT_S8Z24_UNORM:
                        return TRUE;
                default:
                        break;
@@ -86,12 +87,10 @@ nv50_screen_get_param(struct pipe_screen *pscreen, int param)
                return 1;
        case PIPE_CAP_GLSL:
                return 0;
-       case PIPE_CAP_S3TC:
-               return 1;
        case PIPE_CAP_ANISOTROPIC_FILTER:
                return 1;
        case PIPE_CAP_POINT_SPRITE:
-               return 0;
+               return 1;
        case PIPE_CAP_MAX_RENDER_TARGETS:
                return 8;
        case PIPE_CAP_OCCLUSION_QUERY:
@@ -111,6 +110,8 @@ nv50_screen_get_param(struct pipe_screen *pscreen, int param)
                return 0;
        case PIPE_CAP_TGSI_CONT_SUPPORTED:
                return 0;
+       case PIPE_CAP_BLEND_EQUATION_SEPARATE:
+               return 1;
        case NOUVEAU_CAP_HW_VTXBUF:
                return 1;
        case NOUVEAU_CAP_HW_IDXBUF:
@@ -186,7 +187,8 @@ nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev)
        nv50_transfer_init_screen_functions(pscreen);
 
        /* DMA engine object */
-       ret = nouveau_grobj_alloc(chan, 0xbeef5039, 0x5039, &screen->m2mf);
+       ret = nouveau_grobj_alloc(chan, 0xbeef5039,
+               NV50_MEMORY_TO_MEMORY_FORMAT, &screen->m2mf);
        if (ret) {
                NOUVEAU_ERR("Error creating M2MF object: %d\n", ret);
                nv50_screen_destroy(pscreen);
@@ -195,7 +197,7 @@ nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev)
        BIND_RING(chan, screen->m2mf, 1);
 
        /* 2D object */
-       ret = nouveau_grobj_alloc(chan, 0xbeef502d, 0x502d, &screen->eng2d);
+       ret = nouveau_grobj_alloc(chan, 0xbeef502d, NV50_2D, &screen->eng2d);
        if (ret) {
                NOUVEAU_ERR("Error creating 2D object: %d\n", ret);
                nv50_screen_destroy(pscreen);
@@ -206,14 +208,15 @@ nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev)
        /* 3D object */
        switch (chipset & 0xf0) {
        case 0x50:
-               tesla_class = 0x5097;
+               tesla_class = NV50TCL;
                break;
        case 0x80:
        case 0x90:
-               tesla_class = 0x8297;
+               /* this stupid name should be corrected. */
+               tesla_class = NV54TCL;
                break;
        case 0xa0:
-               tesla_class = 0x8397;
+               tesla_class = NVA0TCL;
                break;
        default:
                NOUVEAU_ERR("Not a known NV50 chipset: NV%02x\n", chipset);
@@ -227,7 +230,8 @@ nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev)
                return NULL;
        }
 
-       ret = nouveau_grobj_alloc(chan, 0xbeef5097, tesla_class, &screen->tesla);
+       ret = nouveau_grobj_alloc(chan, 0xbeef5097, tesla_class,
+               &screen->tesla);
        if (ret) {
                NOUVEAU_ERR("Error creating 3D object: %d\n", ret);
                nv50_screen_destroy(pscreen);
@@ -245,7 +249,7 @@ nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev)
 
        /* Static M2MF init */
        so = so_new(32, 0);
-       so_method(so, screen->m2mf, 0x0180, 3);
+       so_method(so, screen->m2mf, NV04_MEMORY_TO_MEMORY_FORMAT_DMA_NOTIFY, 3);
        so_data  (so, screen->sync->handle);
        so_data  (so, chan->vram->handle);
        so_data  (so, chan->vram->handle);
@@ -288,9 +292,10 @@ nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev)
 
        so_method(so, screen->tesla, 0x13bc, 1);
        so_data  (so, 0x54);
+       /* origin is top left (set to 1 for bottom left) */
        so_method(so, screen->tesla, 0x13ac, 1);
-       so_data  (so, 1);
-       so_method(so, screen->tesla, 0x16b8, 1);
+       so_data  (so, 0);
+       so_method(so, screen->tesla, NV50TCL_VP_REG_ALLOC_RESULT, 1);
        so_data  (so, 8);
 
        /* constant buffers for immediates and VP/FP parameters */
@@ -328,33 +333,33 @@ nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev)
        so_data  (so, 0x000BBNP1);
        */
 
-       so_method(so, screen->tesla, 0x1280, 3);
+       so_method(so, screen->tesla, NV50TCL_CB_DEF_ADDRESS_HIGH, 3);
        so_reloc (so, screen->constbuf_misc[0], 0, NOUVEAU_BO_VRAM |
                  NOUVEAU_BO_RD | NOUVEAU_BO_HIGH, 0, 0);
        so_reloc (so, screen->constbuf_misc[0], 0, NOUVEAU_BO_VRAM |
                  NOUVEAU_BO_RD | NOUVEAU_BO_LOW, 0, 0);
        so_data  (so, (NV50_CB_PMISC << 16) | 0x00000800);
-       so_method(so, screen->tesla, 0x1694, 1);
+       so_method(so, screen->tesla, NV50TCL_SET_PROGRAM_CB, 1);
        so_data  (so, 0x00000001 | (NV50_CB_PMISC << 12));
-       so_method(so, screen->tesla, 0x1694, 1);
+       so_method(so, screen->tesla, NV50TCL_SET_PROGRAM_CB, 1);
        so_data  (so, 0x00000031 | (NV50_CB_PMISC << 12));
 
-       so_method(so, screen->tesla, 0x1280, 3);
+       so_method(so, screen->tesla, NV50TCL_CB_DEF_ADDRESS_HIGH, 3);
        so_reloc (so, screen->constbuf_parm[0], 0, NOUVEAU_BO_VRAM |
                  NOUVEAU_BO_RD | NOUVEAU_BO_HIGH, 0, 0);
        so_reloc (so, screen->constbuf_parm[0], 0, NOUVEAU_BO_VRAM |
                  NOUVEAU_BO_RD | NOUVEAU_BO_LOW, 0, 0);
        so_data  (so, (NV50_CB_PVP << 16) | 0x00000800);
-       so_method(so, screen->tesla, 0x1694, 1);
+       so_method(so, screen->tesla, NV50TCL_SET_PROGRAM_CB, 1);
        so_data  (so, 0x00000101 | (NV50_CB_PVP << 12));
 
-       so_method(so, screen->tesla, 0x1280, 3);
+       so_method(so, screen->tesla, NV50TCL_CB_DEF_ADDRESS_HIGH, 3);
        so_reloc (so, screen->constbuf_parm[1], 0, NOUVEAU_BO_VRAM |
                  NOUVEAU_BO_RD | NOUVEAU_BO_HIGH, 0, 0);
        so_reloc (so, screen->constbuf_parm[1], 0, NOUVEAU_BO_VRAM |
                  NOUVEAU_BO_RD | NOUVEAU_BO_LOW, 0, 0);
        so_data  (so, (NV50_CB_PFP << 16) | 0x00000800);
-       so_method(so, screen->tesla, 0x1694, 1);
+       so_method(so, screen->tesla, NV50TCL_SET_PROGRAM_CB, 1);
        so_data  (so, 0x00000131 | (NV50_CB_PFP << 12));
 
        /* Texture sampler/image unit setup - we abuse the constant buffer
@@ -368,13 +373,13 @@ nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev)
                return NULL;
        }
 
-       so_method(so, screen->tesla, 0x1280, 3);
+       so_method(so, screen->tesla, NV50TCL_CB_DEF_ADDRESS_HIGH, 3);
        so_reloc (so, screen->tic, 0, NOUVEAU_BO_VRAM |
                  NOUVEAU_BO_RD | NOUVEAU_BO_HIGH, 0, 0);
        so_reloc (so, screen->tic, 0, NOUVEAU_BO_VRAM |
                  NOUVEAU_BO_RD | NOUVEAU_BO_LOW, 0, 0);
        so_data  (so, (NV50_CB_TIC << 16) | 0x0800);
-       so_method(so, screen->tesla, 0x1574, 3);
+       so_method(so, screen->tesla, NV50TCL_TIC_ADDRESS_HIGH, 3);
        so_reloc (so, screen->tic, 0, NOUVEAU_BO_VRAM |
                  NOUVEAU_BO_RD | NOUVEAU_BO_HIGH, 0, 0);
        so_reloc (so, screen->tic, 0, NOUVEAU_BO_VRAM |
@@ -387,13 +392,13 @@ nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev)
                return NULL;
        }
 
-       so_method(so, screen->tesla, 0x1280, 3);
+       so_method(so, screen->tesla, NV50TCL_CB_DEF_ADDRESS_HIGH, 3);
        so_reloc (so, screen->tsc, 0, NOUVEAU_BO_VRAM |
                  NOUVEAU_BO_RD | NOUVEAU_BO_HIGH, 0, 0);
        so_reloc (so, screen->tsc, 0, NOUVEAU_BO_VRAM |
                  NOUVEAU_BO_RD | NOUVEAU_BO_LOW, 0, 0);
        so_data  (so, (NV50_CB_TSC << 16) | 0x0800);
-       so_method(so, screen->tesla, 0x155c, 3);
+       so_method(so, screen->tesla, NV50TCL_TSC_ADDRESS_HIGH, 3);
        so_reloc (so, screen->tsc, 0, NOUVEAU_BO_VRAM |
                  NOUVEAU_BO_RD | NOUVEAU_BO_HIGH, 0, 0);
        so_reloc (so, screen->tsc, 0, NOUVEAU_BO_VRAM |
@@ -403,7 +408,7 @@ nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev)
 
        /* Vertex array limits - max them out */
        for (i = 0; i < 16; i++) {
-               so_method(so, screen->tesla, 0x1080 + (i * 8), 2);
+               so_method(so, screen->tesla, NV50TCL_UNK1080_OFFSET_HIGH(i), 2);
                so_data  (so, 0x000000ff);
                so_data  (so, 0xffffffff);
        }
@@ -415,6 +420,10 @@ nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev)
        so_method(so, screen->tesla, 0x1234, 1);
        so_data  (so, 1);
 
+       /* activate first scissor rectangle */
+       so_method(so, screen->tesla, NV50TCL_SCISSOR_ENABLE, 1);
+       so_data  (so, 1);
+
        so_emit(chan, so);
        so_ref (so, &screen->static_init);
        so_ref (NULL, &so);