projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/nvc0'
[mesa.git]
/
src
/
mesa
/
main
/
arrayobj.h
diff --git
a/src/mesa/main/arrayobj.h
b/src/mesa/main/arrayobj.h
index 8999edc724f0603b79394e178e5a903abc5d3055..0b5a01303701c87334d719383b86e33c8b2ed3d6 100644
(file)
--- a/
src/mesa/main/arrayobj.h
+++ b/
src/mesa/main/arrayobj.h
@@
-28,7
+28,9
@@
#ifndef ARRAYOBJ_H
#define ARRAYOBJ_H
#ifndef ARRAYOBJ_H
#define ARRAYOBJ_H
-#include "context.h"
+#include "glheader.h"
+
+struct gl_context;
/**
* \file arrayobj.h
/**
* \file arrayobj.h
@@
-43,23
+45,23
@@
*/
extern struct gl_array_object *
*/
extern struct gl_array_object *
-_mesa_new_array_object(
GL
context *ctx, GLuint name );
+_mesa_new_array_object(
struct gl_
context *ctx, GLuint name );
extern void
extern void
-_mesa_delete_array_object(
GL
context *ctx, struct gl_array_object *obj );
+_mesa_delete_array_object(
struct gl_
context *ctx, struct gl_array_object *obj );
extern void
extern void
-_mesa_reference_array_object(
GL
context *ctx,
+_mesa_reference_array_object(
struct gl_
context *ctx,
struct gl_array_object **ptr,
struct gl_array_object *arrayObj);
extern void
struct gl_array_object **ptr,
struct gl_array_object *arrayObj);
extern void
-_mesa_initialize_array_object(
GL
context *ctx,
+_mesa_initialize_array_object(
struct gl_
context *ctx,
struct gl_array_object *obj, GLuint name );
extern void
struct gl_array_object *obj, GLuint name );
extern void
-_mesa_update_array_object_max_element(
GL
context *ctx,
+_mesa_update_array_object_max_element(
struct gl_
context *ctx,
struct gl_array_object *arrayObj);
struct gl_array_object *arrayObj);