diff options
| author | Dave Airlie <airlied@linux.ie> | 2008-04-16 20:25:08 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-04-16 20:25:08 +1000 |
| commit | 09df5eaff2ba2694b82d1211fd24410cb2997e25 (patch) | |
| tree | 0028ffd43d1895bb9e7d1ab0f5906629b0fa4825 /include/GL/internal/dri_sarea.h | |
| parent | 9566cf0e2f326d8fe638748d0bc10626e8c0387e (diff) | |
| parent | b64448b3e4026d3f11f366515b7544a6581403f3 (diff) | |
Merge branch 'master' into r500test
Conflicts:
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_ioctl.c
Diffstat (limited to 'include/GL/internal/dri_sarea.h')
| -rw-r--r-- | include/GL/internal/dri_sarea.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/GL/internal/dri_sarea.h b/include/GL/internal/dri_sarea.h index ff4ff1021c..849161fbc1 100644 --- a/include/GL/internal/dri_sarea.h +++ b/include/GL/internal/dri_sarea.h @@ -56,6 +56,9 @@ typedef struct __DRIBufferAttachEvent __DRIBufferAttachEvent; struct __DRILock { unsigned int block_header; drm_hw_lock_t lock; + + /* We use this with DRM_CAS to allocate lock IDs for the real lock.*/ + unsigned int next_id; }; struct __DRIEventBuffer { @@ -113,7 +116,7 @@ struct __DRIDrawableBuffer { struct __DRIDrawableConfigEvent { unsigned int event_header; - drm_drawable_t drawable; + unsigned int drawable; short x; short y; unsigned int width; @@ -124,7 +127,7 @@ struct __DRIDrawableConfigEvent { struct __DRIBufferAttachEvent { unsigned int event_header; - drm_drawable_t drawable; + unsigned int drawable; __DRIDrawableBuffer buffer; }; |