X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Farrayobj.h;h=830502e23a96a13a5327b9a14bd2524056a9332a;hb=e70d0d22a2dccc1df2c88890a2964491cdafac94;hp=722708eed258f0a6ff3ccce8a6f55dd38b025aba;hpb=aac1415b66fafedc50c4346dae2d652723156ed9;p=mesa.git

diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h
index 722708eed25..830502e23a9 100644
--- a/src/mesa/main/arrayobj.h
+++ b/src/mesa/main/arrayobj.h
@@ -46,67 +46,48 @@ struct gl_context;
  */
 
 extern struct gl_vertex_array_object *
-_mesa_lookup_arrayobj(struct gl_context *ctx, GLuint id);
+_mesa_lookup_vao(struct gl_context *ctx, GLuint id);
 
 extern struct gl_vertex_array_object *
-_mesa_new_array_object( struct gl_context *ctx, GLuint name );
+_mesa_lookup_vao_err(struct gl_context *ctx, GLuint id, const char *caller);
+
+extern struct gl_vertex_array_object *
+_mesa_new_vao(struct gl_context *ctx, GLuint name);
 
 extern void
-_mesa_delete_array_object( struct gl_context *ctx, struct gl_vertex_array_object *obj );
+_mesa_delete_vao(struct gl_context *ctx, struct gl_vertex_array_object *obj);
 
 extern void
-_mesa_reference_array_object_(struct gl_context *ctx,
-                              struct gl_vertex_array_object **ptr,
-                              struct gl_vertex_array_object *vao);
+_mesa_reference_vao_(struct gl_context *ctx,
+                     struct gl_vertex_array_object **ptr,
+                     struct gl_vertex_array_object *vao);
 
 static inline void
-_mesa_reference_array_object(struct gl_context *ctx,
-                             struct gl_vertex_array_object **ptr,
-                             struct gl_vertex_array_object *vao)
+_mesa_reference_vao(struct gl_context *ctx,
+                    struct gl_vertex_array_object **ptr,
+                    struct gl_vertex_array_object *vao)
 {
    if (*ptr != vao)
-      _mesa_reference_array_object_(ctx, ptr, vao);
+      _mesa_reference_vao_(ctx, ptr, vao);
 }
 
 
 extern void
-_mesa_initialize_array_object( struct gl_context *ctx,
-                               struct gl_vertex_array_object *obj, GLuint name );
+_mesa_initialize_vao(struct gl_context *ctx,
+                     struct gl_vertex_array_object *obj, GLuint name);
 
 
 extern void
-_mesa_update_array_object_max_element(struct gl_context *ctx,
-                                      struct gl_vertex_array_object *vao);
+_mesa_update_vao_client_arrays(struct gl_context *ctx,
+                               struct gl_vertex_array_object *vao);
 
-extern void
-_mesa_update_array_object_client_arrays(struct gl_context *ctx,
-                                        struct gl_vertex_array_object *vao);
-
-
-/** Returns the bitmask of all enabled arrays in fixed function mode.
- *
- *  In fixed function mode only the traditional fixed function arrays
- *  are available.
- */
-static inline GLbitfield64
-_mesa_array_object_get_enabled_ff(const struct gl_vertex_array_object *vao)
-{
-   return vao->_Enabled & VERT_BIT_FF_ALL;
-}
-
-/** Returns the bitmask of all enabled arrays in arb/glsl shader mode.
- *
- *  In arb/glsl shader mode all the fixed function and the arb/glsl generic
- *  arrays are available. Only the first generic array takes
- *  precedence over the legacy position array.
- */
-static inline GLbitfield64
-_mesa_array_object_get_enabled_arb(const struct gl_vertex_array_object *vao)
-{
-   GLbitfield64 enabled = vao->_Enabled;
-   return enabled & ~(VERT_BIT_POS & (enabled >> VERT_ATTRIB_GENERIC0));
-}
+/* Returns true if all varying arrays reside in vbos */
+extern bool
+_mesa_all_varyings_in_vbos(const struct gl_vertex_array_object *vao);
 
+/* Returns true if all vbos are unmapped */
+extern bool
+_mesa_all_buffers_are_unmapped(const struct gl_vertex_array_object *vao);
 
 /*
  * API functions
@@ -123,6 +104,12 @@ void GLAPIENTRY _mesa_GenVertexArrays(GLsizei n, GLuint *arrays);
 
 void GLAPIENTRY _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *buffer);
 
+void GLAPIENTRY _mesa_CreateVertexArrays(GLsizei n, GLuint *arrays);
+
 GLboolean GLAPIENTRY _mesa_IsVertexArray( GLuint id );
 
+void GLAPIENTRY _mesa_VertexArrayElementBuffer(GLuint vaobj, GLuint buffer);
+
+void GLAPIENTRY _mesa_GetVertexArrayiv(GLuint vaobj, GLenum pname, GLint *param);
+
 #endif /* ARRAYOBJ_H */