svga: define svga_clear() in svga_init_clear_functions()

Put all the clearing related functions in svga_init_clear_functions()

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Charmaine Lee <charmainel@vmware.com>

diff --git a/src/gallium/drivers/svga/svga_context.c b/src/gallium/drivers/svga/svga_context.c
index 04acc0022bf42e34cdb0df5e78385499d80da4ef..d422aec051e4b56764cdee659da3044ff98c8340 100644 (file)
--- a/src/gallium/drivers/svga/svga_context.c
+++ b/src/gallium/drivers/svga/svga_context.c
@@ -141,7 +141,6 @@ struct pipe_context *svga_context_create(struct pipe_screen *screen,
    svga->pipe.screen = screen;
    svga->pipe.priv = priv;
    svga->pipe.destroy = svga_destroy;
-   svga->pipe.clear = svga_clear;
 
    svga->swc = svgascreen->sws->context_create(svgascreen->sws);
    if (!svga->swc)

diff --git a/src/gallium/drivers/svga/svga_context.h b/src/gallium/drivers/svga/svga_context.h
index 300c74143e59fc6c60fb68a1edb71c2551b9803a..8ed612d11907c8561a0712d4d883ceee80ea0dfe 100644 (file)
--- a/src/gallium/drivers/svga/svga_context.h
+++ b/src/gallium/drivers/svga/svga_context.h
@@ -608,15 +608,6 @@ struct svga_context
 
 
 
-/***********************************************************************
- * svga_clear.c: 
- */
-void svga_clear(struct pipe_context *pipe, 
-                unsigned buffers,
-                const union pipe_color_union *color,
-                double depth,
-                unsigned stencil);
-
 
 /***********************************************************************
  * svga_screen_texture.c: 

diff --git a/src/gallium/drivers/svga/svga_pipe_clear.c b/src/gallium/drivers/svga/svga_pipe_clear.c
index 174d02c152a7de8eda2cf44cbf8030bb43fd7e8a..12f3050f56988a7f5dfe5fa842447dce3a5f2381 100644 (file)
--- a/src/gallium/drivers/svga/svga_pipe_clear.c
+++ b/src/gallium/drivers/svga/svga_pipe_clear.c
@@ -228,7 +228,7 @@ try_clear(struct svga_context *svga,
  * Clear the given surface to the specified value.
  * No masking, no scissor (clear entire buffer).
  */
-void
+static void
 svga_clear(struct pipe_context *pipe, unsigned buffers,
            const union pipe_color_union *color,
           double depth, unsigned stencil)
@@ -455,4 +455,5 @@ svga_clear_texture(struct pipe_context *pipe,
 void svga_init_clear_functions(struct svga_context *svga)
 {
    svga->pipe.clear_texture = svga_clear_texture;
+   svga->pipe.clear = svga_clear;
 }