From a5797873d054b2fa6c4aec460ca56dacb153bf02 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Sun, 8 Mar 2015 04:16:34 +0800 Subject: [PATCH] ilo: add ilo_core.h to core ilo_core.h includes the common gallium headers that were included in ilo_common.h. --- src/gallium/drivers/ilo/Makefile.sources | 1 + src/gallium/drivers/ilo/core/ilo_core.h | 46 ++++++++++++++++++++++++ src/gallium/drivers/ilo/ilo_common.h | 15 +------- 3 files changed, 48 insertions(+), 14 deletions(-) create mode 100644 src/gallium/drivers/ilo/core/ilo_core.h diff --git a/src/gallium/drivers/ilo/Makefile.sources b/src/gallium/drivers/ilo/Makefile.sources index dbdfffe7a4f..be5afb144cd 100644 --- a/src/gallium/drivers/ilo/Makefile.sources +++ b/src/gallium/drivers/ilo/Makefile.sources @@ -1,4 +1,5 @@ C_SOURCES := \ + core/ilo_core.h \ core/intel_winsys.h \ ilo_blit.c \ ilo_blit.h \ diff --git a/src/gallium/drivers/ilo/core/ilo_core.h b/src/gallium/drivers/ilo/core/ilo_core.h new file mode 100644 index 00000000000..1db8c4bf4fd --- /dev/null +++ b/src/gallium/drivers/ilo/core/ilo_core.h @@ -0,0 +1,46 @@ +/* + * Mesa 3-D graphics library + * + * Copyright (C) 2012-2013 LunarG, Inc. + * + * 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, sublicense, + * 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 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 NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS 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. + * + * Authors: + * Chia-I Wu + */ + +#ifndef ILO_CORE_H +#define ILO_CORE_H + +#include "pipe/p_compiler.h" +#include "pipe/p_defines.h" +#include "pipe/p_format.h" + +#include "util/u_debug.h" +#include "util/u_double_list.h" +#include "util/u_format.h" +#include "util/u_inlines.h" +#include "util/u_math.h" +#include "util/u_memory.h" +#include "util/u_pointer.h" + +#define ILO_PRIM_RECTANGLES PIPE_PRIM_MAX +#define ILO_PRIM_MAX (PIPE_PRIM_MAX + 1) + +#endif /* ILO_CORE_H */ diff --git a/src/gallium/drivers/ilo/ilo_common.h b/src/gallium/drivers/ilo/ilo_common.h index 1ed964f2eca..b685c446fc5 100644 --- a/src/gallium/drivers/ilo/ilo_common.h +++ b/src/gallium/drivers/ilo/ilo_common.h @@ -28,17 +28,7 @@ #ifndef ILO_COMMON_H #define ILO_COMMON_H -#include "pipe/p_compiler.h" -#include "pipe/p_defines.h" -#include "pipe/p_format.h" - -#include "util/u_debug.h" -#include "util/u_double_list.h" -#include "util/u_format.h" -#include "util/u_inlines.h" -#include "util/u_math.h" -#include "util/u_memory.h" -#include "util/u_pointer.h" +#include "core/ilo_core.h" #define ILO_GEN(gen) ((int) (gen * 100)) @@ -52,9 +42,6 @@ #define ILO_DEV_ASSERT(dev, min_gen, max_gen) \ ilo_dev_assert(dev, ILO_GEN(min_gen), ILO_GEN(max_gen)) -#define ILO_PRIM_RECTANGLES PIPE_PRIM_MAX -#define ILO_PRIM_MAX (PIPE_PRIM_MAX + 1) - enum ilo_debug { ILO_DEBUG_BATCH = 1 << 0, ILO_DEBUG_VS = 1 << 1, -- 2.30.2