From 7d8e70f301cf9712826b3a3cf935c0a7eceaa08b Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Mon, 1 Jul 2013 21:28:27 -0700 Subject: [PATCH] i965: Move contents of intel_extensions.h to intel_context.h. Having an entire header file for a single prototype seems a bit excessive. Signed-off-by: Kenneth Graunke Reviewed-by: Chad Versace --- src/mesa/drivers/dri/i965/intel_context.c | 1 - src/mesa/drivers/dri/i965/intel_context.h | 3 ++ src/mesa/drivers/dri/i965/intel_extensions.c | 1 - src/mesa/drivers/dri/i965/intel_extensions.h | 35 -------------------- 4 files changed, 3 insertions(+), 37 deletions(-) delete mode 100644 src/mesa/drivers/dri/i965/intel_extensions.h diff --git a/src/mesa/drivers/dri/i965/intel_context.c b/src/mesa/drivers/dri/i965/intel_context.c index 79420a2c444..ad307347cb8 100644 --- a/src/mesa/drivers/dri/i965/intel_context.c +++ b/src/mesa/drivers/dri/i965/intel_context.c @@ -46,7 +46,6 @@ #include "intel_tex.h" #include "intel_batchbuffer.h" #include "intel_clear.h" -#include "intel_extensions.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 55e1315622f..60fcfe3c9db 100644 --- a/src/mesa/drivers/dri/i965/intel_context.h +++ b/src/mesa/drivers/dri/i965/intel_context.h @@ -482,6 +482,9 @@ void intel_resolve_for_dri2_flush(struct intel_context *intel, __DRIdrawable *drawable); +extern void +intelInitExtensions(struct gl_context *ctx); + /*====================================================================== * Inline conversion functions. * These are better-typed than the macros used previously: diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c index dc2e1fa8c86..ded1e702ac7 100644 --- a/src/mesa/drivers/dri/i965/intel_extensions.c +++ b/src/mesa/drivers/dri/i965/intel_extensions.c @@ -29,7 +29,6 @@ #include "intel_chipset.h" #include "intel_context.h" -#include "intel_extensions.h" #include "intel_reg.h" #include "utils.h" diff --git a/src/mesa/drivers/dri/i965/intel_extensions.h b/src/mesa/drivers/dri/i965/intel_extensions.h deleted file mode 100644 index 9c1f271a67c..00000000000 --- a/src/mesa/drivers/dri/i965/intel_extensions.h +++ /dev/null @@ -1,35 +0,0 @@ -/************************************************************************** - * - * Copyright 2003 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_EXTENSIONS_H -#define INTEL_EXTENSIONS_H - - -extern void -intelInitExtensions(struct gl_context *ctx); - -#endif -- 2.30.2