Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1

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

diff --git a/src/gallium/drivers/nv50/nv50_context.c b/src/gallium/drivers/nv50/nv50_context.c
index c937b8de6d44901c991afcfc13ee3e5650a7ae89..07987c7d02d8bb8a36f77d55d44ec72ae2d1a5a6 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_context.c
+++ b/src/gallium/drivers/nv50/nv50_context.c
@@ -1,3 +1,25 @@
+/*
+ * Copyright 2008 Ben Skeggs
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 #include "draw/draw_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_winsys.h"
@@ -7,23 +29,12 @@
 #include "nv50_screen.h"
 
 static void
-nv50_flush(struct pipe_context *pipe, unsigned flags)
+nv50_flush(struct pipe_context *pipe, unsigned flags,
+          struct pipe_fence_handle **fence)
 {
        struct nv50_context *nv50 = (struct nv50_context *)pipe;
-       struct nouveau_winsys *nvws = nv50->nvws;
        
-       if (flags & PIPE_FLUSH_WAIT) {
-               nvws->notifier_reset(nv50->sync, 0);
-               BEGIN_RING(tesla, 0x104, 1);
-               OUT_RING  (0);
-               BEGIN_RING(tesla, 0x100, 1);
-               OUT_RING  (0);
-       }
-
-       FIRE_RING();
-
-       if (flags & PIPE_FLUSH_WAIT)
-               nvws->notifier_wait(nv50->sync, 0, 0, 2000);
+       FIRE_RING(fence);
 }
 
 static void
@@ -32,82 +43,40 @@ nv50_destroy(struct pipe_context *pipe)
        struct nv50_context *nv50 = (struct nv50_context *)pipe;
 
        draw_destroy(nv50->draw);
-       free(nv50);
+       FREE(nv50);
 }
 
-static boolean
-nv50_init_hwctx(struct nv50_context *nv50, int tesla_class)
-{
-       struct nouveau_winsys *nvws = nv50->nvws;
-       int ret;
-
-       if ((ret = nvws->grobj_alloc(nvws, tesla_class, &nv50->tesla))) {
-               NOUVEAU_ERR("Error creating 3D object: %d\n", ret);
-               return FALSE;
-       }
-
-       BEGIN_RING(tesla, NV50TCL_DMA_NOTIFY, 1);
-       OUT_RING  (nv50->sync->handle);
 
-       FIRE_RING ();
-       return TRUE;
+static void
+nv50_set_edgeflags(struct pipe_context *pipe, const unsigned *bitfield)
+{
 }
 
-#define GRCLASS5097_CHIPSETS 0x00000000
-#define GRCLASS8297_CHIPSETS 0x00000010
 struct pipe_context *
 nv50_create(struct pipe_screen *pscreen, unsigned pctx_id)
 {
        struct pipe_winsys *pipe_winsys = pscreen->winsys;
-       struct nouveau_winsys *nvws = nv50_screen(pscreen)->nvws;
-       unsigned chipset = nv50_screen(pscreen)->chipset;
+       struct nv50_screen *screen = nv50_screen(pscreen);
        struct nv50_context *nv50;
-       int tesla_class, ret;
-
-       if ((chipset & 0xf0) != 0x50 && (chipset & 0xf0) != 0x80) {
-               NOUVEAU_ERR("Not a G8x chipset\n");
-               return NULL;
-       }
-
-       if (GRCLASS5097_CHIPSETS & (1 << (chipset & 0x0f))) {
-               tesla_class = 0x5097;
-       } else
-       if (GRCLASS8297_CHIPSETS & (1 << (chipset & 0x0f))) {
-               tesla_class = 0x8297;
-       } else {
-               NOUVEAU_ERR("Unknown G8x chipset: NV%02x\n", chipset);
-               return NULL;
-       }
 
        nv50 = CALLOC_STRUCT(nv50_context);
        if (!nv50)
                return NULL;
-       nv50->chipset = chipset;
-       nv50->nvws = nvws;
-
-       if ((ret = nvws->notifier_alloc(nvws, 1, &nv50->sync))) {
-               NOUVEAU_ERR("Error creating notifier object: %d\n", ret);
-               free(nv50);
-               return NULL;
-       }
-
-       if (!nv50_init_hwctx(nv50, tesla_class)) {
-               free(nv50);
-               return NULL;
-       }
+       nv50->screen = screen;
+       nv50->pctx_id = pctx_id;
 
        nv50->pipe.winsys = pipe_winsys;
        nv50->pipe.screen = pscreen;
 
        nv50->pipe.destroy = nv50_destroy;
 
+       nv50->pipe.set_edgeflags = nv50_set_edgeflags;
        nv50->pipe.draw_arrays = nv50_draw_arrays;
        nv50->pipe.draw_elements = nv50_draw_elements;
        nv50->pipe.clear = nv50_clear;
 
        nv50->pipe.flush = nv50_flush;
 
-       nv50_init_miptree_functions(nv50);
        nv50_init_surface_functions(nv50);
        nv50_init_state_functions(nv50);
        nv50_init_query_functions(nv50);