Merge remote branch 'origin/master' into nv50-compiler

[mesa.git] / src / gallium / drivers / nvfx / nvfx_context.c

diff --git a/src/gallium/drivers/nvfx/nvfx_context.c b/src/gallium/drivers/nvfx/nvfx_context.c
index 61f55907e0de282587a471f3d2bec649993ae495..5a2fa14c887b773070ae1de4c8af2840b2f39d88 100644 (file)
--- a/src/gallium/drivers/nvfx/nvfx_context.c
+++ b/src/gallium/drivers/nvfx/nvfx_context.c
@@ -1,5 +1,6 @@
 #include "draw/draw_context.h"
 #include "pipe/p_defines.h"
+#include "util/u_framebuffer.h"
 
 #include "nvfx_context.h"
 #include "nvfx_screen.h"
@@ -14,6 +15,7 @@ nvfx_flush(struct pipe_context *pipe, unsigned flags,
        struct nouveau_channel *chan = screen->base.channel;
        struct nouveau_grobj *eng3d = screen->eng3d;
 
+       /* XXX: we need to actually be intelligent here */
        if (flags & PIPE_FLUSH_TEXTURE_CACHE) {
                BEGIN_RING(chan, eng3d, 0x1fd8, 1);
                OUT_RING  (chan, 2);
@@ -30,15 +32,23 @@ static void
 nvfx_destroy(struct pipe_context *pipe)
 {
        struct nvfx_context *nvfx = nvfx_context(pipe);
-       unsigned i;
 
-       for (i = 0; i < NVFX_STATE_MAX; i++) {
-               if (nvfx->state.hw[i])
-                       so_ref(NULL, &nvfx->state.hw[i]);
-       }
+       if(nvfx->dummy_fs)
+               pipe->delete_fs_state(pipe, nvfx->dummy_fs);
+
+       for(unsigned i = 0; i < nvfx->vtxbuf_nr; ++i)
+               pipe_resource_reference(&nvfx->vtxbuf[i].buffer, 0);
+       pipe_resource_reference(&nvfx->idxbuf.buffer, 0);
+       util_unreference_framebuffer_state(&nvfx->framebuffer);
+       for(unsigned i = 0; i < PIPE_MAX_SAMPLERS; ++i)
+               pipe_sampler_view_reference(&nvfx->fragment_sampler_views[i], 0);
 
        if (nvfx->draw)
                draw_destroy(nvfx->draw);
+
+       if(nvfx->screen->cur_ctx == nvfx)
+               nvfx->screen->cur_ctx = NULL;
+
        FREE(nvfx);
 }
 
@@ -61,28 +71,42 @@ nvfx_create(struct pipe_screen *pscreen, void *priv)
        nvfx->pipe.screen = pscreen;
        nvfx->pipe.priv = priv;
        nvfx->pipe.destroy = nvfx_destroy;
-       nvfx->pipe.draw_arrays = nvfx_draw_arrays;
-       nvfx->pipe.draw_elements = nvfx_draw_elements;
+       nvfx->pipe.draw_vbo = nvfx_draw_vbo;
        nvfx->pipe.clear = nvfx_clear;
        nvfx->pipe.flush = nvfx_flush;
 
-       screen->base.channel->user_private = nvfx;
-       screen->base.channel->flush_notify = nvfx_state_flush_notify;
-
        nvfx->is_nv4x = screen->is_nv4x;
+       /* TODO: it seems that nv30 might have fixed function clipping usable with vertex programs
+        * However, my code for that doesn't work, so use vp clipping for all cards, which works.
+        */
+       nvfx->use_vp_clipping = TRUE;
 
        nvfx_init_query_functions(nvfx);
        nvfx_init_surface_functions(nvfx);
        nvfx_init_state_functions(nvfx);
+       nvfx_init_sampling_functions(nvfx);
+       nvfx_init_vbo_functions(nvfx);
+       nvfx_init_fragprog_functions(nvfx);
+       nvfx_init_vertprog_functions(nvfx);
        nvfx_init_resource_functions(&nvfx->pipe);
+       nvfx_init_transfer_functions(&nvfx->pipe);
 
        /* Create, configure, and install fallback swtnl path */
-       nvfx->draw = draw_create();
+       nvfx->draw = draw_create(&nvfx->pipe);
        draw_wide_point_threshold(nvfx->draw, 9999999.0);
        draw_wide_line_threshold(nvfx->draw, 9999999.0);
        draw_enable_line_stipple(nvfx->draw, FALSE);
        draw_enable_point_sprites(nvfx->draw, FALSE);
        draw_set_rasterize_stage(nvfx->draw, nvfx_draw_render_stage(nvfx));
 
+       /* set these to that we init them on first validation */
+       nvfx->state.scissor_enabled = ~0;
+       nvfx->hw_pointsprite_control = -1;
+       nvfx->hw_vp_output = -1;
+       nvfx->use_vertex_buffers = -1;
+       nvfx->relocs_needed = NVFX_RELOCATE_ALL;
+
+       LIST_INITHEAD(&nvfx->render_cache);
+
        return &nvfx->pipe;
 }