diff options
| author | Jakob Bornecrantz <jakob@tungstengraphics.com> | 2008-05-26 13:04:25 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@tungstengraphics.com> | 2008-05-26 13:04:25 +0200 |
| commit | e3ddafd1d32192f4638d4930627ad66624325561 (patch) | |
| tree | d538b76af6c559593c6507ad7c2eb415d1b28c75 /src/gallium/winsys/dri/intel/intel_context.c | |
| parent | 359058e7b77ddbac5eec7e8d1c77232bcbb1adbf (diff) | |
| parent | 7fbb61eedd4b07f07007a172cea227d5c363b908 (diff) | |
Merge branch 'gallium-tex-surface' into gallium-0.1
Conflicts:
src/gallium/include/pipe/p_util.h
Diffstat (limited to 'src/gallium/winsys/dri/intel/intel_context.c')
| -rw-r--r-- | src/gallium/winsys/dri/intel/intel_context.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/winsys/dri/intel/intel_context.c b/src/gallium/winsys/dri/intel/intel_context.c index 8eba33c313..cc2fc11c5e 100644 --- a/src/gallium/winsys/dri/intel/intel_context.c +++ b/src/gallium/winsys/dri/intel/intel_context.c @@ -162,6 +162,7 @@ intelCreateContext(const __GLcontextModes * visual, * memory pools */ DRM_LIGHT_LOCK(sPriv->fd, &sPriv->pSAREA->lock, driContextPriv->hHWContext); + // ZZZ JB should be per screen and not be done per context havePools = intelCreatePools(sPriv); DRM_UNLOCK(sPriv->fd, &sPriv->pSAREA->lock, driContextPriv->hHWContext); if (!havePools) @@ -234,12 +235,12 @@ intelDestroyContext(__DRIcontextPrivate * driContextPriv) if (intel->last_swap_fence) { driFenceFinish(intel->last_swap_fence, DRM_FENCE_TYPE_EXE, GL_TRUE); - driFenceUnReference(intel->last_swap_fence); + driFenceUnReference(&intel->last_swap_fence); intel->last_swap_fence = NULL; } if (intel->first_swap_fence) { driFenceFinish(intel->first_swap_fence, DRM_FENCE_TYPE_EXE, GL_TRUE); - driFenceUnReference(intel->first_swap_fence); + driFenceUnReference(&intel->first_swap_fence); intel->first_swap_fence = NULL; } |