From: Ian Romanick <ian.d.roman...@intel.com> intelDestroyContext will eventually be called, and it will clean things up. The call to brwInitVtbl is moved earlier so that intelDestroyContext can call the device-specific destructor. This also makes the code look more like the i915 code.
NOTE: This is a candidate for the 9.0 branch. Signed-off-by: Ian Romanick <ian.d.roman...@intel.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=54301 --- src/mesa/drivers/dri/i965/brw_context.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 1083e28..418c873 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -140,6 +140,8 @@ brwCreateContext(int api, return false; } + brwInitVtbl( brw ); + brwInitDriverFunctions(screen, &functions); struct intel_context *intel = &brw->intel; @@ -148,13 +150,10 @@ brwCreateContext(int api, if (!intelInitContext( intel, api, mesaVis, driContextPriv, sharedContextPrivate, &functions )) { printf("%s: failed to init intel context\n", __FUNCTION__); - free(brw); *error = __DRI_CTX_ERROR_NO_MEMORY; return false; } - brwInitVtbl( brw ); - brw_init_surface_formats(brw); /* Initialize swrast, tnl driver tables: */ -- 1.7.11.4 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
