diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2007-09-07 20:17:49 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2007-09-07 20:17:49 +0200 |
| commit | b257bbe48a0851d27150d21cd124af2dc3e53385 (patch) | |
| tree | c230ae915264a7249a23c0f858265cfe12622554 /shared-core/mga_drm.h | |
| parent | cbf7c5cace00d23f6b694977aa058026b9d39e9f (diff) | |
| parent | 06bb07259531d10df2c1979919af899e3812057b (diff) | |
Merge remote branch 'upstream/master' into i915-zone-renderingi915-zone-rendering
Conflicts:
linux-core/drm_bo.c
linux-core/drm_objects.h
linux-core/i915_buffer.c
shared-core/i915_dma.c
shared-core/i915_drm.h
shared-core/i915_drv.h
shared-core/i915_irq.c
Diffstat (limited to 'shared-core/mga_drm.h')
| -rw-r--r-- | shared-core/mga_drm.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/shared-core/mga_drm.h b/shared-core/mga_drm.h index 5bcdbfab..15c2dea2 100644 --- a/shared-core/mga_drm.h +++ b/shared-core/mga_drm.h @@ -181,7 +181,7 @@ typedef struct _drm_mga_sarea { /* The current cliprects, or a subset thereof. */ - drm_clip_rect_t boxes[MGA_NR_SAREA_CLIPRECTS]; + struct drm_clip_rect boxes[MGA_NR_SAREA_CLIPRECTS]; unsigned int nbox; /* Information about the most recently used 3d drawable. The @@ -202,7 +202,7 @@ typedef struct _drm_mga_sarea { unsigned int exported_nback; int exported_back_x, exported_front_x, exported_w; int exported_back_y, exported_front_y, exported_h; - drm_clip_rect_t exported_boxes[MGA_NR_SAREA_CLIPRECTS]; + struct drm_clip_rect exported_boxes[MGA_NR_SAREA_CLIPRECTS]; /* Counters for aging textures and for client-side throttling. */ @@ -216,7 +216,7 @@ typedef struct _drm_mga_sarea { /* LRU lists for texture memory in agp space and on the card. */ - drm_tex_region_t texList[MGA_NR_TEX_HEAPS][MGA_NR_TEX_REGIONS + 1]; + struct drm_tex_region texList[MGA_NR_TEX_HEAPS][MGA_NR_TEX_REGIONS + 1]; unsigned int texAge[MGA_NR_TEX_HEAPS]; /* Mechanism to validate card state. |