From f4376a0c2b57d92f662fa03db13b0e682211a4a3 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 18 Jan 2018 14:39:22 -0700 Subject: [PATCH] vbo: remove vbo_context.h and change includes to use vbo.h instead Now vbo.h is the public interface to the VBO module. Reviewed-by: Roland Scheidegger --- src/mesa/Makefile.sources | 1 - src/mesa/drivers/dri/i965/brw_context.c | 2 +- src/mesa/drivers/dri/i965/brw_draw.c | 2 +- src/mesa/drivers/dri/nouveau/nouveau_render.h | 2 +- src/mesa/main/state.c | 2 +- src/mesa/main/vtxfmt.c | 2 +- src/mesa/meson.build | 1 - src/mesa/vbo/vbo.h | 3 +- src/mesa/vbo/vbo_context.h | 61 ------------------- src/mesa/vbo/vbo_exec_api.c | 1 - src/mesa/vbo/vbo_exec_array.c | 1 - src/mesa/vbo/vbo_exec_draw.c | 1 - src/mesa/vbo/vbo_primitive_restart.c | 1 - src/mesa/vbo/vbo_private.h | 1 - src/mesa/vbo/vbo_save.c | 1 - src/mesa/vbo/vbo_save_api.c | 1 - src/mesa/vbo/vbo_save_draw.c | 1 - src/mesa/vbo/vbo_split.h | 1 - 18 files changed, 6 insertions(+), 79 deletions(-) delete mode 100644 src/mesa/vbo/vbo_context.h diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources index 53fa486364d..2dc9b47bc18 100644 --- a/src/mesa/Makefile.sources +++ b/src/mesa/Makefile.sources @@ -393,7 +393,6 @@ VBO_FILES = \ vbo/vbo_attrib.h \ vbo/vbo_attrib_tmp.h \ vbo/vbo_context.c \ - vbo/vbo_context.h \ vbo/vbo_exec_api.c \ vbo/vbo_exec_array.c \ vbo/vbo_exec.c \ diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index b830e712476..9ed8bc64bb3 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -46,7 +46,7 @@ #include "main/stencil.h" #include "main/state.h" -#include "vbo/vbo_context.h" +#include "vbo/vbo.h" #include "drivers/common/driverfuncs.h" #include "drivers/common/meta.h" diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c index fe7e8c478fa..dec7b29be9c 100644 --- a/src/mesa/drivers/dri/i965/brw_draw.c +++ b/src/mesa/drivers/dri/i965/brw_draw.c @@ -35,7 +35,7 @@ #include "main/transformfeedback.h" #include "main/framebuffer.h" #include "tnl/tnl.h" -#include "vbo/vbo_context.h" +#include "vbo/vbo.h" #include "swrast/swrast.h" #include "swrast_setup/swrast_setup.h" #include "drivers/common/meta.h" diff --git a/src/mesa/drivers/dri/nouveau/nouveau_render.h b/src/mesa/drivers/dri/nouveau/nouveau_render.h index 0539c377585..4d45d5c2e05 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_render.h +++ b/src/mesa/drivers/dri/nouveau/nouveau_render.h @@ -27,7 +27,7 @@ #ifndef __NOUVEAU_RENDER_H__ #define __NOUVEAU_RENDER_H__ -#include "vbo/vbo_context.h" +#include "vbo/vbo.h" #include "nouveau_array.h" typedef void (*dispatch_t)(struct gl_context *, unsigned int, int, unsigned int); diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index 7a9732d37b2..dd61cc7e643 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -51,7 +51,7 @@ #include "texobj.h" #include "texstate.h" #include "varray.h" -#include "vbo/vbo_context.h" +#include "vbo/vbo.h" #include "viewport.h" #include "blend.h" diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c index ec8f387caec..293a3853633 100644 --- a/src/mesa/main/vtxfmt.c +++ b/src/mesa/main/vtxfmt.c @@ -34,7 +34,7 @@ #include "eval.h" #include "dlist.h" #include "main/dispatch.h" -#include "vbo/vbo_context.h" +#include "vbo/vbo.h" /** diff --git a/src/mesa/meson.build b/src/mesa/meson.build index 998953d6411..52289af248c 100644 --- a/src/mesa/meson.build +++ b/src/mesa/meson.build @@ -327,7 +327,6 @@ files_libmesa_common = files( 'vbo/vbo_attrib.h', 'vbo/vbo_attrib_tmp.h', 'vbo/vbo_context.c', - 'vbo/vbo_context.h', 'vbo/vbo_exec_api.c', 'vbo/vbo_exec_array.c', 'vbo/vbo_exec.c', diff --git a/src/mesa/vbo/vbo.h b/src/mesa/vbo/vbo.h index d85b3ed0a56..ec2ac0e8bf5 100644 --- a/src/mesa/vbo/vbo.h +++ b/src/mesa/vbo/vbo.h @@ -23,8 +23,7 @@ */ /** - * \file vbo_context.h - * \brief VBO builder module datatypes and definitions. + * \brief Public interface to the VBO module * \author Keith Whitwell */ diff --git a/src/mesa/vbo/vbo_context.h b/src/mesa/vbo/vbo_context.h deleted file mode 100644 index 48f9a9bca1b..00000000000 --- a/src/mesa/vbo/vbo_context.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * mesa 3-D graphics library - * - * Copyright (C) 1999-2006 Brian Paul 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, 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. - */ - -/** - * \file vbo_context.h - * \brief VBO builder module datatypes and definitions. - * \author Keith Whitwell - */ - - -/** - * \mainpage The VBO builder module - * - * This module hooks into the GL dispatch table and catches all vertex - * building and drawing commands, such as glVertex3f, glBegin and - * glDrawArrays. The module stores all incoming vertex data as arrays - * in GL vertex buffer objects (VBOs), and translates all drawing - * commands into calls to a driver supplied DrawPrimitives() callback. - * - * The module captures both immediate mode and display list drawing, - * and manages the allocation, reference counting and deallocation of - * vertex buffer objects itself. - * - * The DrawPrimitives() callback can be either implemented by the - * driver itself or hooked to the tnl module's _tnl_draw_primitives() - * function for hardware without tnl capablilties or during fallbacks. - */ - - -#ifndef _VBO_CONTEXT_H -#define _VBO_CONTEXT_H - -#include "vbo.h" - - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index 3d972b2d3e1..881255ceb72 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -44,7 +44,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/dispatch.h" #include "util/bitscan.h" -#include "vbo_context.h" #include "vbo_noop.h" #include "vbo_private.h" diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c index e79ed4660f8..d990fdf7a8d 100644 --- a/src/mesa/vbo/vbo_exec_array.c +++ b/src/mesa/vbo/vbo_exec_array.c @@ -39,7 +39,6 @@ #include "main/macros.h" #include "main/transformfeedback.h" -#include "vbo_context.h" #include "vbo_private.h" diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c index 7418a2a2a0a..653a05ad0f4 100644 --- a/src/mesa/vbo/vbo_exec_draw.c +++ b/src/mesa/vbo/vbo_exec_draw.c @@ -34,7 +34,6 @@ #include "main/state.h" #include "main/vtxfmt.h" -#include "vbo_context.h" #include "vbo_noop.h" #include "vbo_private.h" diff --git a/src/mesa/vbo/vbo_primitive_restart.c b/src/mesa/vbo/vbo_primitive_restart.c index 886362c32fe..bf51c88265f 100644 --- a/src/mesa/vbo/vbo_primitive_restart.c +++ b/src/mesa/vbo/vbo_primitive_restart.c @@ -34,7 +34,6 @@ #include "main/varray.h" #include "vbo.h" -#include "vbo_context.h" #include "vbo_private.h" diff --git a/src/mesa/vbo/vbo_private.h b/src/mesa/vbo/vbo_private.h index c6dee0d7b27..353525644a7 100644 --- a/src/mesa/vbo/vbo_private.h +++ b/src/mesa/vbo/vbo_private.h @@ -32,7 +32,6 @@ #define VBO_PRIVATE_H -#include "vbo/vbo_context.h" #include "vbo/vbo_attrib.h" #include "vbo/vbo_exec.h" #include "vbo/vbo_save.h" diff --git a/src/mesa/vbo/vbo_save.c b/src/mesa/vbo/vbo_save.c index a91dc2ff4b3..f4acad6f8b7 100644 --- a/src/mesa/vbo/vbo_save.c +++ b/src/mesa/vbo/vbo_save.c @@ -30,7 +30,6 @@ #include "main/bufferobj.h" #include "main/imports.h" -#include "vbo_context.h" #include "vbo_private.h" diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c index d260b1f6e6a..e0fe5fd9ac9 100644 --- a/src/mesa/vbo/vbo_save_api.c +++ b/src/mesa/vbo/vbo_save_api.c @@ -81,7 +81,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/state.h" #include "util/bitscan.h" -#include "vbo_context.h" #include "vbo_noop.h" #include "vbo_private.h" diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c index 9bac2671f31..3a6083fdf45 100644 --- a/src/mesa/vbo/vbo_save_draw.c +++ b/src/mesa/vbo/vbo_save_draw.c @@ -36,7 +36,6 @@ #include "main/state.h" #include "util/bitscan.h" -#include "vbo_context.h" #include "vbo_private.h" diff --git a/src/mesa/vbo/vbo_split.h b/src/mesa/vbo/vbo_split.h index 78215739d87..dbd629979db 100644 --- a/src/mesa/vbo/vbo_split.h +++ b/src/mesa/vbo/vbo_split.h @@ -23,7 +23,6 @@ */ /** - * \file vbo_context.h * \brief VBO builder module datatypes and definitions. * \author Keith Whitwell */ -- 2.30.2