diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2013-08-16 17:04:20 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2013-08-16 17:04:20 +0000 |
| commit | 5c3b2da17ee7dd4535c55d97ec4389537af53ca4 (patch) | |
| tree | 525cd8520b6f21c27084275e925d9bc86341b90e /driver/xf86-video-ati/src/evergreen_state.h | |
| parent | 170a34b77c6fd4d1ad432bb98ff30eedc444dbae (diff) | |
Update to xf86-video-ati 7.2.0, requested by jsg@
It fixes an endianess problem with kms and the in tree x86-video-ati
among other things.
It has been tested on various i386/amd64/sparc64/macppc machines
on a range of hardware from r100->northern islands.
Diffstat (limited to 'driver/xf86-video-ati/src/evergreen_state.h')
| -rw-r--r-- | driver/xf86-video-ati/src/evergreen_state.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/driver/xf86-video-ati/src/evergreen_state.h b/driver/xf86-video-ati/src/evergreen_state.h index 5a29f8fcb..795d44720 100644 --- a/driver/xf86-video-ati/src/evergreen_state.h +++ b/driver/xf86-video-ati/src/evergreen_state.h @@ -93,9 +93,7 @@ typedef struct { int blend_enable; uint32_t blendcntl; struct radeon_bo *bo; -#ifdef XF86DRM_MODE struct radeon_surface *surface; -#endif } cb_config_t; /* Shader */ @@ -182,9 +180,7 @@ typedef struct { int min_lod; struct radeon_bo *bo; struct radeon_bo *mip_bo; -#ifdef XF86DRM_MODE struct radeon_surface *surface; -#endif } tex_resource_t; /* Texture sampler */ @@ -301,6 +297,8 @@ evergreen_start_3d(ScrnInfoPtr pScrn); void evergreen_set_render_target(ScrnInfoPtr pScrn, cb_config_t *cb_conf, uint32_t domain); void +evergreen_set_blend_color(ScrnInfoPtr pScrn, float *color); +void evergreen_cp_wait_vline_sync(ScrnInfoPtr pScrn, PixmapPtr pPix, xf86CrtcPtr crtc, int start, int stop); void evergreen_set_spi(ScrnInfoPtr pScrn, int vs_export_count, int num_interp); @@ -354,5 +352,7 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height, extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv); extern struct radeon_bo *radeon_get_pixmap_bo(PixmapPtr pPix); extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix); +extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p); +extern Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *handle); #endif |