diff options
author | Brian Paul <brianp@vmware.com> | 2009-10-05 14:42:08 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-10-05 14:42:08 -0600 |
commit | 55770d09c18c4d33403abb97dfef4f897efbbe2a (patch) | |
tree | 3f3cb2ea42c511c11e134c2d414367df82268cea /src/gallium/auxiliary/cso_cache/cso_context.c | |
parent | f00da2a3ff59c1a7104ac25a1c6eba5a6050ad68 (diff) | |
parent | 79892e7976fbb91ae426f5868d5f453e977c1f17 (diff) |
Merge branch 'mesa_7_6_branch'
Conflicts:
src/gallium/auxiliary/util/u_cpu_detect.c
Diffstat (limited to 'src/gallium/auxiliary/cso_cache/cso_context.c')
-rw-r--r-- | src/gallium/auxiliary/cso_cache/cso_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c index 36c882acb7..4f13b3e2ba 100644 --- a/src/gallium/auxiliary/cso_cache/cso_context.c +++ b/src/gallium/auxiliary/cso_cache/cso_context.c @@ -268,7 +268,7 @@ void cso_release_all( struct cso_context *ctx ) void cso_destroy_context( struct cso_context *ctx ) { if (ctx) { - //cso_release_all( ctx ); + /*cso_release_all( ctx );*/ FREE( ctx ); } } |