gallium: Keep only pipe_context::draw_vbo.

[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 fc3cbdb558f5aa2f51f096b109bd74928d4217c7..7218abff22ddf8f1da5381899bba5e03db3dde75 100644 (file)
--- a/src/gallium/drivers/nvfx/nvfx_context.c
+++ b/src/gallium/drivers/nvfx/nvfx_context.c
@@ -3,6 +3,7 @@
 
 #include "nvfx_context.h"
 #include "nvfx_screen.h"
+#include "nvfx_resource.h"
 
 static void
 nvfx_flush(struct pipe_context *pipe, unsigned flags,
@@ -29,12 +30,6 @@ 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->draw)
                draw_destroy(nvfx->draw);
@@ -60,31 +55,29 @@ 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;
 
-       nvfx->pipe.is_texture_referenced = nouveau_is_texture_referenced;
-       nvfx->pipe.is_buffer_referenced = nouveau_is_buffer_referenced;
-
        screen->base.channel->user_private = nvfx;
-       screen->base.channel->flush_notify = nvfx_state_flush_notify;
 
        nvfx->is_nv4x = screen->is_nv4x;
 
        nvfx_init_query_functions(nvfx);
        nvfx_init_surface_functions(nvfx);
        nvfx_init_state_functions(nvfx);
-       nvfx_init_transfer_functions(nvfx);
+       nvfx_init_resource_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->state.stipple_enabled = ~0;
        return &nvfx->pipe;
 }