KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i965: Clean up error handling for context creation. 

The intel_screen.c used to be a dispatch to one of 3 driver functions, but
was down to 1, so it was kind of a waste.  In addition, it was trying to
free all of the data that might have been partially freed in the kernel
3.6 check (which comes after intelInitContext, and thus might have had
driverPrivate set and result in intelDestroyContext() doing work on the
freed data).  By moving the driverPrivate setup earlier, we can use
intelDestroyContext() consistently and avoid such problems in the future.

v2: Adjust the prototype of brwCreateContext to use the proper enum
    (fixing a compiler warning in some builds)

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (v1)
This commit is contained in:
Eric Anholt 2013-09-26 17:08:28 -07:00
parent 18a8f31070
commit ee8983becc
4 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesa/drivers/dri/i965/brw_context.c
View File

@ -276,7 +276,7 @@ brw_initialize_context_constants(struct brw_context *brw)
}
bool
brwCreateContext(int api,
brwCreateContext(gl_api api,
const struct gl_config *mesaVis,
__DRIcontext *driContextPriv,
unsigned major_version,
@ -311,7 +311,7 @@ brwCreateContext(int api,
mesaVis, driContextPriv,
sharedContextPrivate, &functions,
error)) {
ralloc_free(brw);
intelDestroyContext(driContextPriv);
return false;
}
@ -332,7 +332,7 @@ brwCreateContext(int api,
if (!brw->hw_ctx) {
fprintf(stderr, "Gen6+ requires Kernel 3.6 or later.\n");
ralloc_free(brw);
intelDestroyContext(driContextPriv);
return false;
}
}

2
src/mesa/drivers/dri/i965/brw_context.h
View File

@ -1410,7 +1410,7 @@ void brwInitVtbl( struct brw_context *brw );
/*======================================================================
* brw_context.c
*/
bool brwCreateContext(int api,
bool brwCreateContext(gl_api api,
const struct gl_config *mesaVis,
__DRIcontext *driContextPriv,
unsigned major_version,

6
src/mesa/drivers/dri/i965/intel_context.c
View File

@ -426,6 +426,9 @@ intelInitContext(struct brw_context *brw,
brw->intelScreen = intelScreen;
brw->bufmgr = intelScreen->bufmgr;
driContextPriv->driverPrivate = brw;
brw->driContext = driContextPriv;
if (!_mesa_initialize_context(&brw->ctx, api, mesaVis, shareCtx,
functions)) {
*dri_ctx_error = __DRI_CTX_ERROR_NO_MEMORY;
@ -433,9 +436,6 @@ intelInitContext(struct brw_context *brw,
return false;
}
driContextPriv->driverPrivate = brw;
brw->driContext = driContextPriv;
brw->gen = intelScreen->gen;
const int devID = intelScreen->deviceID;

28
src/mesa/drivers/dri/i965/intel_screen.c
View File

@ -984,32 +984,6 @@ intelDestroyBuffer(__DRIdrawable * driDrawPriv)
_mesa_reference_framebuffer(&fb, NULL);
}
static GLboolean
intelCreateContext(gl_api api,
const struct gl_config * mesaVis,
__DRIcontext * driContextPriv,
unsigned major_version,
unsigned minor_version,
uint32_t flags,
unsigned *error,
void *sharedContextPrivate)
{
bool success = false;
success = brwCreateContext(api, mesaVis,
driContextPriv,
major_version, minor_version, flags,
error, sharedContextPrivate);
if (success)
return true;
if (driContextPriv->driverPrivate != NULL)
intelDestroyContext(driContextPriv);
return false;
}
static bool
intel_init_bufmgr(struct intel_screen *intelScreen)
{
@ -1371,7 +1345,7 @@ intelReleaseBuffer(__DRIscreen *screen, __DRIbuffer *buffer)
const struct __DriverAPIRec driDriverAPI = {
.InitScreen = intelInitScreen2,
.DestroyScreen = intelDestroyScreen,
.CreateContext = intelCreateContext,
.CreateContext = brwCreateContext,
.DestroyContext = intelDestroyContext,
.CreateBuffer = intelCreateBuffer,
.DestroyBuffer = intelDestroyBuffer,