From 2111795d51aa63c46019327d222efb66ded9348e Mon Sep 17 00:00:00 2001 From: Neha Bhende Date: Thu, 11 Aug 2016 16:53:04 -0700 Subject: [PATCH] svga: define svga_clear() in svga_init_clear_functions() Put all the clearing related functions in svga_init_clear_functions() Reviewed-by: Brian Paul Reviewed-by: Charmaine Lee --- src/gallium/drivers/svga/svga_context.c | 1 - src/gallium/drivers/svga/svga_context.h | 9 --------- src/gallium/drivers/svga/svga_pipe_clear.c | 3 ++- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/gallium/drivers/svga/svga_context.c b/src/gallium/drivers/svga/svga_context.c index 04acc0022bf..d422aec051e 100644 --- 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 300c74143e5..8ed612d1190 100644 --- 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 174d02c152a..12f3050f569 100644 --- 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; } -- 2.30.2