gallium/draw: use correct rasterization state for wide/AA points/lines

[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 fca078b174a4f1d3178bee90e9869a21214ffcb3..031cc12814266583b7ae35dd099b9e2c6625ce7a 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_context.c
+++ b/src/gallium/drivers/nv50/nv50_context.c
@@ -22,7 +22,6 @@
 
 #include "draw/draw_context.h"
 #include "pipe/p_defines.h"
-#include "pipe/internal/p_winsys_screen.h"
 
 #include "nv50_context.h"
 #include "nv50_screen.h"
@@ -33,13 +32,11 @@ nv50_flush(struct pipe_context *pipe, unsigned flags,
 {
        struct nv50_context *nv50 = nv50_context(pipe);
        struct nouveau_channel *chan = nv50->screen->base.channel;
-       struct nouveau_grobj *eng2d = nv50->screen->eng2d;
 
-       /* We need this in the ddx for reliable composite, not sure what we're
-        * actually flushing. We generate all our own flushes with flags = 0. */
-       WAIT_RING(chan, 2);
-       BEGIN_RING(chan, eng2d, 0x0110, 1);
-       OUT_RING  (chan, 0);
+       if (flags & PIPE_FLUSH_TEXTURE_CACHE) {
+               BEGIN_RING(chan, nv50->screen->tesla, 0x1338, 1);
+               OUT_RING  (chan, 0x20);
+       }
 
        if (flags & PIPE_FLUSH_FRAME)
                FIRE_RING(chan);
@@ -50,41 +47,54 @@ nv50_destroy(struct pipe_context *pipe)
 {
        struct nv50_context *nv50 = nv50_context(pipe);
 
-       draw_destroy(nv50->draw);
-       FREE(nv50);
-}
-
+        if (nv50->state.fb)
+               so_ref(NULL, &nv50->state.fb);
+       if (nv50->state.blend)
+               so_ref(NULL, &nv50->state.blend);
+       if (nv50->state.blend_colour)
+               so_ref(NULL, &nv50->state.blend_colour);
+       if (nv50->state.zsa)
+               so_ref(NULL, &nv50->state.zsa);
+       if (nv50->state.rast)
+               so_ref(NULL, &nv50->state.rast);
+       if (nv50->state.stipple)
+               so_ref(NULL, &nv50->state.stipple);
+       if (nv50->state.scissor)
+               so_ref(NULL, &nv50->state.scissor);
+       if (nv50->state.viewport)
+               so_ref(NULL, &nv50->state.viewport);
+       if (nv50->state.tsc_upload)
+               so_ref(NULL, &nv50->state.tsc_upload);
+       if (nv50->state.tic_upload)
+               so_ref(NULL, &nv50->state.tic_upload);
+       if (nv50->state.vertprog)
+               so_ref(NULL, &nv50->state.vertprog);
+       if (nv50->state.fragprog)
+               so_ref(NULL, &nv50->state.fragprog);
+       if (nv50->state.geomprog)
+               so_ref(NULL, &nv50->state.geomprog);
+       if (nv50->state.fp_linkage)
+               so_ref(NULL, &nv50->state.fp_linkage);
+       if (nv50->state.gp_linkage)
+               so_ref(NULL, &nv50->state.gp_linkage);
+       if (nv50->state.vtxfmt)
+               so_ref(NULL, &nv50->state.vtxfmt);
+       if (nv50->state.vtxbuf)
+               so_ref(NULL, &nv50->state.vtxbuf);
+       if (nv50->state.vtxattr)
+               so_ref(NULL, &nv50->state.vtxattr);
 
-static void
-nv50_set_edgeflags(struct pipe_context *pipe, const unsigned *bitfield)
-{
-}
+       draw_destroy(nv50->draw);
 
-static unsigned int
-nv50_is_texture_referenced( struct pipe_context *pipe,
-                           struct pipe_texture *texture,
-                           unsigned face, unsigned level)
-{
-   /**
-    * FIXME: Optimize.
-    */
+       if (nv50->screen->cur_ctx == nv50)
+               nv50->screen->cur_ctx = NULL;
 
-   return PIPE_REFERENCED_FOR_READ | PIPE_REFERENCED_FOR_WRITE;
+       FREE(nv50);
 }
 
-static unsigned int
-nv50_is_buffer_referenced( struct pipe_context *pipe,
-                          struct pipe_buffer *buf)
-{
-   /**
-    * FIXME: Optimize.
-    */
-
-   return PIPE_REFERENCED_FOR_READ | PIPE_REFERENCED_FOR_WRITE;
-}
 
 struct pipe_context *
-nv50_create(struct pipe_screen *pscreen, unsigned pctx_id)
+nv50_create(struct pipe_screen *pscreen, void *priv)
 {
        struct pipe_winsys *pipe_winsys = pscreen->winsys;
        struct nv50_screen *screen = nv50_screen(pscreen);
@@ -94,22 +104,23 @@ nv50_create(struct pipe_screen *pscreen, unsigned pctx_id)
        if (!nv50)
                return NULL;
        nv50->screen = screen;
-       nv50->pctx_id = pctx_id;
 
        nv50->pipe.winsys = pipe_winsys;
        nv50->pipe.screen = pscreen;
+       nv50->pipe.priv = priv;
 
        nv50->pipe.destroy = nv50_destroy;
 
-       nv50->pipe.set_edgeflags = nv50_set_edgeflags;
        nv50->pipe.draw_arrays = nv50_draw_arrays;
+       nv50->pipe.draw_arrays_instanced = nv50_draw_arrays_instanced;
        nv50->pipe.draw_elements = nv50_draw_elements;
+       nv50->pipe.draw_elements_instanced = nv50_draw_elements_instanced;
        nv50->pipe.clear = nv50_clear;
 
        nv50->pipe.flush = nv50_flush;
 
-       nv50->pipe.is_texture_referenced = nv50_is_texture_referenced;
-       nv50->pipe.is_buffer_referenced = nv50_is_buffer_referenced;
+       nv50->pipe.is_texture_referenced = nouveau_is_texture_referenced;
+       nv50->pipe.is_buffer_referenced = nouveau_is_buffer_referenced;
 
        screen->base.channel->user_private = nv50;
        screen->base.channel->flush_notify = nv50_state_flush_notify;
@@ -118,7 +129,7 @@ nv50_create(struct pipe_screen *pscreen, unsigned pctx_id)
        nv50_init_state_functions(nv50);
        nv50_init_query_functions(nv50);
 
-       nv50->draw = draw_create();
+       nv50->draw = draw_create(&nv50->pipe);
        assert(nv50->draw);
        draw_set_rasterize_stage(nv50->draw, nv50_draw_render_stage(nv50));