diff options
| author | rnoland <rnoland@FreeBSD.org> | 2008-08-23 20:59:12 +0000 |
|---|---|---|
| committer | rnoland <rnoland@FreeBSD.org> | 2008-08-23 20:59:12 +0000 |
| commit | 8ebfdfe248e93b41d01041a5ec069bf5761f8741 (patch) | |
| tree | 702bd8b6b1d2549932511454499d13cba551297c /sys/dev/drm/mach64_drm.h | |
| parent | cd5da88fc1464a435965660ff2af024771c4333b (diff) | |
| download | FreeBSD-src-8ebfdfe248e93b41d01041a5ec069bf5761f8741.zip FreeBSD-src-8ebfdfe248e93b41d01041a5ec069bf5761f8741.tar.gz | |
Update drm kernel drivers.
This is a sync to mesa/drm pre-gem, with a few fixes on top of that.
It also contains one local patch supplied by kib@ that I can't apply to
git.master shared code.
Approved by: flz
Obtained from: mesa/drm git.master
MFC after: 2 weeks
Diffstat (limited to 'sys/dev/drm/mach64_drm.h')
| -rw-r--r-- | sys/dev/drm/mach64_drm.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/drm/mach64_drm.h b/sys/dev/drm/mach64_drm.h index 042c91e..44ba505 100644 --- a/sys/dev/drm/mach64_drm.h +++ b/sys/dev/drm/mach64_drm.h @@ -133,7 +133,7 @@ typedef struct drm_mach64_sarea { /* The current cliprects, or a subset thereof. */ - drm_clip_rect_t boxes[MACH64_NR_SAREA_CLIPRECTS]; + struct drm_clip_rect boxes[MACH64_NR_SAREA_CLIPRECTS]; unsigned int nbox; /* Counters for client-side throttling of rendering clients. @@ -142,7 +142,7 @@ typedef struct drm_mach64_sarea { /* Texture memory LRU. */ - drm_tex_region_t tex_list[MACH64_NR_TEX_HEAPS][MACH64_NR_TEX_REGIONS + + struct drm_tex_region tex_list[MACH64_NR_TEX_HEAPS][MACH64_NR_TEX_REGIONS + 1]; unsigned int tex_age[MACH64_NR_TEX_HEAPS]; int ctx_owner; @@ -240,7 +240,7 @@ typedef struct drm_mach64_vertex { } drm_mach64_vertex_t; typedef struct drm_mach64_blit { - int idx; + void *buf; int pitch; int offset; int format; |
