Contents of /trunk/mesa/patches/mesa-6.5-re-order-context-destruction.patch
Parent Directory | Revision Log
Revision 153 -
(show annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 2295 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 2295 byte(s)
-import
1 | --- src/mesa/drivers/dri/r128/r128_context.c 2006/02/03 13:29:11 1.23 |
2 | +++ src/mesa/drivers/dri/r128/r128_context.c 2006/04/09 17:48:28 1.24 |
3 | @@ -296,10 +296,6 @@ |
4 | _ac_DestroyContext( rmesa->glCtx ); |
5 | _swrast_DestroyContext( rmesa->glCtx ); |
6 | |
7 | - /* free the Mesa context */ |
8 | - rmesa->glCtx->DriverCtx = NULL; |
9 | - _mesa_destroy_context(rmesa->glCtx); |
10 | - |
11 | if ( release_texture_heaps ) { |
12 | /* This share group is about to go away, free our private |
13 | * texture object data. |
14 | @@ -314,6 +310,10 @@ |
15 | assert( is_empty_list( & rmesa->swapped ) ); |
16 | } |
17 | |
18 | + /* free the Mesa context */ |
19 | + rmesa->glCtx->DriverCtx = NULL; |
20 | + _mesa_destroy_context(rmesa->glCtx); |
21 | + |
22 | /* free the option cache */ |
23 | driDestroyOptionCache (&rmesa->optionCache); |
24 | |
25 | --- src/mesa/drivers/dri/r200/r200_context.c 2006/04/04 11:04:30 1.58 |
26 | +++ src/mesa/drivers/dri/r200/r200_context.c 2006/04/09 17:48:28 1.59 |
27 | @@ -590,10 +590,6 @@ |
28 | r200VtxfmtDestroy( rmesa->glCtx ); |
29 | } |
30 | |
31 | - /* free the Mesa context */ |
32 | - rmesa->glCtx->DriverCtx = NULL; |
33 | - _mesa_destroy_context( rmesa->glCtx ); |
34 | - |
35 | if (rmesa->state.scissor.pClipRects) { |
36 | FREE(rmesa->state.scissor.pClipRects); |
37 | rmesa->state.scissor.pClipRects = NULL; |
38 | @@ -613,6 +609,10 @@ |
39 | assert( is_empty_list( & rmesa->swapped ) ); |
40 | } |
41 | |
42 | + /* free the Mesa context */ |
43 | + rmesa->glCtx->DriverCtx = NULL; |
44 | + _mesa_destroy_context( rmesa->glCtx ); |
45 | + |
46 | /* free the option cache */ |
47 | driDestroyOptionCache (&rmesa->optionCache); |
48 | |
49 | --- src/mesa/drivers/dri/radeon/radeon_context.c 2006/04/04 11:04:30 1.51 |
50 | +++ src/mesa/drivers/dri/radeon/radeon_context.c 2006/04/09 17:48:28 1.52 |
51 | @@ -521,10 +521,6 @@ |
52 | radeonVtxfmtDestroy( rmesa->glCtx ); |
53 | } |
54 | |
55 | - /* free the Mesa context */ |
56 | - rmesa->glCtx->DriverCtx = NULL; |
57 | - _mesa_destroy_context( rmesa->glCtx ); |
58 | - |
59 | _mesa_vector4f_free( &rmesa->tcl.ObjClean ); |
60 | |
61 | if (rmesa->state.scissor.pClipRects) { |
62 | @@ -546,6 +542,10 @@ |
63 | assert( is_empty_list( & rmesa->swapped ) ); |
64 | } |
65 | |
66 | + /* free the Mesa context */ |
67 | + rmesa->glCtx->DriverCtx = NULL; |
68 | + _mesa_destroy_context( rmesa->glCtx ); |
69 | + |
70 | /* free the option cache */ |
71 | driDestroyOptionCache (&rmesa->optionCache); |
72 |