Module: Mesa Branch: master Commit: 6cf3034ba72bff55841b1e3338fbc541cd04efdc URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6cf3034ba72bff55841b1e3338fbc541cd04efdc
Author: Jordan Justen <[email protected]> Date: Sun Dec 16 16:53:02 2012 -0800 mesa osmesa/x11: fix build error introduced in 4bea4cb9 Fixes https://bugs.freedesktop.org/show_bug.cgi?id=58380 Signed-off-by: Jordan Justen <[email protected]> Reviewed-by: Brian Paul <[email protected]> --- src/mesa/drivers/osmesa/osmesa.c | 10 +++++----- src/mesa/drivers/x11/xm_api.c | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c index 95756d5..5965d7d 100644 --- a/src/mesa/drivers/osmesa/osmesa.c +++ b/src/mesa/drivers/osmesa/osmesa.c @@ -789,13 +789,13 @@ OSMesaCreateContextExt( GLenum format, GLint depthBits, GLint stencilBits, swrast = SWRAST_CONTEXT( ctx ); swrast->choose_line = osmesa_choose_line; swrast->choose_triangle = osmesa_choose_triangle; - } - _mesa_compute_version(ctx); + _mesa_compute_version(ctx); - /* Exec table initialization requires the version to be computed */ - _mesa_initialize_exec_table(ctx); - _mesa_initialize_vbo_vtxfmt(ctx); + /* Exec table initialization requires the version to be computed */ + _mesa_initialize_exec_table(ctx); + _mesa_initialize_vbo_vtxfmt(ctx); + } } return osmesa; } diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c index 0a005f8..c302c0c 100644 --- a/src/mesa/drivers/x11/xm_api.c +++ b/src/mesa/drivers/x11/xm_api.c @@ -959,11 +959,11 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list ) _mesa_meta_init(mesaCtx); - _mesa_compute_version(ctx); + _mesa_compute_version(mesaCtx); /* Exec table initialization requires the version to be computed */ - _mesa_initialize_exec_table(ctx); - _mesa_initialize_vbo_vtxfmt(ctx); + _mesa_initialize_exec_table(mesaCtx); + _mesa_initialize_vbo_vtxfmt(mesaCtx); return c; } _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
