nvfx: move stuff around

[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 1faa0af31fb7c4ca961d81b2e5b79817f650297e..99ad7bfacf79c0263201793e73f4fc42e6971eb9 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);
@@ -31,6 +33,13 @@ nvfx_destroy(struct pipe_context *pipe)
 {
        struct nvfx_context *nvfx = nvfx_context(pipe);
 
+       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);
        FREE(nvfx);
@@ -55,8 +64,7 @@ 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;
 
@@ -67,10 +75,15 @@ nvfx_create(struct pipe_screen *pscreen, void *priv)
        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);
@@ -79,6 +92,11 @@ nvfx_create(struct pipe_screen *pscreen, void *priv)
 
        /* set these to that we init them on first validation */
        nvfx->state.scissor_enabled = ~0;
-       nvfx->state.stipple_enabled = ~0;
+       nvfx->hw_pointsprite_control = -1;
+       nvfx->hw_vp_output = -1;
+       nvfx->use_vertex_buffers = -1;
+
+       LIST_INITHEAD(&nvfx->render_cache);
+
        return &nvfx->pipe;
 }