llvmpipe: move/rename llvmpipe_init_surface_functions()

diff --git a/src/gallium/drivers/llvmpipe/lp_context.c b/src/gallium/drivers/llvmpipe/lp_context.c
index 3c223cc9efe165aa4d597921faf953a183a9d645..32b80d3a9f633576466a2686412c5bff1720eab2 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_context.c
+++ b/src/gallium/drivers/llvmpipe/lp_context.c
@@ -97,11 +97,10 @@ llvmpipe_create_context( struct pipe_screen *screen, void *priv )
    llvmpipe->pipe.winsys = screen->winsys;
    llvmpipe->pipe.screen = screen;
    llvmpipe->pipe.priv = priv;
-   llvmpipe->pipe.destroy = llvmpipe_destroy;
 
-   /* state setters */
+   /* Init the pipe context methods */
+   llvmpipe->pipe.destroy = llvmpipe_destroy;
    llvmpipe->pipe.set_framebuffer_state = llvmpipe_set_framebuffer_state;
-
    llvmpipe->pipe.clear = llvmpipe_clear;
    llvmpipe->pipe.flush = llvmpipe_flush;
 
@@ -115,6 +114,7 @@ llvmpipe_create_context( struct pipe_screen *screen, void *priv )
    llvmpipe_init_vs_funcs(llvmpipe);
    llvmpipe_init_rasterizer_funcs(llvmpipe);
    llvmpipe_init_context_resource_funcs( &llvmpipe->pipe );
+   llvmpipe_init_surface_functions(llvmpipe);
 
    /*
     * Create drawing context and plug our rendering stage into it.
@@ -147,8 +147,6 @@ llvmpipe_create_context( struct pipe_screen *screen, void *priv )
    draw_install_pstipple_stage(llvmpipe->draw, &llvmpipe->pipe);
 #endif
 
-   lp_init_surface_functions(llvmpipe);
-
    lp_reset_counters();
 
    return &llvmpipe->pipe;

diff --git a/src/gallium/drivers/llvmpipe/lp_surface.c b/src/gallium/drivers/llvmpipe/lp_surface.c
index 1432782cefa70af82584c948aa98917aa47b627a..8bd83f576f470f7c0ffec13859ba0dd910c08488 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_surface.c
+++ b/src/gallium/drivers/llvmpipe/lp_surface.c
@@ -146,7 +146,7 @@ lp_surface_copy(struct pipe_context *pipe,
 
 
 void
-lp_init_surface_functions(struct llvmpipe_context *lp)
+llvmpipe_init_surface_functions(struct llvmpipe_context *lp)
 {
    lp->pipe.surface_copy = lp_surface_copy;
    lp->pipe.surface_fill = util_surface_fill;

diff --git a/src/gallium/drivers/llvmpipe/lp_surface.h b/src/gallium/drivers/llvmpipe/lp_surface.h
index 4d78a53c4f50af115258900ce0441a0b0267961c..b1b896ebd903e0e700024abbff98bc5328fedf5d 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_surface.h
+++ b/src/gallium/drivers/llvmpipe/lp_surface.h
@@ -36,7 +36,7 @@ struct llvmpipe_context;
 
 
 extern void
-lp_init_surface_functions(struct llvmpipe_context *lp);
+llvmpipe_init_surface_functions(struct llvmpipe_context *lp);
 
 
 #endif /* LP_SURFACE_H */