OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix segfault when running glxinfo

Browse Source
This commit is contained in:
Alex Deucher
2009-05-26 11:13:44 -04:00
parent 4a28974cf5
commit 17417fc8ee
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mesa/drivers/dri/r600/r600_context.c
View File

@@ -453,9 +453,10 @@ void
r600DestroyContext (__DRIcontextPrivate * driContextPriv) r600DestroyContext (__DRIcontextPrivate * driContextPriv)
{ {
GET_CURRENT_CONTEXT (ctx); GET_CURRENT_CONTEXT (ctx);
context_t *context = R700_CONTEXT(ctx); context_t *context = ctx ? R700_CONTEXT(ctx) : NULL;
(context->chipobj.DestroyChipObj)(context->chipobj.pvChipObj); if (context)
(context->chipobj.DestroyChipObj)(context->chipobj.pvChipObj);
} }

6
src/mesa/drivers/dri/r600/r600_emit.c
View File

@@ -234,8 +234,10 @@ GLboolean r600DeleteShader(GLcontext * ctx,
{ {
struct radeon_bo * pbo = (struct radeon_bo *)shaderbo; struct radeon_bo * pbo = (struct radeon_bo *)shaderbo;
radeon_bo_unmap(pbo); if (pbo) {
radeon_bo_unref(pbo); /* when bo->cref <= 0, bo will be bo_free */ radeon_bo_unmap(pbo);
radeon_bo_unref(pbo); /* when bo->cref <= 0, bo will be bo_free */
}
return GL_TRUE; return GL_TRUE;
} }

5
src/mesa/drivers/dri/radeon/radeon_common_context.c
View File

@@ -233,7 +233,7 @@ void radeonDestroyContext(__DRIcontextPrivate *driContextPriv )
#if RADEON_COMMON && defined(RADEON_COMMON_FOR_R600) /* +r6/r7 */ #if RADEON_COMMON && defined(RADEON_COMMON_FOR_R600) /* +r6/r7 */
if (IS_R600_CLASS(screen)) if (IS_R600_CLASS(screen))
{ {
r600DestroyContext(driContextPriv); r600DestroyContext(driContextPriv);
} }
#endif #endif
@@ -267,6 +267,9 @@ void radeonDestroyContext(__DRIcontextPrivate *driContextPriv )
rcommonDestroyCmdBuf(radeon); rcommonDestroyCmdBuf(radeon);
#if RADEON_COMMON && defined(RADEON_COMMON_FOR_R600) /* +r6/r7 */
if (!IS_R600_CLASS(screen))
#endif
radeon_destroy_atom_list(radeon); radeon_destroy_atom_list(radeon);
if (radeon->state.scissor.pClipRects) { if (radeon->state.scissor.pClipRects) {