Drop GLcontext typedef and use struct gl_context instead
This commit is contained in:
@@ -61,7 +61,7 @@
|
||||
*/
|
||||
|
||||
static INLINE struct gl_array_object *
|
||||
lookup_arrayobj(GLcontext *ctx, GLuint id)
|
||||
lookup_arrayobj(struct gl_context *ctx, GLuint id)
|
||||
{
|
||||
if (id == 0)
|
||||
return NULL;
|
||||
@@ -77,7 +77,7 @@ lookup_arrayobj(GLcontext *ctx, GLuint id)
|
||||
* This is done just prior to array object destruction.
|
||||
*/
|
||||
static void
|
||||
unbind_array_object_vbos(GLcontext *ctx, struct gl_array_object *obj)
|
||||
unbind_array_object_vbos(struct gl_context *ctx, struct gl_array_object *obj)
|
||||
{
|
||||
GLuint i;
|
||||
|
||||
@@ -109,7 +109,7 @@ unbind_array_object_vbos(GLcontext *ctx, struct gl_array_object *obj)
|
||||
* \c dd_function_table::NewArrayObject.
|
||||
*/
|
||||
struct gl_array_object *
|
||||
_mesa_new_array_object( GLcontext *ctx, GLuint name )
|
||||
_mesa_new_array_object( struct gl_context *ctx, GLuint name )
|
||||
{
|
||||
struct gl_array_object *obj = CALLOC_STRUCT(gl_array_object);
|
||||
if (obj)
|
||||
@@ -125,7 +125,7 @@ _mesa_new_array_object( GLcontext *ctx, GLuint name )
|
||||
* \c dd_function_table::DeleteArrayObject.
|
||||
*/
|
||||
void
|
||||
_mesa_delete_array_object( GLcontext *ctx, struct gl_array_object *obj )
|
||||
_mesa_delete_array_object( struct gl_context *ctx, struct gl_array_object *obj )
|
||||
{
|
||||
(void) ctx;
|
||||
unbind_array_object_vbos(ctx, obj);
|
||||
@@ -138,7 +138,7 @@ _mesa_delete_array_object( GLcontext *ctx, struct gl_array_object *obj )
|
||||
* Set ptr to arrayObj w/ reference counting.
|
||||
*/
|
||||
void
|
||||
_mesa_reference_array_object(GLcontext *ctx,
|
||||
_mesa_reference_array_object(struct gl_context *ctx,
|
||||
struct gl_array_object **ptr,
|
||||
struct gl_array_object *arrayObj)
|
||||
{
|
||||
@@ -193,7 +193,7 @@ _mesa_reference_array_object(GLcontext *ctx,
|
||||
|
||||
|
||||
static void
|
||||
init_array(GLcontext *ctx,
|
||||
init_array(struct gl_context *ctx,
|
||||
struct gl_client_array *array, GLint size, GLint type)
|
||||
{
|
||||
array->Size = size;
|
||||
@@ -216,7 +216,7 @@ init_array(GLcontext *ctx,
|
||||
* Initialize a gl_array_object's arrays.
|
||||
*/
|
||||
void
|
||||
_mesa_initialize_array_object( GLcontext *ctx,
|
||||
_mesa_initialize_array_object( struct gl_context *ctx,
|
||||
struct gl_array_object *obj,
|
||||
GLuint name )
|
||||
{
|
||||
@@ -253,7 +253,7 @@ _mesa_initialize_array_object( GLcontext *ctx,
|
||||
* Add the given array object to the array object pool.
|
||||
*/
|
||||
static void
|
||||
save_array_object( GLcontext *ctx, struct gl_array_object *obj )
|
||||
save_array_object( struct gl_context *ctx, struct gl_array_object *obj )
|
||||
{
|
||||
if (obj->Name > 0) {
|
||||
/* insert into hash table */
|
||||
@@ -267,7 +267,7 @@ save_array_object( GLcontext *ctx, struct gl_array_object *obj )
|
||||
* Do not deallocate the array object though.
|
||||
*/
|
||||
static void
|
||||
remove_array_object( GLcontext *ctx, struct gl_array_object *obj )
|
||||
remove_array_object( struct gl_context *ctx, struct gl_array_object *obj )
|
||||
{
|
||||
if (obj->Name > 0) {
|
||||
/* remove from hash table */
|
||||
@@ -327,7 +327,7 @@ update_min(GLuint min, struct gl_client_array *array)
|
||||
* Examine vertex arrays to update the gl_array_object::_MaxElement field.
|
||||
*/
|
||||
void
|
||||
_mesa_update_array_object_max_element(GLcontext *ctx,
|
||||
_mesa_update_array_object_max_element(struct gl_context *ctx,
|
||||
struct gl_array_object *arrayObj)
|
||||
{
|
||||
GLuint i, min = ~0;
|
||||
@@ -364,7 +364,7 @@ _mesa_update_array_object_max_element(GLcontext *ctx,
|
||||
* glGenVertexArrays().
|
||||
*/
|
||||
static void
|
||||
bind_vertex_array(GLcontext *ctx, GLuint id, GLboolean genRequired)
|
||||
bind_vertex_array(struct gl_context *ctx, GLuint id, GLboolean genRequired)
|
||||
{
|
||||
struct gl_array_object * const oldObj = ctx->Array.ArrayObj;
|
||||
struct gl_array_object *newObj = NULL;
|
||||
@@ -495,7 +495,7 @@ _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids)
|
||||
* \param vboOnly Will arrays have to reside in VBOs?
|
||||
*/
|
||||
static void
|
||||
gen_vertex_arrays(GLcontext *ctx, GLsizei n, GLuint *arrays, GLboolean vboOnly)
|
||||
gen_vertex_arrays(struct gl_context *ctx, GLsizei n, GLuint *arrays, GLboolean vboOnly)
|
||||
{
|
||||
GLuint first;
|
||||
GLint i;
|
||||
|
Reference in New Issue
Block a user