diff options
| author | Kenneth Graunke <[email protected]> | 2013-03-20 23:58:03 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2013-09-03 11:30:15 -0700 |
| commit | 644fbbd3ebe58ee2237395904f83e085f221d52d (patch) | |
| tree | de889a4daa03c7282b143f5696b44920aff433f1 | |
| parent | 6e143af66d679060136815ed85626eba3079cbb6 (diff) | |
mesa: Rename gl_context::swtnl_im to vbo_context; use proper type.
The main GL context's swtnl_im field is the VBO module's vbo_context
structure. Using the name "swtnl" in the name is confusing since
some drivers use hardware texturing and lighting, but still rely on the
VBO module for drawing.
v2: Forward declare the type and use that instead of void *
(suggested by Eric Anholt).
v3: Remove unnecessary cast (pointed out by by Topi Pohjolainen).
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Reviewed-by: Paul Berry <[email protected]>
| -rw-r--r-- | src/mesa/main/mtypes.h | 3 | ||||
| -rw-r--r-- | src/mesa/vbo/vbo_context.c | 4 | ||||
| -rw-r--r-- | src/mesa/vbo/vbo_context.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 22bb58c5fe2..7d5632209d9 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -80,6 +80,7 @@ struct prog_instruction; struct gl_program_parameter_list; struct set; struct set_entry; +struct vbo_context; /*@}*/ @@ -3669,7 +3670,7 @@ struct gl_context void *swrast_context; void *swsetup_context; void *swtnl_context; - void *swtnl_im; + struct vbo_context *vbo_context; struct st_context *st; void *aelt_context; /*@}*/ diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c index b97313dfbd2..b2806274de5 100644 --- a/src/mesa/vbo/vbo_context.c +++ b/src/mesa/vbo/vbo_context.c @@ -152,7 +152,7 @@ GLboolean _vbo_CreateContext( struct gl_context *ctx ) { struct vbo_context *vbo = CALLOC_STRUCT(vbo_context); - ctx->swtnl_im = (void *)vbo; + ctx->vbo_context = vbo; /* Initialize the arrayelt helper */ @@ -224,7 +224,7 @@ void _vbo_DestroyContext( struct gl_context *ctx ) if (ctx->API == API_OPENGL_COMPAT) vbo_save_destroy(ctx); free(vbo); - ctx->swtnl_im = NULL; + ctx->vbo_context = NULL; } } diff --git a/src/mesa/vbo/vbo_context.h b/src/mesa/vbo/vbo_context.h index 27fae83a5c9..1680e23dcf3 100644 --- a/src/mesa/vbo/vbo_context.h +++ b/src/mesa/vbo/vbo_context.h @@ -90,7 +90,7 @@ struct vbo_context { static inline struct vbo_context *vbo_context(struct gl_context *ctx) { - return (struct vbo_context *)(ctx->swtnl_im); + return ctx->vbo_context; } |