From bc8b62e3a07bb50727332c509115b22ae417796c Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Mon, 1 Jul 2013 21:36:48 -0700 Subject: [PATCH] i965: Move contents of intel_clear.h to intel_context.h. Having a header file for a single prototype seems rather excessive. Plus, the actual function is in brw_clear.c, not intel_clear.c, so there isn't even the .c/.h filename symmetry one might expect. Signed-off-by: Kenneth Graunke Reviewed-by: Chad Versace --- src/mesa/drivers/dri/i965/brw_clear.c | 1 - src/mesa/drivers/dri/i965/intel_clear.h | 38 ------------------------------- src/mesa/drivers/dri/i965/intel_context.c | 1 - src/mesa/drivers/dri/i965/intel_context.h | 2 ++ 4 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 src/mesa/drivers/dri/i965/intel_clear.h diff --git a/src/mesa/drivers/dri/i965/brw_clear.c b/src/mesa/drivers/dri/i965/brw_clear.c index 80b7a0c..4fa92a9 100644 --- a/src/mesa/drivers/dri/i965/brw_clear.c +++ b/src/mesa/drivers/dri/i965/brw_clear.c @@ -35,7 +35,6 @@ #include "intel_batchbuffer.h" #include "intel_context.h" #include "intel_blit.h" -#include "intel_clear.h" #include "intel_fbo.h" #include "intel_mipmap_tree.h" #include "intel_regions.h" diff --git a/src/mesa/drivers/dri/i965/intel_clear.h b/src/mesa/drivers/dri/i965/intel_clear.h deleted file mode 100644 index 7fd6b31..0000000 --- a/src/mesa/drivers/dri/i965/intel_clear.h +++ /dev/null @@ -1,38 +0,0 @@ - -/************************************************************************** - * - * Copyright 2006 Tungsten Graphics, Inc., Cedar Park, Texas. - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sub license, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial portions - * of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR - * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - **************************************************************************/ - -#ifndef INTEL_CLEAR_H -#define INTEL_CLEAR_H - -struct dd_function_table; - -extern void -intelInitClearFuncs(struct dd_function_table *functions); - - -#endif /* INTEL_CLEAR_H */ diff --git a/src/mesa/drivers/dri/i965/intel_context.c b/src/mesa/drivers/dri/i965/intel_context.c index ad30734..2604020 100644 --- a/src/mesa/drivers/dri/i965/intel_context.c +++ b/src/mesa/drivers/dri/i965/intel_context.c @@ -45,7 +45,6 @@ #include "intel_buffers.h" #include "intel_tex.h" #include "intel_batchbuffer.h" -#include "intel_clear.h" #include "intel_pixel.h" #include "intel_regions.h" #include "intel_buffer_objects.h" diff --git a/src/mesa/drivers/dri/i965/intel_context.h b/src/mesa/drivers/dri/i965/intel_context.h index 60fcfe3..ef8251d 100644 --- a/src/mesa/drivers/dri/i965/intel_context.h +++ b/src/mesa/drivers/dri/i965/intel_context.h @@ -484,6 +484,8 @@ intel_resolve_for_dri2_flush(struct intel_context *intel, extern void intelInitExtensions(struct gl_context *ctx); +extern void +intelInitClearFuncs(struct dd_function_table *functions); /*====================================================================== * Inline conversion functions. -- 2.7.4