diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-04 16:28:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-04 16:28:48 +0200 |
| commit | b602729f06a62d29e136cf2aeca9544471371e0d (patch) | |
| tree | 403d96659d5726e26edafb2bbb3c1198e783e3a0 /mesalib/src/mesa/vbo | |
| parent | caffc15f0b9e35698a6039fa3df2fa6a588608e6 (diff) | |
| parent | b828531d8b6da75a258d12f97df0f4e49f75ab98 (diff) | |
| download | vcxsrv-b602729f06a62d29e136cf2aeca9544471371e0d.tar.gz vcxsrv-b602729f06a62d29e136cf2aeca9544471371e0d.tar.bz2 vcxsrv-b602729f06a62d29e136cf2aeca9544471371e0d.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig xkeyboard-config git update 4 Sep 2013
Diffstat (limited to 'mesalib/src/mesa/vbo')
| -rw-r--r-- | mesalib/src/mesa/vbo/vbo_context.c | 4 | ||||
| -rw-r--r-- | mesalib/src/mesa/vbo/vbo_context.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mesa/vbo/vbo_context.c b/mesalib/src/mesa/vbo/vbo_context.c index b97313dfb..b2806274d 100644 --- a/mesalib/src/mesa/vbo/vbo_context.c +++ b/mesalib/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/mesalib/src/mesa/vbo/vbo_context.h b/mesalib/src/mesa/vbo/vbo_context.h index 27fae83a5..1680e23dc 100644 --- a/mesalib/src/mesa/vbo/vbo_context.h +++ b/mesalib/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; } |