diff options
author | Brian Paul <[email protected]> | 2018-01-18 14:32:38 -0700 |
---|---|---|
committer | Brian Paul <[email protected]> | 2018-01-24 10:12:49 -0700 |
commit | aafb56a148d3f75a2d5989f92bf3bba9b3fbfd24 (patch) | |
tree | 5b4fdf577ab6105dabe0c073eb45ff7e37697718 | |
parent | a7cfec3be0e610ae554ded55b6566acf72b95899 (diff) |
vbo: move remaining items from vbo_context.h to vbo.h
Non-VBO sources files sometimes included vbo.h while others included
vbo_context.h. We're moving all public types, functions to the former.
Reviewed-by: Roland Scheidegger <[email protected]>
-rw-r--r-- | src/mesa/vbo/vbo.h | 6 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_context.c | 2 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_context.h | 40 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_exec.c | 2 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_private.h | 25 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_save_loopback.c | 2 |
6 files changed, 34 insertions, 43 deletions
diff --git a/src/mesa/vbo/vbo.h b/src/mesa/vbo/vbo.h index 146d4cd3116..d85b3ed0a56 100644 --- a/src/mesa/vbo/vbo.h +++ b/src/mesa/vbo/vbo.h @@ -81,6 +81,12 @@ void _vbo_DestroyContext( struct gl_context *ctx ); void +vbo_exec_invalidate_state(struct gl_context *ctx); + +void +_vbo_install_exec_vtxfmt(struct gl_context *ctx); + +void vbo_initialize_exec_dispatch(const struct gl_context *ctx, struct _glapi_table *exec); diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c index 34c7d59bb1a..dbeb6871e7d 100644 --- a/src/mesa/vbo/vbo_context.c +++ b/src/mesa/vbo/vbo_context.c @@ -29,8 +29,8 @@ #include "main/bufferobj.h" #include "math/m_eval.h" #include "main/vtxfmt.h" +#include "main/api_arrayelt.h" #include "vbo.h" -#include "vbo_context.h" #include "vbo_private.h" diff --git a/src/mesa/vbo/vbo_context.h b/src/mesa/vbo/vbo_context.h index a723a6aba3a..48f9a9bca1b 100644 --- a/src/mesa/vbo/vbo_context.h +++ b/src/mesa/vbo/vbo_context.h @@ -52,46 +52,6 @@ #define _VBO_CONTEXT_H #include "vbo.h" -#include "vbo_attrib.h" -#include "vbo_exec.h" -#include "vbo_save.h" - -#include "main/api_arrayelt.h" -#include "main/macros.h" - -#ifdef __cplusplus -extern "C" { -#endif - -struct vbo_context { - struct gl_vertex_array currval[VBO_ATTRIB_MAX]; - - /** Map VERT_ATTRIB_x to VBO_ATTRIB_y */ - GLubyte map_vp_none[VERT_ATTRIB_MAX]; - GLubyte map_vp_arb[VERT_ATTRIB_MAX]; - - struct vbo_exec_context exec; - struct vbo_save_context save; - - /* Callback into the driver. This must always succeed, the driver - * is responsible for initiating any fallback actions required: - */ - vbo_draw_func draw_prims; - - /* Optional callback for indirect draws. This allows multidraws to not be - * broken up, as well as for the actual count to be passed in as a separate - * indirect parameter. - */ - vbo_indirect_draw_func draw_indirect_prims; -}; - - -void -vbo_exec_invalidate_state(struct gl_context *ctx); - - -void -_vbo_install_exec_vtxfmt(struct gl_context *ctx); #ifdef __cplusplus diff --git a/src/mesa/vbo/vbo_exec.c b/src/mesa/vbo/vbo_exec.c index 5718c9d6c26..82f204e3dc9 100644 --- a/src/mesa/vbo/vbo_exec.c +++ b/src/mesa/vbo/vbo_exec.c @@ -28,8 +28,8 @@ #include "main/glheader.h" #include "main/mtypes.h" +#include "main/api_arrayelt.h" #include "main/vtxfmt.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 e4c0cbc31a9..c6dee0d7b27 100644 --- a/src/mesa/vbo/vbo_private.h +++ b/src/mesa/vbo/vbo_private.h @@ -33,6 +33,9 @@ #include "vbo/vbo_context.h" +#include "vbo/vbo_attrib.h" +#include "vbo/vbo_exec.h" +#include "vbo/vbo_save.h" #include "main/mtypes.h" @@ -40,6 +43,28 @@ struct _glapi_table; struct _mesa_prim; +struct vbo_context { + struct gl_vertex_array currval[VBO_ATTRIB_MAX]; + + /** Map VERT_ATTRIB_x to VBO_ATTRIB_y */ + GLubyte map_vp_none[VERT_ATTRIB_MAX]; + GLubyte map_vp_arb[VERT_ATTRIB_MAX]; + + struct vbo_exec_context exec; + struct vbo_save_context save; + + /* Callback into the driver. This must always succeed, the driver + * is responsible for initiating any fallback actions required: + */ + vbo_draw_func draw_prims; + + /* Optional callback for indirect draws. This allows multidraws to not be + * broken up, as well as for the actual count to be passed in as a separate + * indirect parameter. + */ + vbo_indirect_draw_func draw_indirect_prims; +}; + static inline struct vbo_context * vbo_context(struct gl_context *ctx) diff --git a/src/mesa/vbo/vbo_save_loopback.c b/src/mesa/vbo/vbo_save_loopback.c index 9c0e937fe40..43d458a7c0a 100644 --- a/src/mesa/vbo/vbo_save_loopback.c +++ b/src/mesa/vbo/vbo_save_loopback.c @@ -34,7 +34,7 @@ #include "main/dispatch.h" #include "glapi/glapi.h" -#include "vbo_context.h" +#include "vbo_private.h" typedef void (*attr_func)(struct gl_context *ctx, GLint index, const GLfloat *); |